Changeset 3207 for trunk/protemix/src/recpt

Timestamp:

2002-07-03T12:57:49+12:00 (22 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/protemix/src/recpt

Files:

• browsetools.cpp (modified) (1 diff)
• ptmxdocaction.cpp (modified) (1 diff)
• ptmxqueryaction.cpp (modified) (2 diffs)

trunk/protemix/src/recpt/browsetools.cpp

@@ -44 +44 @@
 
   if (!response.docInfo[0].metadata["pdf"].values[0].empty()) {
-    textout << outconvert << disp
-        << "_document:imagepagepdf_"
-        << "_document:imagearticlepdf_";
-  }
+    textout << outconvert << disp << "_document:imagepagepdf_";
+  }
+
+  text_t top;
+  get_top (args["d"], top);
+  if (!get_info (top, args["c"], metadata, false, collectproto, response, logout)) return;
+  if (!response.docInfo[0].metadata["pdf"].values[0].empty()) {
+    textout << outconvert << disp << "_document:imagearticlepdf_";
+  }
+  
   textout << outconvert << disp
       << "_document:imagedetach_";

trunk/protemix/src/recpt/ptmxdocaction.cpp

@@ -87 +87 @@
 
     // ------ for ptmx collection
-
-    if (!args["c1"].empty() && args["c1"] != "Any") {
-      //    formattedstring = "[" + args["c1"] + "]:CL";
-      formattedstring = args["c1"];
-    }
-    if (!args["c2"].empty() && args["c2"] != "Any") {
-      if (!formattedstring.empty()) formattedstring += " & ";
-      //    formattedstring += "[" + args["c2"] + "]:CA";
-      formattedstring += args["c2"];
-    }
-    if (!args["c3"].empty() && args["c3"] != "Any") {
-      if (!formattedstring.empty()) formattedstring += " & ";
-      //    formattedstring += "[" + args["c3"] + "]:CS";
-      formattedstring += args["c3"];
-    }
-    if (!args["q"].empty()) {
-      if (!formattedstring.empty()) formattedstring += " & ";
-      formattedstring += args["q"];
-    }
 
     void insert_equiv_terms(text_t&); // declaration

trunk/protemix/src/recpt/ptmxqueryaction.cpp

@@ -110 +110 @@
 
   if (!args["c1"].empty() && args["c1"] != "Any") {
-    //    formattedstring = "[" + args["c1"] + "]:CL";
-    formattedstring = args["c1"];
+    formattedstring += "[" + args["c1"] + "]:CL";
   }
   if (!args["c2"].empty() && args["c2"] != "Any") {
     if (!formattedstring.empty()) formattedstring += " & ";
-    //    formattedstring += "[" + args["c2"] + "]:CA";
-    formattedstring += args["c2"];
+    formattedstring += "[" + args["c2"] + "]:CA";
   }
   if (!args["c3"].empty() && args["c3"] != "Any") {
@@ -125 +123 @@
   if (!args["q"].empty()) {
     if (!formattedstring.empty()) formattedstring += " & ";
-    formattedstring += args["q"];
+    // do synonym searching stuff
+    text_t qstring = args["q"];
+    int insert_equiv_terms(text_t&); // forward declaration
+    insert_equiv_terms(qstring);
+    formattedstring += qstring;
   }
 
-  // do synonym searching stuff
-  int insert_equiv_terms(text_t&); // forward declaration
-  insert_equiv_terms(formattedstring);
+  outconvertclass text_t2ascii;
+  logout << text_t2ascii << "formattedstring: " << formattedstring << "\n";
 
   if (!formattedstring.empty()) {