Changeset 22693 for main/trunk/greenstone2/runtime-src/src/recpt

Timestamp:

2010-08-19T23:40:25+12:00 (14 years ago)

Author:

davidb

Message:

'multiplevalue' appears to be left undefined -- in general for all args being set. In the case of 'sqlsf' this lead to a conflict-warning message. The current fix, sorts out the problem in this one case, but looks like a more general solution should be implemented. This could be as simple as ensuring sensible default values in its constructor

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• queryaction.cpp (modified) (2 diffs)
• sqlqueryaction.cpp (modified) (2 diffs)

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

@@ -316 +316 @@
   
 
+  // ****
+  // should this even be here???
+  // seems to be mixed up between "sf" and "sqlsf"
+
   // "sf" - Sort field. Set to field to be used for sorting search reult
   // set (only implemented for lucene collections at present).
@@ -321 +325 @@
   arg_ainfo.longname = "sql sort field";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;

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

@@ -100 +100 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // ****
+  // Looks like 'multiplevalue' is left undefined (e.g. not set in
+  // constructor).  This looks like a fairly major problem
+  // in terms of leaving it undefine
+  // => in the case of "sqlsf" leads to conflict over value it has
+
   // "sqlsf" - Sort field. Set to field to be used for sorting search reult
   // set 
@@ -105 +111 @@
   arg_ainfo.longname = "sql sort field";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = g_EmptyText;