Changeset 3167

Timestamp:

2002-06-23T21:18:28+12:00 (21 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/protemix/src/recpt

Files:

• Makefile (deleted)
• Makefile.in (modified) (2 diffs)
• browsetools.cpp (added)
• config.log (deleted)
• config.status (deleted)
• gsdlsite.cfg (deleted)
• ptmxmain.cpp (modified) (2 diffs)
• ptmxqueryaction.cpp (modified) (3 diffs)

trunk/protemix/src/recpt/Makefile.in

@@ -67 +67 @@
 HEADERS = ptmxqueryaction.h
 
-SOURCES = ptmxmain.cpp ptmxqueryaction.cpp
+SOURCES = ptmxmain.cpp ptmxqueryaction.cpp browsetools.cpp
 
-OBJECTS = ptmxmain.o ptmxqueryaction.o
+OBJECTS = ptmxmain.o ptmxqueryaction.o browsetools.o
 
 EXEC    = ptmx
@@ -98 +98 @@
 
 PTMX_OBJS = $(OBJECTS) \
-    $(MAINRECPTDIR)/browsetools.o \
     $(MAINRECPTDIR)/browserclass.o \
     $(MAINRECPTDIR)/vlistbrowserclass.o \

trunk/protemix/src/recpt/ptmxmain.cpp

@@ -61 +61 @@
   receptionist recpt;
   nullproto    nproto;
-  
-  text_t gsdlhome, httpdomain, httpprefix;
-  // get gsdlhome (if we fail the error will be picked up later -- in
-  // cgiwrapper)
-  site_cfg_read (gsdlhome, httpdomain, httpprefix);
-  collectset *cservers = new collectset();
-  cservers->add_collection ("protemix", &recpt, gsdlhome, gsdlhome);
+  text_t gsdlhome;
+
+  collectset *cservers = new collectset(gsdlhome);
 
   // set up the null protocol
@@ -121 +117 @@
   recpt.add_browser (&aphindbrowserclass);
 
-  cgiwrapper (recpt, "protemix");
+  cgiwrapper (recpt, "ptmx");
   delete cservers;
   return 0;

trunk/protemix/src/recpt/ptmxqueryaction.cpp

@@ -64 +64 @@
 }
 
-
 bool ptmxqueryaction::search_single_collection (cgiargsclass &args, const text_t &collection,
                         recptprotolistclass *protos, browsermapclass *browsers, 
@@ -110 +109 @@
   text_t formattedstring = "";
 
-  logout << "here we go...\n";
-
-  if (args["qt"]=="0") { // normal text search
-    logout << "normal text search ...\n";
-    formattedstring = args["q"];
-    format_querystring (formattedstring, args.getintarg("b"));
-    add_dates(formattedstring, args.getintarg("ds"), args.getintarg("de"),
-        args.getintarg("dsbc"), args.getintarg("debc"));
+  if (!args["c1"].empty() && args["c1"] != "Any") {
+    formattedstring = "[" + args["c1"] + "]:CL";
   }
-  else if (args["qt"]=="1" ){ // form search
-
-    logout << "form search ...\n";
-
-    if (args["b"]=="1" && args["fqa"]=="1") { // explicit query
-      formattedstring = args["q"];
-    }
-    else { // form search
-      if (args["b"]=="0") { // regular form
-    parse_reg_query_form(formattedstring, args);
-      }
-      else  { // advanced form
-    parse_adv_query_form(formattedstring, args);
-      }
-      args["q"] = formattedstring;
-      
-      // reset the cgiargfqv macro - need to escape any quotes in it
-      disp.setmacro("cgiargfqv", "query", escape_quotes(args["fqv"]));
-
-      // also reset the _cgiargq_ macro as it has changed now
-      disp.setmacro("cgiargq", "Global", html_safe(args["q"]));
-      
-      // reset the compressed options to include the q arg
-      text_t compressedoptions = recpt->get_compressed_arg(args, logout);
-      if (!compressedoptions.empty()) {
-    disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
-    // need a decoded version of compressedoptions for use within forms
-    // as browsers encode values from forms before sending to server
-    // (e.g. %25 becomes %2525)
-    decode_cgi_arg (compressedoptions);
-    disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
-      }
-    } // form search
-  } // args["qt"]=1
-  else {
-    logout << "ERROR (query_action::search_single_collection): querytype not defined\n";
-    return false;
+  if (!args["c2"].empty() && args["c2"] != "Any") {
+    if (!formattedstring.empty()) formattedstring += " & ";
+    formattedstring += "[" + args["c2"] + "]:CA";
+  }
+  if (!args["c3"].empty() && args["c3"] != "Any") {
+    if (!formattedstring.empty()) formattedstring += " & ";
+    formattedstring += "[" + args["c3"] + "]:CS";
+  }
+  if (!args["q"].empty()) {
+    if (!formattedstring.empty()) formattedstring += " & ";
+    formattedstring += args["q"];
   }
 
-  if (!formattedstring.empty()) { // do the query
+  logout << outconvert << "formattedstring: " << formattedstring << "\n";
+
+  if (!formattedstring.empty()) {
     // note! formattedstring is in unicode! mg and mgpp must convert!
     set_queryfilter_options (request, formattedstring, args);
@@ -171 +140 @@
  
     define_query_macros (args, disp, response);
-
-    // save the query if appropriate
-    if (!save_search_history(args, response))
-      logout << "save failed"; 
   }
-
-  define_history_macros (disp, args, protos, logout);
   
   textout << outconvert << disp << "_query:header_\n"