From kde-commits  Sun Aug 22 15:44:29 2004
From: Christian Muehlhaeuser <chris () chris ! de>
Date: Sun, 22 Aug 2004 15:44:29 +0000
To: kde-commits
Subject: kdeextragear-1/amarok/src
Message-Id: <20040822154429.025586D50 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109318947912965

CVS commit by muesli: 

* Fix: Collection was sorted case-sensitive.

CCMAIL: 87621-done@bugs.kde.org


  M +5 -5      collectiondb.cpp   1.85


--- kdeextragear-1/amarok/src/collectiondb.cpp  #1.84:1.85
@@ -244,5 +244,5 @@ CollectionDB::artistList()
 
     execSql( "SELECT name FROM artist "
-                  "ORDER BY name", &values, &names );
+                  "ORDER BY lower(name)", &values, &names );
     
     return values;
@@ -257,5 +257,5 @@ CollectionDB::albumList()
 
     execSql( "SELECT name FROM album "
-                  "ORDER BY name", &values, &names );
+                  "ORDER BY lower(name)", &values, &names );
     
     return values;
@@ -744,5 +744,5 @@ CollectionDB::retrieveFirstLevel( QStrin
 
     command += filterToken;
-    command += " ORDER BY " + category1.lower() + ".name DESC;";
+    command += " ORDER BY lower(" + category1.lower() + ".name) DESC;";
 
     execSql( command, values, names );
@@ -775,6 +775,6 @@ CollectionDB::retrieveSecondLevel( QStri
         command = "SELECT DISTINCT " + category2.lower() + ".name, '0' FROM tags, " + category2.lower()
                 + ", " + category1.lower() + " WHERE tags." + category2.lower() + "=" + category2.lower()
-                + ".id AND tags." + category1.lower() + "=" + id + " " + filterToken + " ORDER BY "
-                + category2.lower() + ".name DESC;";
+                + ".id AND tags." + category1.lower() + "=" + id + " " + filterToken + " ORDER BY lower("
+                + category2.lower() + ".name) DESC;";
     }