Changeset 22047

Timestamp:

2010-05-06T12:55:26+12:00 (14 years ago)

Author:

davidb

Message:

Changes necessary to support new sql-query action

File:

• main/trunk/greenstone2/runtime-src/src/recpt/documentaction.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/documentaction.cpp

@@ -1286 +1286 @@
     text_t formattedstring = args["q"];
     format_querystring (formattedstring, args.getintarg("b"), segment);
-    set_queryfilter_options (request, formattedstring, args);
+    set_fulltext_queryfilter_options (request, formattedstring, args);
     args["q"] = formattedstring; // need to set this here for phrase 
                    // highlighting, where we look at the querystring
@@ -1378 +1378 @@
     int count = 0;
     while (sechere != secend) {
-      textout << outconvert << disp << "\n<p><a name=" << (*sechere).OID << "></a>\n";
+      textout << outconvert << disp << "\n<p><a name=\"" << (*sechere).OID << "\"></a>\n";
 
       int shastxt = (*sechere).metadata["hastxt"].values[0].getint();
+
 
       output_text (*sechere, formatlistptr, queryresponse.termInfo, 
                (*sechere).OID, highlight, shastxt, wanttext, collection, 
                collectproto, browsers, disp, outconvert, textout, logout, args);
+
       ++count;
       ++sechere;
@@ -1421 +1423 @@
             text_t formattedstring = args["q"];
             format_querystring (formattedstring, args.getintarg("b"), segment);
-            set_queryfilter_options (request, formattedstring, args);
+            set_fulltext_queryfilter_options (request, formattedstring, args);
             args["q"] = formattedstring;    //need to set this here for phrase 
                                 //highlighting, where we look at the querystring