rev 3287 - in kde-extras/digikam/trunk/debian: . patches

[Tom Albers]

Author: tomalbers-guest
Date: 2006-03-08 21:01:07 +0000 (Wed, 08 Mar 2006)
New Revision: 3287

Added:
   kde-extras/digikam/trunk/debian/patches/12_kdesvn_r505430_fix_search.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
Log:
Fix tha search


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-03-08 10:07:41 UTC (rev 3286)
+++ kde-extras/digikam/trunk/debian/changelog	2006-03-08 21:01:07 UTC (rev 3287)
@@ -7,6 +7,10 @@
     PPC without breaking AMD64 (Closes: #354173).  Thanks to Rodney Gordon
     II and Fabrice Flore-Thebault for testing.
 
+  [ Tom Albers ]
+  * patches/12_kdesvn_r505430_fix_search.diff added. Fixes search, after 
+    introduction rating, search only found rated images. (Closes: #355886)
+
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon,  6 Mar 2006 21:48:37 +0100
 
 digikam (0.8.1-3) unstable; urgency=low

Added: kde-extras/digikam/trunk/debian/patches/12_kdesvn_r505430_fix_search.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/12_kdesvn_r505430_fix_search.diff	2006-03-08 10:07:41 UTC (rev 3286)
+++ kde-extras/digikam/trunk/debian/patches/12_kdesvn_r505430_fix_search.diff	2006-03-08 21:01:07 UTC (rev 3287)
@@ -0,0 +1,40 @@
+Index: digikam/kioslave/digikamsearch.cpp
+===================================================================
+--- digikam/kioslave/digikamsearch.cpp	(revision 505429)
++++ digikam/kioslave/digikamsearch.cpp	(revision 505430)
+@@ -136,7 +136,7 @@
+ 
+         // query head
+         sqlQuery = "SELECT Images.id, Images.name, Images.dirid, Images.datetime, Albums.url "
+-                   "FROM Images, Albums, ImageProperties "
++                   "FROM Images, Albums LEFT JOIN ImageProperties ON Images.id = Imageproperties.imageid "
+                    "WHERE ( ";
+ 
+         // query body
+@@ -144,7 +144,7 @@
+ 
+         // query tail
+         sqlQuery += " ) ";
+-        sqlQuery += " AND (Albums.id=Images.dirid) AND (Images.id = ImageProperties.imageid); ";
++        sqlQuery += " AND (Albums.id=Images.dirid); ";
+ 
+         QStringList values;
+         QString     errMsg;
+@@ -240,7 +240,7 @@
+ 
+         // query head
+         sqlQuery = "SELECT Albums.url||'/'||Images.name "
+-                   "FROM Images, Albums, ImageProperties "
++                   "FROM Images, Albums LEFT JOIN ImageProperties on Images.id = ImageProperties.imageid "
+                    "WHERE ( ";
+ 
+         // query body
+@@ -248,7 +248,7 @@
+ 
+         // query tail
+         sqlQuery += " ) ";
+-        sqlQuery += " AND (Albums.id=Images.dirid) AND (Images.id = ImageProperties.imageid) ";
++        sqlQuery += " AND (Albums.id=Images.dirid) ";
+         sqlQuery += " LIMIT 500;";
+ 
+         QStringList values;