diff -Naur katapult-0.3.1.4/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp katapult-0.3.1.4-newsql/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp --- katapult-0.3.1.4/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp 2006-11-04 19:11:08.000000000 +0000 +++ katapult-0.3.1.4-newsql/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp 2007-06-03 05:03:08.000000000 +0100 @@ -148,7 +148,7 @@ QStringList queryList; //prepares SQL-queryQRegExp - QString sqlQuery("SELECT a.name, t.title, t.deviceid, d.lastmountpoint, t.url, i.path, album.name FROM tags t LEFT JOIN statistics s ON t.url = s.url AND t.deviceid = s.deviceid LEFT JOIN artist a ON t.artist = a.id LEFT JOIN album ON t.album = album.id LEFT JOIN images i ON ( a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON t.deviceid = d.id WHERE 1"); + QString sqlQuery("SELECT a.name, t.title, t.deviceid, d.lastmountpoint, t.url, i.path, album.name FROM tags t LEFT JOIN artist a ON t.artist = a.id LEFT JOIN statistics s ON t.url = s.url AND t.deviceid = s.deviceid LEFT JOIN album ON t.album = album.id LEFT JOIN images i ON ( a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON t.deviceid = d.id WHERE 1"); queryList = QStringList::split ( QString(" "), QString(queryString).replace(QChar(':')," ").replace(QChar('\"'), " ").replace(QChar('\"'), "%") ); for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { @@ -156,7 +156,7 @@ sqlQuery.append(QString(" AND (t.title LIKE \"\%%1\%\"").arg(*it)); sqlQuery.append(QString(" OR a.name LIKE \"\%%1\%\")").arg(*it)); } - sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); + sqlQuery.append(" ORDER BY s.percentage DESC"); //sending SQL-query to ararok via dcop QByteArray sqlQueryData, replyData;