Changeset 22984 for main/trunk/greenstone2/runtime-src/src/recpt/basequeryaction.cpp

Timestamp:

2010-09-28T18:35:06+13:00 (14 years ago)

Author:

ak19

Message:

1. Undoing commit of 22934 where decode_commas was called on stem and fold comma separated list: previously separated due to url-encoding of commas. Now that the problem has been fixed at the source, the decode_commas hack is no longer necessary. 2. Commas in stem and fold are no longer url-encoded because the multiple_value field of the continuously-reused struct arg_ainfo is always set back to the default false after ever being set to true. So it no longer subtly stays at true to affect Greenstone functioning in unforeseen ways (such as suddenly and unnecessarily URL-encoding commas where this is not wanted).

File:

• main/trunk/greenstone2/runtime-src/src/recpt/basequeryaction.cpp (modified) (18 diffs)

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

@@ -58 +58 @@
   arg_ainfo.longname = "query string";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -67 +68 @@
   arg_ainfo.longname = "query string for second query";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -76 +78 @@
   arg_ainfo.longname = "combine queries";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -86 +89 @@
   arg_ainfo.longname = "maximum number of documents";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "50";
@@ -95 +99 @@
   arg_ainfo.longname = "hits per page";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "20";
@@ -104 +109 @@
   arg_ainfo.longname = "start results from";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "1";
@@ -114 +120 @@
   arg_ainfo.longname = "i'm feeling lucky";
   arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -123 +130 @@
   arg_ainfo.longname = "i'm feeling lucky number";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "1";
@@ -132 +140 @@
   arg_ainfo.longname = "the next search result number";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
@@ -141 +150 @@
   arg_ainfo.longname = "the previous search result number";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
@@ -151 +161 @@
   arg_ainfo.longname = "sort field";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -161 +172 @@
   arg_ainfo.longname = "form query num fields";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "4";
@@ -171 +183 @@
   arg_ainfo.longname = "form query fields";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -181 +194 @@
   arg_ainfo.longname = "form query values";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -192 +206 @@
   arg_ainfo.longname = "form query combines";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -201 +216 @@
   arg_ainfo.longname = "form query advanced query";
   arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";
@@ -211 +227 @@
   arg_ainfo.longname = "Lucene fuzziness value";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;
@@ -234 +251 @@
   arg_ainfo.longname = "history save";
   arg_ainfo.multiplechar = false;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "0";