From 0697315e05bc57bf59933e91d8d5ef5dead471a7 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 27 May 2010 22:16:14 +0100 Subject: [PATCH 1/2] Put news back as a category --- src/calibre/library/database2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index ff8e352583..c8b2646144 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -668,7 +668,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): #### First, build the standard and custom-column categories #### for category in tb_cats.keys(): cat = tb_cats[category] - if not cat['is_category'] or not cat['kind'] == 'field': + if not cat['is_category'] or cat['kind'] in ['user', 'search']: continue tn = cat['table'] categories[category] = [] #reserve the position in the ordered list From 2a988e89b6306357597bccfee654eb3cb4d893bd Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 27 May 2010 22:21:42 +0100 Subject: [PATCH 2/2] Fix descriptive comments in field_metadata.py --- src/calibre/library/field_metadata.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/field_metadata.py b/src/calibre/library/field_metadata.py index 9bd91a78b1..9d5cd4edc1 100644 --- a/src/calibre/library/field_metadata.py +++ b/src/calibre/library/field_metadata.py @@ -43,7 +43,8 @@ class FieldMetadata(dict): is_category: is a tag browser category. If true, then: table: name of the db table used to construct item list - column: name of the column in the connection table to join on + column: name of the column in the normalized table to join on + link_column: name of the column in the connection table to join on If these are None, then the category constructor must know how to build the item list (e.g., formats). The order below is the order that the categories will