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

Timestamp:

1999-08-03T15:30:48+12:00 (25 years ago)

Author:

sjboddie

Message:

a few small changes related to new format options

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.16  1999/08/03 03:30:47  sjboddie
+   a few small changes related to new format options
+
    Revision 1.15  1999/07/30 02:18:49  sjboddie
    -added collectinfo argument to some functions
@@ -284 +287 @@
   }
 
-  bool showtoppage = true;
-  text_tmap::const_iterator it = collectinfo.format.find("showtoppage");
-  if ((it != collectinfo.format.end()) && ((*it).second == "false")) showtoppage = false;
+  bool ShowTopPages = true;
+  text_tmap::const_iterator it = collectinfo.format.find("ShowTopPages");
+  if ((it != collectinfo.format.end()) && ((*it).second == "false")) ShowTopPages = false;
 
   // do a call to translate OIDs if required
   request.filterName = "NullFilter";
   request.filterResultOptions = FROID;
-  if ((!arg_d.empty()) && (needs_translating (arg_d) || !showtoppage)) {
+  if ((!arg_d.empty()) && (needs_translating (arg_d) || !ShowTopPages)) {
     request.docSet.insert (arg_d);
     request.fields.push_back ("classifytype");
@@ -301 +304 @@
     text_t &classifytype = response.docInfo[0].metadata[0].values[0];
     if (classifytype.empty() || classifytype == "book")
-      if (!showtoppage && is_top (arg_d)) arg_d += ".fc";
+      if (!ShowTopPages && is_top (arg_d)) arg_d += ".fc";
     
     request.clear();
@@ -481 +484 @@
       if (classifytype.empty()) classifytype = "Book"; // defaults to Book
       if ((classifytype == "Book") || (classifytype == "Hierarchy")) {
-    bool showtoppage = true;
-    text_tmap::const_iterator it = collectinfo.format.find("showtoppage");
-    if ((it != collectinfo.format.end()) && ((*it).second == "false")) showtoppage = false;
-    set_arrow_macros (arg_d, classifytype, showtoppage, disp, 
+    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);
       }
@@ -611 +614 @@
     FilterResponse_t response;
     text_t toptitle, toptype, thistype, formatstring;
-    bool cover = false;
 
     text_t &collection = args["c"];
@@ -638 +640 @@
     }
 
-    text_tmap::const_iterator it = collectinfo.format.find(toptype + toptitle);
+    bool ShowCoverImages = false;
+    text_t formatkey = toptype + toptitle;
+    if (!arg_d.empty()) formatkey = toptype + "Document";
+
+    text_tmap::const_iterator it = collectinfo.format.find(formatkey);
     if (it != collectinfo.format.end()) formatstring = (*it).second;
-    it = collectinfo.format.find("cover");
-    if (it != collectinfo.format.end()) cover = true;
+    it = collectinfo.format.find("ShowCoverImages");
+    if ((it != collectinfo.format.end()) && ((*it).second == "true")) ShowCoverImages = true;
 
     // output the table of contents
@@ -647 +653 @@
       
       if (toptype == "Hierarchy")
-    output_toc (thistype, formatstring, args, cover, collectproto, 
+    output_toc (thistype, formatstring, args, ShowCoverImages, collectproto, 
             disp, outconvert, textout, logout);
       else
@@ -661 +667 @@
 
     // output the document text
-    output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+    output_document (OID, args, collectinfo, collectproto, disp, 
+             outconvert, textout, logout);
 
     textout << outconvert << disp << "_document:footer_\n";
@@ -670 +677 @@
 
 void documentaction::output_document (const text_t &OID, cgiargsclass &args, 
+                      const ColInfoResponse_t &collectinfo,
                       recptproto *collectproto, displayclass &disp, 
                       outconvertclass &outconvert, ostream &textout, 
@@ -692 +700 @@
   }
 
+  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");
@@ -708 +720 @@
     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;
+    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 {
@@ -751 +764 @@
       collectproto->get_document (collection, docrequest, docresponse, err, logout);
       
-      textout << outconvert << disp << "<p>\n<h3>" << title << "</h3>";
+      if (ShowSectionTitles)
+        textout << outconvert << disp << "<p>\n<h3>" << title << "</h3>";
       if (highlight)
         highlighttext(docresponse.doc, queryresponse.termInfo, disp,