X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=e7eea99560eadf289c8beab669c0043fa3cfdaa7;hb=d9a85ec552d93e4a009f729d09f4452e6b34dac5;hp=0da18a4676ab8679bcc99664705a252ea50c043b;hpb=46d1f9fa96d1bc61523fa98647ea1ba948fbc159;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 0da18a4..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,13 +148,8 @@ 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):
-        if db_uri.startswith(os.pardir + os.sep) \
-        or os.altsep and db_uri.startswith(os.pardir + os.altsep):
-            db_uri = os.path.abspath(db_uri)
-        db_uri = 'sqlite://' + db_uri.replace(os.sep, '/')
+    if '://' not in db_uri:
+        db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
 
     sqlhub.processConnection = connection = connectionForURI(db_uri)