X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=e7eea99560eadf289c8beab669c0043fa3cfdaa7;hb=76fad1db9bf3d812333ca9f65b1ed87c8549cab7;hp=56b194d0ac5621145d935d4343468249e7174adf;hpb=2aec5f3920d5ba9f7add67a1980e4321f5b7689b;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 56b194d..e7eea99 100755
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -20,6 +20,12 @@ class Author(SQLObject):
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='author_book',
                         createRelatedTable=False)
+
+    @property
+    def fullname(self):
+        fullnames = filter(None, (self.surname, self.name, self.misc_name))
+        return ' '.join(fullnames)
+
     full_name_idx = DatabaseIndex(surname, name, misc_name, unique=True)
     count_idx = DatabaseIndex(count)
 
@@ -142,12 +148,7 @@ def open_db(db_uri=None):
         except:
             db_uri = find_sqlite_dburi()
 
-    if db_uri.startswith(os.sep) \
-            or os.altsep and db_uri.startswith(os.altsep) \
-            or db_uri.startswith(os.pardir + os.sep) \
-            or os.altsep and db_uri.startswith(os.pardir + os.altsep) \
-            or db_uri.startswith(os.curdir + os.sep) \
-            or os.altsep and db_uri.startswith(os.curdir + os.altsep):
+    if '://' not in db_uri:
         db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
 
     sqlhub.processConnection = connection = connectionForURI(db_uri)