Changeset 443 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

1999-08-11T10:40:01+12:00 (25 years ago)

Author:

sjboddie

Message:

added some more format options including the ability to format the
document text

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (15 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.19  1999/08/10 22:40:01  sjboddie
+   added some more format options including the ability to format the
+   document text
+
    Revision 1.18  1999/08/09 04:25:18  sjboddie
    moved OID translation stuff from documentaction::define_external_macros
@@ -91 +95 @@
 
 
+#include <string.h>
 #include "documentaction.h"
 #include "browsetools.h"
@@ -356 +361 @@
 
 // define all the macros which are related to pages generated
-// by this action
+// by this action. we also load up the formatinfo structure 
+// here (it's used in do_action as well as here)
 void documentaction::define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
                          cgiargsclass &args, recptproto *collectproto, 
@@ -390 +396 @@
   if (collectproto == NULL) return;
 
+  // load up formatinfo
+  formatinfo.clear();
+  text_tmap::const_iterator format_here = collectinfo.format.begin();
+  text_tmap::const_iterator format_end = collectinfo.format.end();
+
+  while (format_here != format_end) {
+    if (((*format_here).first == "DocumentImages") && 
+    ((*format_here).second == "true"))
+      formatinfo.DocumentImages = true;
+    else if (((*format_here).first == "DocumentTopPages") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentTopPages = false;
+    else if ((*format_here).first == "DocumentHeading") 
+      formatinfo.DocumentHeading = (*format_here).second;
+    else if (((*format_here).first == "DocumentArrowsTop") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentArrowsTop = false;
+    else if (((*format_here).first == "DocumentArrowsBottom") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentArrowsBottom = false;
+    else if (((*format_here).first == "DocumentGoTo") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentGoTo = false;
+    else if ((*format_here).first == "DocumentButtons")
+      splitchar ((*format_here).second.begin(), (*format_here).second.end(),
+         '|', formatinfo.DocumentButtons);
+    else if ((*format_here).first == "DocumentText") 
+      formatinfo.DocumentText = (*format_here).second;
+
+    format_here ++;
+  }
   
   text_tarray metadata;
@@ -428 +465 @@
       text_t &classifytype = response.docInfo[0].metadata[1].values[0];
       if (classifytype.empty()) classifytype = "Book"; // defaults to Book
-      if ((classifytype == "Book") || (classifytype == "Hierarchy")) {
-    bool ShowTopPages = true;
-    text_tmap::const_iterator it = collectinfo.format.find("ShowTopPages");
-    if ((it != collectinfo.format.end()) && ((*it).second == "false")) ShowTopPages = false;
-    set_arrow_macros (arg_d, classifytype, ShowTopPages, disp, 
-              collectproto, collection, logout);
-      }
+
+      // set arrow macros if required
+      if (((classifytype == "Book") || (classifytype == "Hierarchy")) &&
+      (formatinfo.DocumentArrowsTop || formatinfo.DocumentArrowsBottom))
+    set_arrow_macros (arg_d, classifytype, formatinfo.DocumentTopPages, 
+              disp, collectproto, collection, logout);
+
 
       if (args["u"] != "1") {
     javaimagescontent = "_javaextras_";
-    javaimagescontent += "_javadetach_";
-    if (args["gt"] == "1") 
-      javaimagescontent += "_javacontracttext__javacontinue_";
-    else 
-      javaimagescontent += "_javaexpandtext_";
-    if (classifytype == "Hierarchy")
-      if (args["gc"] == "1")
-        javaimagescontent += "_javacontractcontents_";
-      else 
-        javaimagescontent += "_javaexpandcontents_";
-    if (args["hl"] != "1")
-      javaimagescontent += "_javahighlighting_";
-    else 
-      javaimagescontent += "_javanohighlighting_";
+    
+    int arg_gt = args.getintarg("gt");
+    int arg_gc = args.getintarg("gc");
+    int arg_hl = args.getintarg("hl");
+
+    text_tarray::const_iterator button_here = formatinfo.DocumentButtons.begin();
+    text_tarray::const_iterator button_end = formatinfo.DocumentButtons.end();
+
+    while (button_here != button_end) {
+      if (*button_here == "Detach") 
+        javaimagescontent += "_javadetach_";
+      else if (*button_here == "Expand Text") {
+        if (arg_gt == 1)
+          javaimagescontent += "_javacontracttext__javacontinue_";
+        else if (arg_gt == 2)
+          javaimagescontent += "_javacontracttext_";
+        else
+          javaimagescontent += "_javaexpandtext_";
+      } else if (*button_here == "Expand Contents") {
+        if (classifytype == "Hierarchy")
+          if (arg_gc == 1)
+        javaimagescontent += "_javacontractcontents_";
+          else
+        javaimagescontent += "_javaexpandcontents_";
+      } else if (*button_here == "Highlight") {
+        if (arg_hl == 1)
+          javaimagescontent += "_javanohighlighting_";
+        else 
+          javaimagescontent += "_javahighlighting_";
+      }
+      button_here ++;
+    }
     disp.setmacro ("javaimagescontent", "document", javaimagescontent);
       }
@@ -586 +641 @@
     }
 
-    bool ShowCoverImages = false;
     text_t formatkey = toptype + toptitle;
     if (!arg_d.empty()) formatkey = toptype + "Document";
@@ -592 +646 @@
     text_tmap::const_iterator it = collectinfo.format.find(formatkey);
     if (it != collectinfo.format.end()) formatstring = (*it).second;
-    it = collectinfo.format.find("ShowCoverImages");
-    if ((it != collectinfo.format.end()) && ((*it).second == "true")) ShowCoverImages = true;
 
     // output the table of contents
@@ -599 +651 @@
       
       if (toptype == "Hierarchy")
-    output_toc (thistype, formatstring, args, ShowCoverImages, collectproto, 
-            disp, outconvert, textout, logout);
+    output_standard_toc (thistype, formatinfo, formatstring, args, 
+                 collectproto, disp, outconvert, textout, logout);
 
       else
-    // Book is the default for a document level toc
-    book_toc (args, collectproto, disp,
-          outconvert, textout, logout);
+    output_document_toc (args, formatinfo, collectproto, disp,
+                 outconvert, textout, logout);
 
     } else {
-      // Book should never used at classification level (I think;)
-      output_toc (thistype, formatstring, args, false, collectproto, 
-          disp, outconvert, textout, logout);
+      output_standard_toc (thistype, formatinfo, formatstring, args,
+               collectproto, disp, outconvert, textout, logout);
     }
 
     // output the document text
-    output_document (OID, args, collectinfo, collectproto, disp, 
-             outconvert, textout, logout);
+    output_document (OID, args, collectproto, disp, outconvert, textout, logout);
 
     textout << outconvert << disp << "_document:footer_\n";
@@ -622 +671 @@
 }
 
+void documentaction::output_text (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+                  const TermInfo_tarray &terminfo, const text_t &OID,
+                  bool highlight, const text_t &hastxt, int wanttext, 
+                  text_t &collection, recptproto *collectproto, displayclass &disp, 
+                  outconvertclass &outconvert, ostream &textout, 
+                  ostream &logout) {
+  
+  DocumentRequest_t docrequest;
+  DocumentResponse_t docresponse;
+  comerror_t err;
+
+  if (hastxt == "1") {
+
+    if (wanttext) {
+      // get the text
+      docrequest.OID = OID;
+      collectproto->get_document (collection, docrequest, docresponse, err, logout);
+
+      // cut down on overhead by not using formattools if we only want the text
+      // (wanttext will equal 2 if we want text and other stuff too)
+      if (wanttext == 1)
+    if (highlight)
+      highlighttext(docresponse.doc, terminfo, disp, outconvert, textout, logout);
+    else
+      textout << outconvert << disp << docresponse.doc;
+    }
+  
+    if (wanttext != 1) {
+      text_t doctext = get_formatted_string (docinfo, formatlistptr, docresponse.doc); 
+      
+      if (highlight)
+    highlighttext(doctext, terminfo, disp, outconvert, textout, logout);
+      else
+    textout << outconvert << disp << doctext;
+    }
+  }
+}
+
 
 void documentaction::output_document (const text_t &OID, cgiargsclass &args, 
-                      const ColInfoResponse_t &collectinfo,
                       recptproto *collectproto, displayclass &disp, 
                       outconvertclass &outconvert, ostream &textout, 
                       ostream &logout) {
   FilterResponse_t inforesponse;
-  DocumentRequest_t docrequest;
-  DocumentResponse_t docresponse;
   FilterResponse_t queryresponse;
-  comerror_t err;
   text_tarray metadata;
+  bool getParents = false;
   bool highlight = false;
+  int wanttext = 0;
   int arg_gt = args.getintarg("gt");
   text_t &collection = args["c"];
@@ -647 +732 @@
   }
 
-  bool ShowSectionTitles = true;
-  text_tmap::const_iterator it = collectinfo.format.find("ShowSectionTitles");
-  if ((it != collectinfo.format.end()) && ((*it).second == "false")) ShowSectionTitles = false;
-
-  // get info on this document
-  metadata.push_back("Title");
+  format_t *formatlistptr = new format_t();
+  parse_formatstring (formatinfo.DocumentText, formatlistptr, metadata, getParents);
+
   metadata.push_back("hastxt");
   metadata.push_back("haschildren");
+  
+  if (formatinfo.DocumentText == "[Text]")
+    wanttext = 1;
+  else {
+    char *docformat = formatinfo.DocumentText.getcstr();
+    if (strstr (docformat, "[Text]") != NULL)
+      wanttext = 2;
+    delete docformat;
+  }
     
-  if (get_info (OID, collection, metadata, false, collectproto, inforesponse, logout)) {
-    text_t title = inforesponse.docInfo[0].metadata[0].values[0];
-    int hastxt = inforesponse.docInfo[0].metadata[1].values[0].getint();
-    int haschildren = inforesponse.docInfo[0].metadata[2].values[0].getint();
-      
+  int metasize = metadata.size();
+
+  if (get_info (OID, collection, metadata, getParents, collectproto, inforesponse, logout)) {
+    text_t hastxt = inforesponse.docInfo[0].metadata[metasize-2].values.back();
+    text_t &haschildren = inforesponse.docInfo[0].metadata[metasize-1].values.back();
+
     if (arg_gt == 0) {
-      if (hastxt == 1) {
-    // get the text
-    docrequest.OID = OID;
-    collectproto->get_document (collection, docrequest, docresponse, err, logout);
-      
-    if (ShowSectionTitles)
-      textout << outconvert << disp << "<p>\n<h3>" << title << "</h3>";
-    if (highlight)
-      highlighttext(docresponse.doc, queryresponse.termInfo, disp,
-            outconvert, textout, logout);
-    else
-      textout << outconvert << disp << docresponse.doc;
-      }
+      output_text (inforesponse.docInfo[0], formatlistptr, queryresponse.termInfo, 
+           OID, highlight, hastxt, wanttext, collection, collectproto, 
+           disp, outconvert, textout, logout);
+
+
     } else {
+
+      ResultDocInfo_t thisdocinfo = inforesponse.docInfo[0];
     
       // text is to be expanded
       text_t exOID = OID;
-      if (!haschildren) exOID = get_parent (OID);
+      if (haschildren != "1") exOID = get_parent (OID);
+      if (exOID.empty()) exOID = OID;
     
       // if we're not in a document (i.e. we're in a top level classification)
@@ -687 +774 @@
       if (args["d"].empty()) classifytype = "classify";
 
-      int i; // not used
-      get_contents (exOID, classifytype, i, collection, collectproto, inforesponse, logout);
+      int i = 0; // not used
+      get_contents (exOID, classifytype, metadata, i, collection, 
+            collectproto, inforesponse, logout);
     
       ResultDocInfo_tarray::const_iterator sechere = inforesponse.docInfo.begin();
@@ -700 +788 @@
     int seccount = 0;
     while (sechere != secend) {
-      if ((*sechere).metadata[3].values[0] == "1") seccount ++;
+      const text_t &shastxt = (*sechere).metadata[metasize-2].values.back();
+      if (shastxt == "1") seccount ++;
       if (seccount > 10) break;
       sechere ++;
@@ -708 +797 @@
       // for current section only
       textout << outconvert << disp << "_document:textltwarning_";
-      docrequest.OID = OID;
-      collectproto->get_document (collection, docrequest, docresponse, err, logout);
+
+      output_text (thisdocinfo, formatlistptr, queryresponse.termInfo, 
+               OID, highlight, hastxt, wanttext, collection, 
+               collectproto, disp, outconvert, textout, logout);
       
-      if (ShowSectionTitles)
-        textout << outconvert << disp << "<p>\n<h3>" << title << "</h3>";
-      if (highlight)
-        highlighttext(docresponse.doc, queryresponse.termInfo, disp,
-              outconvert, textout, logout);
-      else
-        textout << outconvert << disp << docresponse.doc;
     }
     else arg_gt = 2;
@@ -727 +811 @@
     int count = 0;
     while (sechere != secend) {
-      textout << outconvert << disp << "\n<p><a name=" << count << ">";
-      if (ShowSectionTitles) 
-        textout << outconvert << disp << "<h3>" 
-            << (*sechere).metadata[0].values[0] << "</h3>";
-      textout << "</a>\n";
-
-      if ((*sechere).metadata[3].values[0] == "1") {
-        docrequest.OID = (*sechere).OID;
-        collectproto->get_document (collection, docrequest, docresponse, err, logout);
-        if (highlight)
-          highlighttext(docresponse.doc, queryresponse.termInfo, disp, 
-                outconvert, textout, logout);
-        else
-          textout << outconvert << disp << docresponse.doc;
-      }
+      textout << outconvert << disp << "\n<p><a name=" << count << "></a>\n";
+
+      const text_t &shastxt = (*sechere).metadata[metasize-2].values.back();
+
+      output_text (*sechere, formatlistptr, queryresponse.termInfo, 
+               (*sechere).OID, highlight, shastxt, wanttext, collection, 
+               collectproto, disp, outconvert, textout, logout);
       count ++;
       sechere ++;
@@ -748 +824 @@
     }
   }
+  delete formatlistptr;
 }
 
 // highlighttext highlights query terms in text string and outputs the resulting text string
-void documentaction::highlighttext(text_t &text, TermInfo_tarray &terms, displayclass &disp,
-                   outconvertclass &outconvert, ostream &textout, ostream &/*logout*/) {
+void documentaction::highlighttext(text_t &text, const TermInfo_tarray &terms, 
+                   displayclass &disp, outconvertclass &outconvert, 
+                   ostream &textout, ostream &/*logout*/) {
 
   text_tmap allterms;