Changeset 11988

Timestamp:

2006-06-30T16:07:57+12:00 (18 years ago)

Author:

kjdon

Message:

changed the defaults for ct, qt and qto to be empty, then set_query_type_args is called to set them

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -69 +69 @@
   arg_ainfo.multiplechar = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "0";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -319 +319 @@
   arg_ainfo.multiplechar = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "0";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -328 +328 @@
   arg_ainfo.multiplechar = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "3";
+  arg_ainfo.argdefault = g_EmptyText;
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -581 +581 @@
   // _thislast_
 
+  
   define_form_macros(disp, args, protos, logout);
   
   define_query_interface(disp, args, protos, logout);
+
 
 }
@@ -609 +611 @@
     return;
   }
-  
-    
+   
   text_tmap::iterator check = colinfo->format.find("QueryInterface");
   if(check != colinfo->format.end()){
@@ -678 +679 @@
   recptproto *collectproto = protos->getrecptproto (args["c"], logout);
   if (collectproto == NULL) return;
+
+  ColInfoResponse_t *colinfo = recpt->get_collectinfo_ptr(collectproto, 
+                              args["c"],
+                              logout);
+  set_query_type_args(colinfo, args);
 
   comerror_t err;
@@ -1345 +1351 @@
   get_formatted_query_string(formattedstring, segment, args, disp, logout);
 
-  if (!formattedstring.empty()) { // do the query
+    if (!formattedstring.empty()) { // do the query
     // note! formattedstring is in unicode! mg and mgpp must convert!
     set_queryfilter_options (request, formattedstring, args);