Changeset 2502

Timestamp:

2001-06-07T11:10:32+12:00 (23 years ago)

Author:

sjboddie

Message:

fixed a bug in my phindaction implementation

Location:

trunk/gsdl/src/recpt

Files:

• phindaction.cpp (modified) (5 diffs)
• phindaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/phindaction.cpp

@@ -129 +129 @@
                  ostream &logout) {
 
-  // must have a valid collection server
-  recptproto *collectproto = protos->getrecptproto (args["c"], logout);
-  if (collectproto == NULL) {
-    logout << "phindaction::do_action called with NULL collectproto\n";
-    textout << outconvert << disp << "_header_\n" 
-        << "Error: Attempt to get document without setting collection\n"
-        << "_footer_\n";
-    return true;
-  }
-
   unsigned long count_l, count_e, count_d;
   unsigned long phrase = args["ppnum"].getulong();
@@ -151 +141 @@
   if (args["pxml"] == "1") XMLmode = true;
 
+  // must have a valid collection server
+  recptproto *collectproto = protos->getrecptproto (args["c"], logout);
+  if (collectproto == NULL) {
+    output_error("phindaction: ERROR: collection not set", textout, 
+         outconvert, disp, logout, XMLmode);
+    return true;
+  }
 
   // the frequency and occurances of the phrase
@@ -167 +164 @@
     
     if (word.empty()) {
-      logout << "phindaction::do_action ERROR: No phrase number or word\n";
-      textout << outconvert << disp << "_header_\n"
-          << "Error: No phrase number or word."
-          << "_footer_\n";
+      output_error("phindaction: ERROR: no phrase number or word", textout, 
+           outconvert, disp, logout, XMLmode);
       return true;
     }
@@ -178 +173 @@
     
     if (result.empty()) {
-      logout << "phindaction::do_action ERROR: The search term does not occur in the collection.";
-      textout << outconvert << disp << "_header_\n"
-          << "ERROR: The search term does not occur in the collection."
-          << "_footer_\n";
+      output_error("phindaction: The search term does not occur in the collection",
+           textout, outconvert, disp, logout, XMLmode);
       return true;
     } else {
@@ -937 +930 @@
 }
 
+void phindaction::output_error (const text_t &message, ostream &textout, 
+                outconvertclass &outconvert,
+                displayclass & disp, ostream &logout,
+                bool XMLmode) {
+
+  logout << outconvert << message << "\n";
+  if (XMLmode) {
+    textout << outconvert
+        << "<phinddata>\n"
+        << "<phinderror>" << message << "</phinderror>\n"
+        << "</phinddata>\n";
+  } else {
+    textout << outconvert << disp 
+        << "_header_\n" 
+        << message
+        << "_footer_\n";
+  }
+}

trunk/gsdl/src/recpt/phindaction.h

@@ -91 +91 @@
   void toUCArray(const text_t &in, UCArray &out);
 
+  void output_error (const text_t &message, ostream &textout, 
+             outconvertclass &outconvert,
+             displayclass & disp, ostream &logout,
+             bool XMLmode);
+
 
 public: