From f4c0bc632fc358cfe7a527d917a198d98a9b7b05 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Mon, 11 Apr 2016 10:34:28 -0400
Subject: [PATCH] (API CHANGE) Enhance the sysadm-pkg search functionality a
 bit: 1) Add a new optional argument to the pkg_search action:
 "search_excludes" (string or array of strings). This will exclude matches
 which contain a restricted string. 2) Add a new output field to the search
 results: "pkg_search":{"results_order":[list of origins by priority], <other
 results/data> } 3) Adjust how the search is performed when the search term
 has multiple words. First look for any result which contains all the words,
 then if nothing is found look for any result which contains any of the words.

---
 src/server/WebBackend.cpp         |  9 +++++-
 src/server/library/sysadm-pkg.cpp | 49 +++++++++++++++++++++++++------
 src/server/library/sysadm-pkg.h   |  2 +-
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index 753cf50..f61cd8f 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -726,11 +726,18 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmPkgRequest(const QJsonValue
     //REQUIRED: "search_term" (string to search for)
     //OPTIONAL: "repo"
     //OPTIONAL: "category"
+    //OPTIONAL: "search_excludes" (array of string or single string);
     QString srch = in_args.toObject().value("search_term").toString();
     if(srch.isEmpty()){ return RestOutputStruct::BADREQUEST; }
-    QStringList pkgs = sysadm::PKG::pkg_search(repo, srch, cat);
+    QStringList exclude;
+    if(in_args.toObject().contains("search_excludes")){
+      if(in_args.toObject().value("search_excludes").isString()){ exclude << in_args.toObject().value("search_excludes").toString(); }
+      else if(in_args.toObject().value("search_excludes").isArray()){ exclude = JsonArrayToStringList( in_args.toObject().value("search_excludes").toArray() ); }
+    }
+    QStringList pkgs = sysadm::PKG::pkg_search(repo, srch, exclude, cat);
     if(!pkgs.isEmpty()){
       QJsonObject info = sysadm::PKG::pkg_info(pkgs, repo, cat, false); //always do simple results for a search
+      info.insert("results_order", QJsonArray::fromStringList(pkgs));
       if(!info.isEmpty()){ out->insert("pkg_search",info); }
     }else{
       return RestOutputStruct::NOCONTENT;
diff --git a/src/server/library/sysadm-pkg.cpp b/src/server/library/sysadm-pkg.cpp
index 580bfd9..99618d7 100644
--- a/src/server/library/sysadm-pkg.cpp
+++ b/src/server/library/sysadm-pkg.cpp
@@ -89,18 +89,28 @@ inline void checkDB(QString repo){
 // =================
 QJsonObject PKG::pkg_info(QStringList origins, QString repo, QString category, bool fullresults){
   QJsonObject retObj;
+  //if(origins.contains("math/R")){ qDebug() << "pkg_info:" << repo << category; }
   checkDB(repo); //create if needed
   QSqlDatabase DB = QSqlDatabase::database(repo);
   if(!DB.isOpen()){ return retObj; } //could not open DB (file missing?)
   //Now do all the pkg info, one pkg origin at a time
   origins.removeAll("");
+  origins.removeDuplicates();
     QString q_string = "SELECT * FROM packages";
-    if(!origins.isEmpty()){ q_string.append(" WHERE origin = '"+origins.join("' OR origin = '")+"'"); }
+    if(!origins.isEmpty()){ 
+      q_string.append(" WHERE origin IN ('"+origins.join("', '")+"')"); 
+      //Also keep the ordering of the origins preserved
+      /*q_string.append(" ORDER BY CASE origins ");
+      for(int i=0; i<origins.length(); i++){ q_string.append("WHEN '"+origins[i]+"' THEN '"+QString::number(i+1)+"' "); }
+      q_string.append("END");*/
+    }
     else if(!category.isEmpty()){ q_string.append(" WHERE origin LIKE '"+category+"/%'"); }
+    //if(origins.contains("math/R")){ qDebug() << "Query:" << q_string; }
   QSqlQuery query(q_string, DB);
     while(query.next()){
 	QString id = query.value("id").toString(); //need this pkg id for later
 	QString origin = query.value("origin").toString(); //need the origin for later
+	//if(origins.contains("math/R")){ qDebug() << "Found origin:" << origin << id; }
       if(id.isEmpty() || origin.isEmpty()){ continue; }
       QJsonObject info;
       //General info
@@ -191,54 +201,75 @@ QJsonObject PKG::pkg_info(QStringList origins, QString repo, QString category, b
   return retObj;
 }
 
-QStringList PKG::pkg_search(QString repo, QString searchterm, QString category){
+QStringList PKG::pkg_search(QString repo, QString searchterm, QStringList searchexcludes, QString category){
   checkDB(repo); //create if needed
   QSqlDatabase DB = QSqlDatabase::database(repo);
   if(!DB.isOpen()){ return QStringList(); } //could not open DB (file missing?)
   
+  QStringList terms = searchterm.split(" ",QString::SkipEmptyParts);
+  searchexcludes.removeAll("");
   QStringList found;
-  QString q_string = "SELECT origin FROM packages WHERE name = '"+searchterm+"'";
+  QString q_string;
+int numtry = 0;
+while(found.isEmpty() && numtry<2){
+  if(numtry<1 && !searchterm.contains(" ")){ //single-word-search (exact names never have multiple words)
+    q_string = "SELECT origin FROM packages WHERE name = '"+searchterm+"' OR origin LIKE '%/"+searchterm+"'";
     if(!category.isEmpty()){ q_string.append(" AND origin LIKE '"+category+"/%'"); }
+    if(!searchexcludes.isEmpty()){ q_string.append(" AND name NOT LIKE '%"+searchexcludes.join("%' AND name NOT LIKE '%")+"%'"); }
     QSqlQuery query(q_string, DB);
     while(query.next()){
 	found << query.value("origin").toString(); //need the origin for later
     }
-  if(found.isEmpty()){
+  }
+  if(found.length()<10 && numtry<1){
     //Expand the search to names containing the term
     q_string = "SELECT origin FROM packages WHERE name LIKE '"+searchterm+"%'";
     if(!category.isEmpty()){ q_string.append(" AND origin LIKE '"+category+"/%'"); }
+    if(!searchexcludes.isEmpty()){ q_string.append(" AND name NOT LIKE '%"+searchexcludes.join("%' AND name NOT LIKE '%")+"%'"); }
     QSqlQuery q2(q_string, DB);
     while(q2.next()){
 	found << q2.value("origin").toString(); //need the origin for later
     }
   }
-  if(found.isEmpty()){
+  if(found.length()<10 && numtry<1){
     //Expand the search to names containing the term
     q_string = "SELECT origin FROM packages WHERE name LIKE '%"+searchterm+"%'";
     if(!category.isEmpty()){ q_string.append(" AND origin LIKE '"+category+"/%'"); }
+    if(!searchexcludes.isEmpty()){ q_string.append(" AND name NOT LIKE '%"+searchexcludes.join("%' AND name NOT LIKE '%")+"%'"); }
     QSqlQuery q2(q_string, DB);
     while(q2.next()){
 	found << q2.value("origin").toString(); //need the origin for later
     }
   }
-  if(found.isEmpty()){
+  if(found.length()<10){
     //Expand the search to comments
-    q_string = "SELECT origin FROM packages WHERE comment LIKE '%"+searchterm+"%'";
+    if(terms.length()<2){ q_string = "SELECT origin FROM packages WHERE comment LIKE '%"+searchterm+"%'"; }
+    else if(numtry==0){ q_string = "SELECT origin FROM packages WHERE comment LIKE '%"+terms.join("%' AND comment LIKE '%")+"%'"; }
+    else if(numtry==1){ q_string = "SELECT origin FROM packages WHERE comment LIKE '%"+terms.join("%' OR comment LIKE '%")+"%'"; }
     if(!category.isEmpty()){ q_string.append(" AND origin LIKE '"+category+"/%'"); }
+    if(!searchexcludes.isEmpty()){ q_string.append(" AND comment NOT LIKE '%"+searchexcludes.join("%' AND comment NOT LIKE '%")+"%'"); }
     QSqlQuery q2(q_string, DB);
     while(q2.next()){
 	found << q2.value("origin").toString(); //need the origin for later
     }
   }
-  if(found.isEmpty()){
+  if(found.length()<10){
     //Expand the search to full descriptions
-    q_string = "SELECT origin FROM packages WHERE desc LIKE '%"+searchterm+"%'";
+    if(terms.length()<2){ q_string = "SELECT origin FROM packages WHERE desc LIKE '%"+searchterm+"%'"; }
+    else if(numtry==0){ q_string = "SELECT origin FROM packages WHERE desc LIKE '%"+terms.join("%' AND desc LIKE '%")+"%'"; }
+    else if(numtry==1){ q_string = "SELECT origin FROM packages WHERE desc LIKE '%"+terms.join("%' OR desc LIKE '%")+"%'"; }
     if(!category.isEmpty()){ q_string.append(" AND origin LIKE '"+category+"/%'"); }
+    if(!searchexcludes.isEmpty()){ q_string.append(" AND desc NOT LIKE '%"+searchexcludes.join("%' AND desc NOT LIKE '%")+"%'"); }
     QSqlQuery q2(q_string, DB);
     while(q2.next()){
 	found << q2.value("origin").toString(); //need the origin for later
     }
   }
+  //Now bump the try count
+  numtry++;
+} //end while loop  for number of tries
+  //if(searchterm=="R"){ qDebug()<< "Search:" << searchterm << category << found; }
+  found.removeDuplicates();
   return found;
 }
 
diff --git a/src/server/library/sysadm-pkg.h b/src/server/library/sysadm-pkg.h
index 2871250..769bb74 100644
--- a/src/server/library/sysadm-pkg.h
+++ b/src/server/library/sysadm-pkg.h
@@ -21,7 +21,7 @@ class PKG{
 public:
 	//Information fetch routines
 	static QJsonObject pkg_info(QStringList origins, QString repo, QString category = "", bool fullresults = true);
-	static QStringList pkg_search(QString repo, QString searchterm, QString category = "");
+	static QStringList pkg_search(QString repo, QString searchterm, QStringList searchexcludes, QString category = "");
 	static QJsonArray list_categories(QString repo);
 	static QJsonArray list_repos();