From 4f4ee351ee49698884969d32193838157d63cd5d Mon Sep 17 00:00:00 2001 From: Lukas Appelhans Date: Thu, 21 Jul 2011 14:55:36 +0200 Subject: [PATCH] Better queries --- queryoperation.cpp | 9 +++------ syncoperation.cpp | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/queryoperation.cpp b/queryoperation.cpp index 5241499..9b24ba2 100644 --- a/queryoperation.cpp +++ b/queryoperation.cpp @@ -42,7 +42,7 @@ void QueryOperation::start(QList operations, QMultiHash() << Akabei::Backend::instance()->loadPackageFromFile(args.first())); } else { - showInformation(Akabei::Backend::instance()->localDatabase()->queryPackages("SELECT * FROM packages WHERE Name LIKE \"" + args.first() + "\"")); + showInformation(Akabei::Backend::instance()->localDatabase()->searchPackages(args.first(), Akabei::SearchNameEqual)); //CHange back to searchPackages when we have sorted results after Name and description } } else if (operations.contains(APM::ShowPackagesOfGroup)) { @@ -84,10 +84,7 @@ void QueryOperation::start(QList operations, QMultiHashlocalDatabase()->queryPackages(query)); + showLocalQuery(Akabei::Backend::instance()->localDatabase()->searchPackages(args.first(), Akabei::SearchNameEqual)); } else if (operations.contains(APM::ShowNotRequired)) { showNotRequired(); } else if (operations.contains(APM::ShowUpgradeable)) { @@ -103,7 +100,7 @@ void QueryOperation::showInformation(QList packages) return; Akabei::Package * pkg = packages.first(); QTextStream out(stdout); - out.setFieldWidth(30); + out.setFieldWidth(20);//TODO: Use QFontMetrics to get width of longest word and use that as width of the field (Also in -Si) out.setFieldAlignment(QTextStream::AlignLeft); out << i18n("Name") << qSetFieldWidth(2) << ":" << qSetFieldWidth(20) << pkg->name() << endl; out << i18n("Version") << qSetFieldWidth(2) << ":" << qSetFieldWidth(20) << QString(pkg->version().toByteArray().data()) << endl; diff --git a/syncoperation.cpp b/syncoperation.cpp index 99ac53b..84e635b 100644 --- a/syncoperation.cpp +++ b/syncoperation.cpp @@ -84,7 +84,7 @@ void SyncOperation::start(QList operations, QMultiHash)), SLOT(showInformation(QUuid,QList))); - backend->searchPackages(args); + backend->searchPackages(args, Akabei::SearchNameEqual); break; } @@ -126,7 +126,7 @@ void SyncOperation::start(QList operations, QMultiHash)), SLOT(upgrade(QUuid,QList))); - queryId = backend->searchPackages(locals); + queryId = backend->searchPackages(locals, Akabei::SearchNameEqual); break; } @@ -137,7 +137,7 @@ void SyncOperation::start(QList operations, QMultiHash)), SLOT(install(QUuid,QList))); - queryId = backend->searchPackages(args); + queryId = backend->searchPackages(args, Akabei::SearchNameEqual); break; } -- GitLab