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

Timestamp:

1999-06-24T17:12:25+12:00 (25 years ago)

Author:

sjboddie

Message:

lots of small changes

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/06/24 05:12:20  sjboddie
+   lots of small changes
+
    Revision 1.7  1999/06/17 03:06:58  sjboddie
    got detach button working properly - the close book icon is now disabled
@@ -148 +151 @@
 }
 
-bool documentaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &/*args*/, 
-                    ostream &/*logout*/) {
-  // don't want to check anything yet.
+bool documentaction::check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
+                    ostream &logout) {
+
+  // note that "gp" argument gets checked in define_external_macros()
+
+  // check gc argument
+  int arg_gc = args.getintarg("gc");
+  if (arg_gc != 0 && arg_gc != 1) {
+    logout << "Warning: \"gc\" argument out of range (" << arg_gc << ")\n";
+    cgiarginfo *gcinfo = argsinfo.getarginfo ("gc");
+    if (gcinfo != NULL) args["gc"] = gcinfo->argdefault;
+  }
+
+  // check gt argument (may be either 0, 1 or 2)
+  int arg_gt = args.getintarg("gt");
+  if (arg_gt != 0 && arg_gt != 1 && arg_gt != 2) {
+    logout << "Warning: \"gt\" argument out of range (" << arg_gt << ")\n";
+    cgiarginfo *gtinfo = argsinfo.getarginfo ("gt");
+    if (gtinfo != NULL) args["gt"] = gtinfo->argdefault;
+  }
+
+  // check hl argument
+  int arg_hl = args.getintarg("hl");
+  if (arg_hl != 0 && arg_hl != 1) {
+    logout << "Warning: \"hl\" argument out of range (" << arg_hl << ")\n";
+    cgiarginfo *hlinfo = argsinfo.getarginfo ("hl");
+    if (hlinfo != NULL) args["hl"] = hlinfo->argdefault;
+  }
+
+  // check x argument
+  int arg_x = args.getintarg("x");
+  if (arg_x != 0 && arg_x != 1) {
+    logout << "Warning: \"x\" argument out of range (" << arg_x << ")\n";
+    cgiarginfo *xinfo = argsinfo.getarginfo ("x");
+    if (xinfo != NULL) args["x"] = xinfo->argdefault;
+  }
+
   return true;
 }
@@ -380 +417 @@
 
       text_t pagetitle;
-      text_tarray::const_iterator this_title = response.docInfo[0].metadata[0].values.begin();
-      text_tarray::const_iterator end_title = response.docInfo[0].metadata[0].values.end();
-      while (this_title != end_title) {
-    if ((this_title + 1) == end_title) pagetitle += *this_title;
-    else pagetitle += *this_title + ": ";
-    this_title ++;
+      if (args.getintarg("gt") == 2) 
+    pagetitle = *(response.docInfo[0].metadata[0].values.begin());
+      else {
+    text_tarray::const_iterator this_title = response.docInfo[0].metadata[0].values.begin();
+    text_tarray::const_iterator end_title = response.docInfo[0].metadata[0].values.end();
+    while (this_title != end_title) {
+      if ((this_title + 1) == end_title) pagetitle += *this_title;
+      else pagetitle += *this_title + ": ";
+      this_title ++;
+    }
       }
       disp.setmacro ("pagetitle", "document", pagetitle);
@@ -423 +464 @@
     text_t &classifytype = response.docInfo[0].metadata[1].values[0];
 
-    disp.setmacro ("imagethispage", "document", 
-               "_icon" + title + "page_");
+    disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
+
+    disp.setmacro ("imagethispage", "document", "_icon" + title + "page_");
 
     // now get the metadata for each child of top level
@@ -495 +537 @@
     text_tarray metadata;
     FilterResponse_t response;
-    FilterResponse_t queryresponse;
-    DocumentRequest_t docrequest;
-    DocumentResponse_t docresponse;
     text_t topparent, classifytype, classifytitle;
-    comerror_t err;
-    bool highlight = false;
     
     text_t &arg_d = args["d"];
     text_t &arg_cl = args["cl"];
-    text_t &collection = args["c"];
     
     text_t OID = arg_d;
@@ -515 +551 @@
       textout << outconvert << disp << "Document contains no data_document:footer_\n";
       return true;
-    }
-    
-    // if we have a query string and highlighting is turned on we need
-    // to redo the query to get the terms for highlighting
-    if (!args["q"].empty() && args.getintarg("hl")) {
-      FilterRequest_t request;
-      text_t quotedstring; // don't use this here
-      request.filterResultOptions = FRmatchTerms;
-      if (do_query (request, args, collectproto, quotedstring, queryresponse, logout))
-    highlight = true;
     }
     
@@ -531 +557 @@
     metadata.push_back ("Title");
     metadata.push_back ("classifytype");
-    if (get_info (topparent, collection, metadata, false, collectproto, response, logout)) {
+    if (get_info (topparent, args["c"], metadata, false, collectproto, response, logout)) {
       classifytitle = response.docInfo[0].metadata[0].values[0];
       classifytype = response.docInfo[0].metadata[1].values[0];
     }
     
+    // output the table of contents
     if (!arg_d.empty()) {
       
@@ -542 +569 @@
                   outconvert, textout, logout);
       else
-    // Book is the default for a document level toc - AZList and Datelist don't
-    // make sense for document level
+    // Book is the default for a document level toc - AZList, List and 
+    // Datelist don't make sense for document level
     output_book_toc (classifytitle, args, collectproto, disp,
              outconvert, textout, logout);
@@ -554 +581 @@
     output_datelist_toc (classifytitle, args, collectproto, disp, 
                  outconvert, textout, logout);
+      else if (classifytype == "List")
+    output_list_toc (classifytitle, args, collectproto, disp, 
+             outconvert, textout, logout);
       else 
     // AZList is the default for a classification level toc - Book doesn't make 
@@ -560 +590 @@
                outconvert, textout, logout);
     }
