Changeset 12276

Timestamp:

2006-07-24T02:57:51+12:00 (18 years ago)

Author:

sjboddie

Message:

Added "Sort Field" (sf) argument that can be passed through to a lucene
collection to sort search results by a metadata field.

Location:

trunk/gsdl/src

Files:

• colservr/lucenesearch.cpp (modified) (2 diffs)
• colservr/queryfilter.cpp (modified) (3 diffs)
• colservr/queryinfo.cpp (modified) (4 diffs)
• colservr/queryinfo.h (modified) (1 diff)
• recpt/queryaction.cpp (modified) (1 diff)
• recpt/querytools.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -123 +123 @@
     if (*here == '"') escaped_utf8querystring.push_back('\\');
     escaped_utf8querystring.push_back(*here);
-    here++;
+    ++here;
   }
   cerr << "**** escaped query string = " << escaped_utf8querystring << endl;
@@ -130 +130 @@
   text_t cmd = "\"" + filename_cat(gsdlhome, "bin", "script", "lucene_query.pl") + "\"";
   cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 
+  if (!queryparams.sortfield.empty()) {
+    cmd += " \"" + queryparams.sortfield + "\"";
+  }
   cerr << "Lucene command: " << cmd << endl;
  

trunk/gsdl/src/colservr/queryfilter.cpp

@@ -90 +90 @@
   query.maxdocs = filterOptions["Maxdocs"].defaultValue.getint();
   query.level = filterOptions["Level"].defaultValue;
+  query.sortfield = filterOptions["SortField"].defaultValue;
   OptionValue_tarray::const_iterator options_here = request.filterOptions.begin();
   OptionValue_tarray::const_iterator options_end = request.filterOptions.end();
@@ -115 +116 @@
       query.stemming = (filterOptions["Stem"].defaultValue == "true");
       query.level = filterOptions["Level"].defaultValue;
+      query.sortfield = filterOptions["SortField"].defaultValue;
       // "all", needed when combining queries where the document results are needed
       if (need_matching_docs (request.filterResultOptions)) query.maxdocs = -1; 
@@ -146 +148 @@
     } else if ((*options_here).name == "Level") {
       query.level = (*options_here).value;
+    } else if ((*options_here).name == "SortField") {
+      query.sortfield = (*options_here).value;
     } else {
       logout << text_t2ascii

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -47 +47 @@
   maxdocs = -1;    // all
   maxnumeric = 4;  // must default to the same value as mg_passes
+  sortfield.clear();
 }
 
@@ -64 +65 @@
   maxdocs = q.maxdocs;
   maxnumeric = q.maxnumeric;
+  sortfield = q.sortfield;
 
   return *this;
@@ -82 +84 @@
       (x.stemming == y.stemming) &&
       (x.maxdocs == y.maxdocs) &&
-      (x.maxnumeric == y.maxnumeric));
+      (x.maxnumeric == y.maxnumeric) &&
+          (x.sortfield == y.sortfield));
 }
 
@@ -107 +110 @@
   outs << " maxdocs = \"" << q.maxdocs << "\"\n";
   outs << " maxnumeric = \"" << q.maxnumeric << "\"\n";
+  outs << " sortfield = \"" << q.sortfield << "\"\n";
   outs << "\n";
 

trunk/gsdl/src/colservr/queryinfo.h

@@ -66 +66 @@
   int maxdocs;
   int maxnumeric;
+  text_t sortfield; // Field to use for sorting result set (currently used by lucene)
 
   queryparamclass ();

trunk/gsdl/src/recpt/queryaction.cpp

@@ -429 +429 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // "sf" - Sort field. Set to field to be used for sorting search reult
+  // set (only implemented for lucene collections at present).
+  arg_ainfo.shortname = "sf";
+  arg_ainfo.longname = "sort field";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = g_EmptyText;
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
 }
 

trunk/gsdl/src/recpt/querytools.cpp

@@ -138 +138 @@
     option.name = "Level";
     option.value = args["g"];
+    request.filterOptions.push_back (option);
+  }
+
+  if (!args["sf"].empty()) { // sort field for lucene
+    option.name = "SortField";
+    option.value = args["sf"];
     request.filterOptions.push_back (option);
   }