diff -Naur katapult-0.3.1.3.old/debian/changelog katapult-0.3.1.3/debian/changelog --- katapult-0.3.1.3.old/debian/changelog 2006-10-31 12:32:07.000000000 +0000 +++ katapult-0.3.1.3/debian/changelog 2006-10-31 12:36:39.000000000 +0000 @@ -1,3 +1,9 @@ +katapult (0.3.1.3-0ubuntu6) edgy-proposed; urgency=low + + * Update of kubuntu_06_amarok_14.diff to working version + + -- Martin Meredith Tue, 31 Oct 2006 12:36:22 +0000 + katapult (0.3.1.3-0ubuntu5) edgy; urgency=low * Add kubuntu_06_amarok_14.diff closes 60136 diff -Naur katapult-0.3.1.3.old/debian/patches/kubuntu_06_amarok_14.diff katapult-0.3.1.3/debian/patches/kubuntu_06_amarok_14.diff --- katapult-0.3.1.3.old/debian/patches/kubuntu_06_amarok_14.diff 2006-10-31 12:32:07.000000000 +0000 +++ katapult-0.3.1.3/debian/patches/kubuntu_06_amarok_14.diff 2006-10-31 12:36:52.000000000 +0000 @@ -1,6 +1,6 @@ -diff -Naur katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp katapult-0.3.1.3.new/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp ---- katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp 2006-03-23 05:52:30.000000000 -0500 -+++ katapult-0.3.1.3.new/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp 2006-10-21 19:00:50.000000000 -0400 +diff -Naur katapult-0.3.1.3.old/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +--- katapult-0.3.1.3.old/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp 2006-03-23 05:52:30.000000000 -0500 ++++ katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp 2006-10-27 23:45:07.000000000 -0400 @@ -1,6 +1,8 @@ /*************************************************************************** * Copyright (C) 2005 by Bastian Holst * @@ -21,7 +21,7 @@ } AmarokCatalog::~AmarokCatalog() { -@@ -60,76 +66,177 @@ +@@ -60,76 +66,184 @@ setBestMatch(Match()); setStatus(0); } else { @@ -35,6 +35,7 @@ - sqlQuery.append(QString(" OR a.name LIKE \"%%%1%%\")").arg(*it)); - } - sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); ++ + if ( _gotCollectionStatus) + { + @@ -76,7 +77,6 @@ + arg << sqlQuery; + if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)", + sqlQueryData, replyType, replyData)) { -+ //qDebug("There was some error using DCOP. Perhaps amaroK doesn't run."); newStatus = 0; } else { - reset(); @@ -132,12 +132,6 @@ - queryString.insert(i+1, ' '); - if ( queryString[i-1] != ' ' ) - queryString.insert(i, ' '); -- } -- queryList = QStringList::split ( " ", queryString ); -- unsigned int matched = 0; -- for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { -- if(matched < (_result.text().find(*it, matched, false) + (*it).length())) -- matched = _result.text().find(*it, matched, false) + (*it).length(); + //Checks if there are multiple results + if( !sqlResult[5].isEmpty() ) + newStatus = S_HasResults | S_Multiple; @@ -145,9 +139,14 @@ + newStatus = S_HasResults; + } + } else { -+ qDebug("DCOP: query returned an unexpected type of reply!"); + newStatus = 0; } +- queryList = QStringList::split ( " ", queryString ); +- unsigned int matched = 0; +- for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { +- if(matched < (_result.text().find(*it, matched, false) + (*it).length())) +- matched = _result.text().find(*it, matched, false) + (*it).length(); +- } - setBestMatch(Match(&_result, 100*queryString.length()/_result.text().length(), matched)); + } + @@ -157,7 +156,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, artist a, album LEFT JOIN statistics s ON t.url = s.url AND t.deviceid = s.deviceid LEFT JOIN images i ON (a.name = i.artist AND album.name = i.album) LEFT JOIN devices d ON t.deviceid = d.id WHERE t.album = album.id AND t.artist = a.id"); // AND ++ 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"); + queryList = QStringList::split ( QString(" "), QString(queryString).replace(QChar(':')," ").replace(QChar('\"'), " ").replace(QChar('\"'), "%") ); + + for(QStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { @@ -174,7 +173,6 @@ + arg << sqlQuery; + if (!kapp->dcopClient()->call("amarok", "collection", "query(QString)", + sqlQueryData, replyType, replyData)) { -+ //qDebug("There was some error using DCOP. Perhaps amaroK doesn't run."); + newStatus = 0; + } else { + QDataStream reply(replyData, IO_ReadOnly); @@ -189,10 +187,20 @@ + //Reads information from SQL-Query + _result.setArtist(sqlResult[0]); + _result.setName(sqlResult[1]); -+ if (sqlResult[2]=="-1") { -+ _result.setURL(KURL(sqlResult[3]+sqlResult[4].mid(1))); ++ if (sqlResult[2]!="-1") { ++ KURL absolutePath; ++ absolutePath.setPath( sqlResult[3] ); ++ absolutePath.addPath( sqlResult[4] ); ++ absolutePath.cleanPath(); ++ ++ _result.setURL( absolutePath ); + } else { -+ _result.setURL(KURL("/"+sqlResult[4].mid(1))); ++ KURL absolutePath; ++ absolutePath.setPath( "/" ); ++ absolutePath.addPath( sqlResult[4] ); ++ absolutePath.cleanPath(); ++ ++ _result.setURL( absolutePath ); + } + + _result.setAlbum(sqlResult[6]); @@ -230,7 +238,6 @@ + newStatus = S_HasResults; + } + } else { -+ qDebug("DCOP: query returned an unexpected type of reply!"); + newStatus = 0; + } } @@ -259,7 +266,7 @@ } void AmarokCatalog::reset() -@@ -139,6 +246,47 @@ +@@ -139,6 +253,48 @@ _result.setAlbum(QString::null); _result.setIcon(QString::null); } @@ -288,6 +295,7 @@ + if (sqlResult[0] == "1") + { + _dynamicCollection = true; ++ + } + else + { @@ -307,9 +315,9 @@ /* void AmarokCatalog::initialize() { -diff -Naur katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h katapult-0.3.1.3.new/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h ---- katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h 2006-03-23 05:52:30.000000000 -0500 -+++ katapult-0.3.1.3.new/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h 2006-10-21 19:00:13.000000000 -0400 +diff -Naur katapult-0.3.1.3.old/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h +--- katapult-0.3.1.3.old/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h 2006-03-23 05:52:30.000000000 -0500 ++++ katapult-0.3.1.3/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h 2006-10-27 23:45:07.000000000 -0400 @@ -50,10 +50,12 @@ protected: void queryChanged(); @@ -324,3 +332,4 @@ Song _result; }; +