Process author names

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index e035b12cd01949513ec23985d0b7ec8e313861aa..ba091f3442286186c4cacb4de619f51078cb25cf 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -2,7 +2,7 @@
 
 __all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
            'AuthorBook', 'BookGenre',
-           'init_db', 'insert_name', 'update_counters',
+           'init_db', 'insert_name', 'insert_author', 'update_counters',
            ]
 
 import os
@@ -53,12 +53,15 @@ if connection.dbName == 'sqlite':
 
 
 class Author(SQLObject):
-    name = UnicodeCol(unique=True)
-    count = IntCol()
-    count_idx = DatabaseIndex('count')
+    surname = UnicodeCol(notNull=True)
+    name = UnicodeCol(notNull=True)
+    misc_name = UnicodeCol(notNull=True)
+    count = IntCol(notNull=True)
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='author_book',
                         createRelatedTable=False)
+    full_name_idx = DatabaseIndex(surname, name, misc_name, unique=True)
+    count_idx = DatabaseIndex(count)
 
 
 class AuthorBook(SQLObject):
@@ -66,6 +69,8 @@ class AuthorBook(SQLObject):
         table = "author_book"
     author = ForeignKey('Author', notNull=True, cascade=True)
     book = ForeignKey('Book', notNull=True, cascade=True)
+    author_idx = DatabaseIndex(author)
+    book_idx = DatabaseIndex(book)
     main_idx = DatabaseIndex(author, book, unique=True)
 
 
@@ -76,18 +81,27 @@ class Book(SQLObject):
     genres = RelatedJoin('Genre',
                          intermediateTable='book_genre',
                          createRelatedTable=False)
-    title = UnicodeCol()
-    series = UnicodeCol()
+    title = UnicodeCol(notNull=True)
+    series = UnicodeCol(notNull=True)
     ser_no = IntCol()
-    archive = StringCol()
-    file = StringCol()
-    size = IntCol()
-    lib_id = StringCol()
-    deleted = BoolCol()
-    extension = ForeignKey('Extension')
-    date = DateCol()
+    archive = StringCol(notNull=True)
+    file = StringCol(notNull=True)
+    size = IntCol(notNull=True)
+    lib_id = StringCol(notNull=True)
+    deleted = BoolCol(notNull=True)
+    extension = ForeignKey('Extension', notNull=True)
+    date = DateCol(notNull=True)
     language = ForeignKey('Language')
-    archive_file_idx = DatabaseIndex('archive', 'file', unique=True)
+    title_idx = DatabaseIndex(title)
+    series_idx = DatabaseIndex(series)
+    ser_no_idx = DatabaseIndex(ser_no)
+    archive_file_idx = DatabaseIndex(archive, file, unique=True)
+    file_idx = DatabaseIndex(file)
+    size_idx = DatabaseIndex(size)
+    deleted_idx = DatabaseIndex(deleted)
+    extension_idx = DatabaseIndex(extension)
+    date_idx = DatabaseIndex(date)
+    language_idx = DatabaseIndex(language)
 
 
 class BookGenre(SQLObject):
@@ -95,29 +109,32 @@ class BookGenre(SQLObject):
         table = "book_genre"
     book = ForeignKey('Book', notNull=True, cascade=True)
     genre = ForeignKey('Genre', notNull=True, cascade=True)
+    book_idx = DatabaseIndex(book)
+    genre_idx = DatabaseIndex(genre)
     main_idx = DatabaseIndex(book, genre, unique=True)
 
 
 class Extension(SQLObject):
-    name = StringCol(unique=True)
-    count = IntCol()
-    count_idx = DatabaseIndex('count')
+    name = StringCol(notNull=True, unique=True)
+    count = IntCol(notNull=True)
+    count_idx = DatabaseIndex(count)
 
 
 class Genre(SQLObject):
-    name = StringCol(unique=True)
-    title = UnicodeCol()
-    count = IntCol()
-    count_idx = DatabaseIndex('count')
+    name = StringCol(notNull=True, unique=True)
+    title = UnicodeCol(notNull=True)
+    count = IntCol(notNull=True)
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='book_genre',
                         createRelatedTable=False)
+    title_idx = DatabaseIndex(title)
+    count_idx = DatabaseIndex(count)
 
 
 class Language(SQLObject):
-    name = StringCol(unique=True)
-    count = IntCol()
-    count_idx = DatabaseIndex('count')
+    name = StringCol(notNull=True, unique=True)
+    count = IntCol(notNull=True)
+    count_idx = DatabaseIndex(count)
 
 
 def init_db():
@@ -140,6 +157,14 @@ def insert_name(table, name, **kw):
         return table(name=name, count=0, **kw)
 
 
+def insert_author(surname, name, misc_name):
+    try:
+        return Author.full_name_idx.get(
+            surname=surname, name=name, misc_name=misc_name)
+    except SQLObjectNotFound:
+        return Author(surname=surname, name=name, misc_name=misc_name, count=0)
+
+
 def update_counters():
     for author in Author.select():
         author.count = len(author.books)