Changeset 347 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

1999-07-07T17:49:35+12:00 (25 years ago)

Author:

sjboddie

Message:

had another crack at the format string code - created a new formattools
module. It can now handle {If} and {Or} statements although there's a
bug preventing nested if's and or's.

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/07/07 05:49:35  sjboddie
+   had another crack at the format string code - created a new formattools
+   module. It can now handle {If} and {Or} statements although there's a
+   bug preventing nested if's and or's.
+
    Revision 1.9  1999/07/01 22:48:46  sjboddie
    had a go at getting a query result format string working
@@ -54 +59 @@
 #include "queryaction.h"
 #include "querytools.h"
+#include "formattools.h"
 
 queryaction::queryaction () {
@@ -310 +316 @@
       if (it != end) set_option_macro ("n", args["n"], (*it).second, disp);
   }
-}
-
-// returns false if formatstring has errors
-bool queryaction::parse_formatstring (const text_t &formatstring, text_tarray &formatarray,
-                      text_tmap &metamap, text_tarray &metadata, bool &getParents) {
-
-  formatarray.erase (formatarray.begin(), formatarray.end());
-  metadata.erase (metadata.begin(), metadata.end());
-  getParents = false;
-
-  text_t::const_iterator here = formatstring.begin();
-  text_t::const_iterator end = formatstring.end();
-
-  int metacount = 0;
-  text_t text;
-  while (here != end) {
-
-    if (*here == '\\')
-      text.push_back (*(++here));
-
-    else if (*here == '<') {
-      if (!text.empty()) formatarray.push_back (text);
-      text.clear();
-      text_t meta;
-      here ++;
-      while (*here != '>') {
-    if (here == end) return false;
-    meta.push_back (*here);
-    here ++;
-      }
-      parse_meta (meta, metacount, formatarray, metadata, getParents, metamap);
-
-    } else 
-      text.push_back (*here);
-
-    here ++;
-  }
-  if (!text.empty()) formatarray.push_back (text);
-
-  return true;
-}
-
-void queryaction::get_parent_options (const text_t &instring, text_t &options, 
-                      text_t &meta) {
-
-  options.clear();
-  meta.clear();
-  bool inquotes = false;
-  bool foundcolon = false;
-  text_t::const_iterator here = instring.begin()+6;
-  text_t::const_iterator end = instring.end();
-  while (here != end) {
-    if (*here == '(') inquotes = true;
-    else if (*here == ')') inquotes = false;
-    else if (*here == ':' && !inquotes) foundcolon = true;
-    else if (foundcolon) meta.push_back (*here);
-    else options.push_back (*here);
-    here ++;
-  }
-}
-
-void queryaction::parse_meta (const text_t &meta, int &count, text_tarray &formatarray,
-                  text_tarray &metadata, bool &getParents, text_tmap &metamap) {
-  
-  if (meta == "link" || meta == "/link") formatarray.push_back ("<" + meta + ">");
-  else {
-    text_t met = meta;
-
-    if (meta.size() > 7 && (substr (meta.begin(), meta.begin()+6) == "parent")) {
-      getParents = true;
-      text_t ops;
-      get_parent_options (meta, ops, met);
-    }
-    text_tmap::const_iterator it;
-    if ((it = metamap.find(met)) != metamap.end())
-      formatarray.push_back(meta);
-    else {
-      metamap[met] = count;
-      metadata.push_back (met);
-      formatarray.push_back (meta);
-      count ++;
-    }
-  }
-}
-
-void queryaction::output_results (const ResultDocInfo_tarray &results, const text_tarray &formatarray,
-                  const text_tmap &metamap, displayclass &disp, outconvertclass &outconvert, 
-                  ostream &textout) {
-
-  ResultDocInfo_tarray::const_iterator this_doc = results.begin();
-  ResultDocInfo_tarray::const_iterator end_doc = results.end();
-  text_tmap::const_iterator it;
-
-  textout << "<table cellspacing=4>\n";
-  while (this_doc != end_doc) {
-    textout << "<tr>\n";
-
-    text_tarray::const_iterator this_format = formatarray.begin();
-    text_tarray::const_iterator end_format = formatarray.end();
-
-    while (this_format != end_format) {
-
-      if (*this_format == "<link>")
-    textout << outconvert << disp << "<a href=\"_httpdocument_&cl=search&d=" + (*this_doc).OID + "\">";
-      else if (*this_format == "</link>") 
-    textout << "</a>";
-      else if ((it = metamap.find(*this_format)) != metamap.end())
-    textout << outconvert << disp 
-        << (*this_doc).metadata[(*it).second.getint()].values.back();
-      else if ((*this_format).size() > 7 && 
-           (substr ((*this_format).begin(), (*this_format).begin()+6) == "parent")) {
-    text_t options, meta;
-    get_parent_options (*this_format, options, meta);
-    if ((it = metamap.find(meta)) != metamap.end()) {
-      int metanum = (*it).second.getint();
-      if (options.empty()) {
-        // no options - we just want the immediate parent
-        int num = (*this_doc).metadata[metanum].values.size();
-        if (num > 1)
-          textout << outconvert << disp
-              << (*this_doc).metadata[metanum].values[num-2];
-      } else if (options == "top") {
-        // want the top parent
-        if ((*this_doc).metadata[metanum].values.size() > 1)
-          textout << outconvert << disp
-              << (*this_doc).metadata[metanum].values[0];
-      } else {
-        // the 'all' option 
-        if (substr (options.begin(), options.begin()+3) != "all")
-          // bad format or unknown option
-          textout << outconvert << disp << *this_format;
-        else {
-          text_t::const_iterator fquote = findchar (options.begin(), options.end(), '\'');
-          text_t separator = substr (fquote+1, findchar (fquote+1, options.end(), '\''));
-          text_tarray::const_iterator here = (*this_doc).metadata[metanum].values.begin();
-          // the last metadata value is for the current OID (i.e. it's not a parent)
-          text_tarray::const_iterator end = ((*this_doc).metadata[metanum].values.end()) - 1;
-          bool first = true;
-          while (here != end) {
-        if (!first) textout << outconvert << disp << separator;
-        textout << outconvert << disp << *here;
-        first = false;
-        here ++;
-          }
-        }
-      }
-    } else {
-      // Didn't get any metadata by this name, maybe 
-      // it's just plain text that happened to match (oops!!)
-      textout << outconvert << disp << *this_format;
-    }     
-      } else 
-    textout << outconvert << disp << *this_format;
-      
-      this_format ++;
-      
-    }
-    textout << "</tr>\n";
-    this_doc ++;
-  }
-
-  textout << "</table>\n";
 }
 