-    
-    // get info on this document
-    metadata.erase (metadata.begin(), metadata.end());
-    metadata.push_back("Title");
-    metadata.push_back("hastxt");
-    metadata.push_back("haschildren");
-    
-    if (get_info (OID, collection, metadata, false, collectproto, response, logout)) {
-      text_t &title = response.docInfo[0].metadata[0].values[0];
-      int hastxt = response.docInfo[0].metadata[1].values[0].getint();
-      int haschildren = response.docInfo[0].metadata[2].values[0].getint();
+
+    // output the document text
+    output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+
+    textout << outconvert << disp << "_document:footer_\n";
+  }
+  return true;
+}
+
+
+void documentaction::output_document (const text_t &OID, cgiargsclass &args, 
+                      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 highlight = false;
+  int arg_gt = args.getintarg("gt");
+  text_t &collection = args["c"];
+    
+  // if we have a query string and highlighting is turned on we need
+  // to redo the query to get the terms for highlighting
+  if (!args["q"].empty() && args.getintarg("hl")) {
+    FilterRequest_t request;
+    request.filterResultOptions = FRmatchTerms;
+    text_t quotedquery; // not used
+    if (do_query (request, args, collectproto, quotedquery, queryresponse, logout))
+      highlight = true;
+  }
+
+  // get info on this document
+  metadata.push_back("Title");
+  metadata.push_back("hastxt");
+  metadata.push_back("haschildren");
+    
+  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 gt = args.getintarg("gt");
-      if (gt == 0) {
-    if (hastxt == 1) {
-      // get the text
+    if (arg_gt == 0) {
+      if (hastxt == 1) {
+    // get the text
+    docrequest.OID = OID;
+    collectproto->get_document (collection, docrequest, docresponse, err, logout);
+      
+    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 {
+    
+      // text is to be expanded
+      text_t exOID = OID;
+      if (!haschildren) exOID = get_parent (OID);
+    
+      // if we're not in a document (i.e. we're in a top level classification)
+      // we need to pass the "classify" string to get_contents so that it 
+      // doesn't recurse all the way through each document in the classification
+      text_t classifytype;
+      if (args["d"].empty()) classifytype = "classify";
+
+      int i; // not used
+      get_contents (exOID, classifytype, i, collection, collectproto, inforesponse, logout);
+    
+      ResultDocInfo_tarray::const_iterator sechere = inforesponse.docInfo.begin();
+      ResultDocInfo_tarray::const_iterator secend = inforesponse.docInfo.end();
+    
+      if (arg_gt == 1) {
+    // check if there are more than 10 sections containing text to be expanded - 
+    // if there are output warning message - this isn't a great way to do this
+    // since the sections may be very large or very small - one day I'll fix it 
+    // -- Stefan.
+    int seccount = 0;
+    while (sechere != secend) {
+      if ((*sechere).metadata[3].values[0] == "1") seccount ++;
+      if (seccount > 10) break;
+      sechere ++;
+    }
+    if (seccount > 10) {
+      // more than 10 sections so output warning message and text 
+      // for current section only
+      textout << outconvert << disp << "_document:textltwarning_";
       docrequest.OID = OID;
       collectproto->get_document (collection, docrequest, docresponse, err, logout);
@@ -586 +690 @@
         textout << outconvert << disp << docresponse.doc;
     }
-      } else {
-    
-    // text is to be expanded
-    int tmp; // this doesn't get used here
-    if (!haschildren)
-      OID = get_parent (OID);
-    
-    get_contents (OID, classifytype, tmp, collection, collectproto, response, logout);
-    
-    ResultDocInfo_tarray::const_iterator sechere = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator secend = response.docInfo.end();
-    
-    if (gt == 1) {
-      // check if there are more than 10 sections containing text to be expanded - 
-      // if there are output warning message - this isn't a great way to do this
-      // since the sections may be very large or very small - one day I'll fix it 
-      // -- Stefan.
-      int seccount = 0;
-      while (sechere != secend) {
-        if ((*sechere).metadata[3].values[0] == "1") seccount ++;
-        if (seccount > 10) break;
-        sechere ++;
+    else arg_gt = 2;
+      }
+
+      if (arg_gt == 2) {
+    // get the text for each section
+    sechere = inforesponse.docInfo.begin();
+    int count = 0;
+    while (sechere != secend) {
+      textout << outconvert << disp << "\n<p><a name=" << count << "><h3>" 
+          << (*sechere).metadata[0].values[0] << "</h3></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;
       }
-      if (seccount > 10) textout << outconvert << disp << "_document:textltwarning_";
-      else gt = 2;
+      count ++;
+      sechere ++;
     }
-
-    if (gt == 2) {
-    // get the text for each section
-      sechere = response.docInfo.begin();
-      int count = 0;
-      while (sechere != secend) {
-        textout << outconvert << disp << "\n<p><a name=" << count << "><h3>" 
-            << (*sechere).metadata[0].values[0] << "</h3></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;
-        }
-        count ++;
-        sechere ++;
-      }
-    }
-      }
-    }
-    textout << outconvert << disp << "_document:footer_\n";
-  }
-  return true;
-}
-
+      }
+    }
+  }
+}
 
 // highlighttext highlights query terms in text string and outputs the resulting text string