[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    digikam_0_8_branch: kdeextragear-3/digikam/digikam
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2005-04-28 17:10:24
Message-ID: 20050428171024.967B8668 () office ! kde ! org
[Download RAW message or body]

CVS commit by toma: 

2 bugs:
- datetime=="" and not null
- entry in database without date does not exists on disk.


  M +2 -1      albumdb.cpp   1.17.2.11
  M +12 -4     scanlib.cpp   1.1.2.13


--- kdeextragear-3/digikam/digikam/albumdb.cpp  #1.17.2.10:1.17.2.11
@@ -920,5 +920,6 @@ QStringList AlbumDB::getAllItemURLsWitho
                      "FROM Images, Albums "
                      "WHERE Images.dirid=Albums.Id "
-                     "AND Images.datetime is null"),
+                     "AND (Images.datetime is null or "
+                     "     Images.datetime == '');"),
              &values );
 

--- kdeextragear-3/digikam/digikam/scanlib.cpp  #1.1.2.12:1.1.2.13
@@ -135,4 +135,6 @@ void ScanLib::updateItemsWithoutDate()
             kapp->processEvents();
         QFileInfo fi(*it);
+        if (fi.exists())
+        {
         QString albumURL = fi.dirPath();
         albumURL = QDir::cleanDirPath(albumURL.remove(base));
@@ -140,4 +142,10 @@ void ScanLib::updateItemsWithoutDate()
         updateItemDate(albumURL, fi.fileName(), albumID);
     }
+        else
+        {
+            kdDebug() << "Stale entry in db: " << fi.fileName() << endl;
+            // TODO: create removeItem(fi.fileName(), albumID);
+        }
+    }
 
     m_progressBar->hide();


[prev in list] [next in list] [prev in thread] [next in thread]