@@ -491 +335 @@
   // if we still don't have a format string use the default
   if (formatstring.empty()) 
-    formatstring = "\\<td valign=top nowrap\\><link>_icontext_</link>\\</td\\>\\<td\\><Title>\\</td\\>";
+    formatstring = "<td valign=top nowrap>[link]_icontext_[/link]</td><td>[Title]</td>";
 
   if (collectproto == NULL) {
@@ -503 +347 @@
     FilterResponse_t response;
     text_t quotedstring;
-    text_tarray formatarray;
-    text_tmap metamap;
-    parse_formatstring (formatstring, formatarray, metamap, 
-            request.fields, request.getParents);
+    format_t *formatlistptr = new format_t();
+
+    parse_formatstring (formatstring, formatlistptr, request.fields, request.getParents);
 
     // do the query
     request.filterResultOptions = FROID | FRmetadata | FRtermFreq;
-    //    request.fields.push_back ("Title");
-    //    request.fields.push_back ("Creator");
-    //    request.getParents = true;
     if (!do_query (request, args, collectproto, quotedstring, response, logout))
       return false;
@@ -520 +360 @@
     
     // output the header
-    textout << outconvert << disp << "_query:header_\n_query:content_";
-
-    output_results (response.docInfo, formatarray, metamap, disp, outconvert, textout);
-
+    textout << outconvert << disp << "_query:header_\n"
+        << "_query:content_";
+
+    // output the results
+    textout << "<table cellspacing=4>\n";
+    ResultDocInfo_tarray::const_iterator this_doc = response.docInfo.begin();
+    ResultDocInfo_tarray::const_iterator end_doc = response.docInfo.end();
+
+    while (this_doc != end_doc) {
+      textout << outconvert << disp << "<tr>\n"
+          << get_formatted_string (*this_doc, formatlistptr) << "\n"
+          << "</tr>\n";
+      this_doc ++;
+    }
+    textout << "</table>\n";
+
+    delete (formatlistptr);
     
     // output the footer