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

Timestamp:

1999-10-10T21:14:12+13:00 (25 years ago)

Author:

sjboddie

Message:

• metadata now returns mp rather than array
• redesigned browsing support (although it's not finished so

won't currently work ;-)

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.26  1999/10/10 08:14:06  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.25  1999/09/17 04:46:05  sjboddie
    fixed a couple of problems with 'unknown' classifier
@@ -225 +230 @@
 }
 
-bool documentaction::init (ostream &logout) {
-
-  // classify_meta should contain names of all classifiers supported
-  // by this receptionist. classifications using metadata names not
-  // in this list will be displayed as "unknown"
-  classify_meta.insert ("Title");
-  classify_meta.insert ("List");
-  classify_meta.insert ("Creator");
-  classify_meta.insert ("Series");
-  classify_meta.insert ("Date");
-  classify_meta.insert ("Subject");
-  classify_meta.insert ("Organization");
-  classify_meta.insert ("Howto");
-  classify_meta.insert ("Topic");
-  classify_meta.insert ("Browse");
-  classify_meta.insert ("People");
-
-  return action::init (logout);
-}
-
 bool documentaction::check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
                     ostream &logout) {
@@ -284 +269 @@
 
 void documentaction::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
-                     text_t &response_data, ostream &/*logout*/) {
+                       text_t &response_data, ostream &/*logout*/) {
   response = content;
   response_data = "text/html";
 }
 
-
 // set_widthtspace calculates how wide the spaces in the nav bar should
 // be and sets the appropriate macro
-void documentaction::set_spacemacro (displayclass &disp, const FilterResponse_t &response) {
+void documentaction::set_spacemacro (displayclass &disp, FilterResponse_t &response) {
 
   text_t width;
@@ -298 +282 @@
 
   int numc = response.docInfo.size();
-  ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
-  ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
+  ResultDocInfo_tarray::iterator dochere = response.docInfo.begin();
+  ResultDocInfo_tarray::iterator docend = response.docInfo.end();
     
   disp.expandstring ("Global", "_pagewidth_", width);
@@ -308 +292 @@
   
   while (dochere != docend) {
-    text_t title = (*dochere).metadata[0].values[0];
-    text_tset::const_iterator it = classify_meta.find (title);
-    if (it == classify_meta.end()) title = "Unknown";
+    const text_t &title = (*dochere).metadata["Title"].values[0];
 
     disp.expandstring ("document", "_" + title + "width_", width);
+    if (width == ("_" + title + "width_")) 
+      disp.expandstring ("document", "_defaultwidth_", width);
     iwidth += width.getint();
     dochere ++;
@@ -325 +309 @@
 
 // set_navbarmacros sets _navigationbar_, _javaimagesnavbar_ and _httpbrowseXXX_ macros
-void documentaction::set_navbarmacros (displayclass &disp, const FilterResponse_t &response, 
+// reponse contains 1 metadata field (Title)
+void documentaction::set_navbarmacros (displayclass &disp, FilterResponse_t &response, 
                        cgiargsclass &args) {
 
@@ -334 +319 @@
   get_top (args["cl"], topparent);
   int numc = response.docInfo.size();
-  ResultDocInfo_tarray::const_iterator dochere = response.docInfo.begin();
-  ResultDocInfo_tarray::const_iterator docend = response.docInfo.end();
+  ResultDocInfo_tarray::iterator dochere = response.docInfo.begin();
+  ResultDocInfo_tarray::iterator docend = response.docInfo.end();
 
   navigationbar += "<nobr>\n";
@@ -347 +332 @@
     
   while (dochere != docend) {
-    text_t title = (*dochere).metadata[0].values[0];
-    const text_t &classifytype = (*dochere).metadata[1].values[0];
-
-    text_tset::const_iterator it = classify_meta.find (title);
-    if (it == classify_meta.end()) title = "Unknown";
-      
+    text_t title = (*dochere).metadata["Title"].values[0];
+
+    bool unknown = false;
+
+    // test the _XXXwidth_ macro to see if image macros are
+    // defined for this type of classification - if not we'll
+    // just display the text
+    text_t tmpwidth;
+    disp.expandstring ("document", "_" + title + "width_", tmpwidth);
+    if (tmpwidth == ("_" + title + "width_")) unknown = true;
+
     // if we're inside a document all the classification buttons should be enabled
-    if (arg_d.empty() && ((*dochere).OID == topparent))
-      navigationbar += "_imagespacer__icontab" + title + "green_";
-    else {
-      navigationbar += "_imagespacer__image" + title + "_";
-      
+    if (arg_d.empty() && ((*dochere).OID == topparent)) {
+      if (unknown) navigationbar += "_imagespacer_&nbsp;" + title + "&nbsp;";
+      else navigationbar += "_imagespacer__icontab" + title + "green_";
+    } else {
+
       // set the _httpbrowseXXX_ macro for this classification
-      text_t link;
-      if (classifytype == "HTML") 
-    link = "_httppagex_(html)&hp=" + (*dochere).OID + ".fc";
-      else 
-    link = "_httpdocument_&cl=" + (*dochere).OID;
-
-      if (classifytype == "AZList" || classifytype == "DateList") link += ".fc";
-      disp.setmacro ("httpbrowse" + title, "Global", link); 
-      
-    }
-    javaimagesnavbar += "_java" + title + "_";
+      if (unknown) navigationbar += "_imagespacer_&nbsp;<a href=\"_httpdocument_&cl=" + 
+             (*dochere).OID + "\">" + title + "</a>&nbsp;";
+      else {
+        navigationbar += "_imagespacer__image" + title + "_";
+        disp.setmacro ("httpbrowse" + title, "Global", "_httpdocument_&cl=" + (*dochere).OID);
+      }
+    }
+    if (!unknown) javaimagesnavbar += "_java" + title + "_";
     dochere ++;
   }
@@ -376 +363 @@
   navigationbar += "<!-- End of Navigation Bar -->\n";
   disp.setmacro ("navigationbar", "Global", navigationbar);
-  if (args.getintarg("v") == 0) 
+  if (args.getintarg("v") == 0)
     disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);
 }
-
 
 // define all the macros which might be used by other actions
 // to produce pages. 
-void documentaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp, 
-                         cgiargsclass &args, recptproto *collectproto, 
-                         ostream &logout) {
+void documentaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, 
+                         displayclass &disp, cgiargsclass &args, 
+                         recptproto *collectproto, ostream &logout) {
   
   // define_external_macros sets the following macros:
@@ -413 +399 @@
   InfoFiltersResponse_t filterinfo;
   FilterResponse_t response;
-  text_tarray metadata;
+  text_tset metadata;
   text_t &collection = args["c"];
 
@@ -424 +410 @@
       if (filterinfo.filterNames.find ("BrowseFilter") != filterinfo.filterNames.end()) {
     
-    metadata.push_back ("Title");
-    metadata.push_back ("classifytype");
+    metadata.insert ("Title");
     bool getParents = false;
     get_children ("", collection, metadata, getParents, collectproto, response, logout);
@@ -443 +428 @@
 }
 
-
 void documentaction::load_formatinfo (const text_tmap &colformat, int gt) {
 
@@ -454 +438 @@
     ((*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;
@@ -473 +454 @@
     else if ((*format_here).first == "DocumentText") 
       formatinfo.DocumentText = (*format_here).second;
+    else 
+      formatinfo.formatstrings[(*format_here).first] = (*format_here).second;
 
     format_here ++;
@@ -522 +505 @@
 
 
-// sets the classificationlinks and navarrows macros
-void documentaction::get_classificationlinks (const text_t &arg_cl, const text_t &collection,
-                          recptproto *collectproto, displayclass &disp, 
-                          ostream &logout) {
-
-  FilterResponse_t response;
-  text_t classificationlinks, navarrows, classtop;
-  text_tarray metadata;
-
-  metadata.push_back ("Title");
-  metadata.push_back ("doctype");
-  bool getParents = false;
-
-  get_top (arg_cl, classtop);
-  if (get_children (classtop, collection, metadata, getParents, collectproto, response, logout)) {
-        
-    // don't want links unless there are 2 or more sections
-    if (response.docInfo.size() >= 2) {
-
-      classificationlinks += "<!-- Classification Links -->\n";
-      classificationlinks += "<table width=_pagewidth_ cellpadding=0 cellspacing=0 border=0>\n";
-      classificationlinks += "<tr><td valign=top><center>\n";
-      
-      ResultDocInfo_tarray::const_iterator sechere = response.docInfo.begin();
-      ResultDocInfo_tarray::const_iterator secend = response.docInfo.end();
-      
-      int lenlinks = 0;
-      while (sechere != secend) {
-    if ((*sechere).metadata[1].values[0] == "classify") {
-      const text_t &sectionheading = (*sechere).metadata[0].values[0];
-      
-      if (((*sechere).OID == arg_cl) || is_child_of((*sechere).OID, arg_cl)) {
-        
-        // set the _httpprevarrow_, _httpnextarrow_ macros while we're here
-        if (formatinfo.DocumentArrowsBottom) {
-          if (sechere != response.docInfo.begin())
-        disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + (*(sechere-1)).OID);
-          if ((sechere + 1) != secend)
-        disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + (*(sechere+1)).OID);
-        }
-        
-        lenlinks += sectionheading.size();
-        classificationlinks += "<b>" + sectionheading + "</b>";
-        if (lenlinks > 50) {
-          classificationlinks += "<br>\n";
-          lenlinks = 0;
-        } else {
-          if (sechere+1 != secend) classificationlinks += "&nbsp;&nbsp;&nbsp;\n";
-          lenlinks += 3;
-        }
-      } else {
-        lenlinks += sectionheading.size();
-        classificationlinks += "<a href=\"_httpdocument_&cl=" + (*sechere).OID + "\">";
-        classificationlinks += sectionheading + "</a>";
-        if (lenlinks > 50) {
-          classificationlinks += "<br>\n";
-          lenlinks = 0;
-        } else {
-          if (sechere+1 != secend) classificationlinks += "&nbsp;&nbsp;&nbsp;\n";
-          lenlinks += 3;
-        }
-      }
-    }
-    sechere ++;
-      }
-      
-      classificationlinks += "\n</center></td></tr></table>\n";
-      classificationlinks += "<!-- End of Classification Links -->\n";
-      
-      disp.setmacro ("classificationlinks", "document", classificationlinks);
-    }
-  }
-}
-
-
 // define all the macros which are related to pages generated
 // 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, 
-                         ostream &logout) {
+void documentaction::define_internal_macros (const ColInfoResponse_t &collectinfo, 
+                         displayclass &disp, cgiargsclass &args, 
+                         recptproto *collectproto, ostream &logout) {
   
   // define_internal_macros sets the following macros:
@@ -609 +517 @@
   
   // _imagethispage_        the title image to be displayed at top right of page
-  
-  // _classificationlinks_  the links between classifications to be displayed
-  //                        at top of list or datelist classifications
-
-  // _httpprevarrow_        these are set if next or previous arrows
-  // _httpnextarrow_        are to be used - (i.e. if it's an AZList or a DateList 
-  //                        classifytype at a top level or if it's a Book or a
-  //                        Hierarchy classifytype at document level 
 
   // _navarrows_            this may be overridden to "" when format option 
@@ -633 +533 @@
   if (collectproto == NULL) return;
   
-  text_tarray metadata;
+  text_tset metadata;
   FilterResponse_t response;
   text_t &arg_d = args["d"];
@@ -644 +544 @@
     disp.setmacro("navarrows", "document", "");
 
-  metadata.push_back ("Title");
-  metadata.push_back ("classifytype");
-  metadata.push_back ("archivedir");
+  metadata.insert ("Title");
   
   if (!arg_d.empty()) {
     // we're at document level
+
+    metadata.insert ("archivedir");
     
     // get metadata for this document and it's parents
@@ -655 +555 @@
       disp.setmacro ("header", "document", "_textheader_");
 
-      text_t pagetitle;
-      if (gt) 
-    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 ++;
+      text_t pagetitle = response.docInfo[0].metadata["Title"].values[0];
+      if (!gt) {
+    MetadataInfo_t *parent = response.docInfo[0].metadata["Title"].parent;
+    while (parent != NULL) {
+      pagetitle += ": " + parent->values[0];
+      parent = parent->parent;
     }
       }
       disp.setmacro ("pagetitle", "document", pagetitle);
-      disp.setmacro ("thisOID", "Global", response.docInfo[0].metadata[2].values[0]);
-
-      text_t &classifytype = response.docInfo[0].metadata[1].values[0];
-      if (classifytype.empty()) classifytype = "Book"; // defaults to Book
-
-      // set arrow macros if required
-      if (((classifytype == "Book") && (formatinfo.DocumentArrowsTop || formatinfo.DocumentArrowsBottom)) ||
-      ((classifytype == "Hierarchy") && formatinfo.DocumentArrowsBottom))
-    set_arrow_macros (arg_d, classifytype, formatinfo.DocumentTopPages, 
-              disp, collectproto, collection, logout);
+      disp.setmacro ("thisOID", "Global", response.docInfo[0].metadata["archivedir"].values[0]);
       
       if (args["u"] != "1")
@@ -691 +578 @@
       if (get_info (classtop, collection, metadata, false, collectproto, response, logout)) {
       
-    text_t title = response.docInfo[0].metadata[0].values[0];
-    text_t &classifytype = response.docInfo[0].metadata[1].values[0];
-
-    text_tset::const_iterator it = classify_meta.find (title);
-    if (it == classify_meta.end()) title = "Unknown";
-
-    disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
-    disp.setmacro ("imagethispage", "document", "_icon" + title + "page_");
-
-    // now get the metadata for each child of top level
-    // so we can generate the _classificationlinks_ and arrow macros
-    // (if they're required by the current classification type)
-    
-    if ((classifytype == "AZList") || (classifytype == "DateList"))
-      get_classificationlinks (arg_cl, collection, collectproto, disp, logout);
-      
+    text_t &title = response.docInfo[0].metadata["Title"].values[0];
+    bool unknown = false;
+
+    // test the _XXXwidth_ macro to see if image macros are
+    // defined for this type of classification - if not we'll
+    // just display the text
+    text_t tmp;
+    disp.expandstring ("document", "_" + title + "width_", tmp);
+    if (tmp == ("_" + title + "width_")) unknown = true;
+
+    if (unknown) {
+      disp.setmacro ("pagetitle", "document", title);
+      disp.setmacro ("imagethispage", "document", "<h2>" + title + "</h2>");
+    } else {
+      disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
+      disp.setmacro ("imagethispage", "document", "_icon" + title + "page_");
+    }
       }
     }
@@ -713 +601 @@
 
 
-bool documentaction::do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo,
+bool documentaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/,
                 recptproto *collectproto, displayclass &disp, 
                 outconvertclass &outconvert, ostream &textout, 
@@ -725 +613 @@
   } else {  
 
-    text_tarray metadata;
-    FilterResponse_t response;
-    text_t toptitle, toptype, thistype, formatstring;
-
-    text_t &collection = args["c"];
-    text_t &arg_d = args["d"];
-    text_t &arg_cl = args["cl"];
-    
-    text_t OID = arg_d;
-    if (arg_d.empty()) OID = arg_cl;
-    
+    text_t OID = args["d"];
+    if (OID.empty()) OID = args["cl"];
+    if (OID.empty()) {
+      textout << outconvert << disp << "Document contains no data_document:footer_\n";
+      return true;
+    }
+
     textout << outconvert << disp << "_document:header_\n"
         << "_document:content_\n";
     
-    if (arg_d.empty() && arg_cl.empty()) {
-      textout << outconvert << disp << "Document contains no data_document:footer_\n";
-      return true;
-    }
-    
-    // get the classifytitle and classifytype for both the top level 
-    // and the current level (using getParent=true)
-    metadata.push_back ("Title");
-    metadata.push_back ("classifytype");
-    if (get_info (OID, collection, metadata, true, collectproto, response, logout)) {
-      toptitle = response.docInfo[0].metadata[0].values[0];
-      toptype = response.docInfo[0].metadata[1].values[0];
-      thistype = response.docInfo[0].metadata[1].values.back();
-    }
-
-    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;
-
     // output the table of contents
-    if (!arg_d.empty()) {
-      
-      if (toptype == "Hierarchy")
-    output_standard_toc (thistype, formatinfo, formatstring, args, 
-                 collectproto, disp, outconvert, textout, logout);
-
-      else
-    output_document_toc (args, formatinfo, collectproto, disp,
-                 outconvert, textout, logout);
-
-    } else {
-      output_standard_toc (thistype, formatinfo, formatstring, args,
-               collectproto, disp, outconvert, textout, logout);
-    }
+    output_toc (args, recpt->get_browsermap_ptr(), formatinfo, 
+        collectproto, disp, outconvert, textout, logout);
 
     // output the document text
@@ -785 +636 @@
 }
 
-void documentaction::output_text (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+void documentaction::output_text (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) {
+                  bool highlight, int hastxt, int wanttext, 
+                  text_t &collection, recptproto *collectproto, 
+                  displayclass &disp, outconvertclass &outconvert, 
+                  ostream &textout, ostream &logout) {
   
   DocumentRequest_t docrequest;
@@ -796 +647 @@
   comerror_t err;
 
-  if (hastxt == "1") {
+  if (hastxt == 1) {
 
     if (wanttext) {
@@ -830 +681 @@
   FilterResponse_t inforesponse;
   FilterResponse_t queryresponse;
-  text_tarray metadata;
+  text_tset metadata;
   bool getParents = false;
   bool highlight = false;
@@ -849 +700 @@
   parse_formatstring (formatinfo.DocumentText, formatlistptr, metadata, getParents);
 
-  metadata.push_back("hastxt");
-  metadata.push_back("haschildren");
+  metadata.insert ("hastxt");
+  metadata.insert ("haschildren");
   
   if (formatinfo.DocumentText == "[Text]")
@@ -864 +715 @@
 
   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();
+    int hastxt = inforesponse.docInfo[0].metadata["hastxt"].values[0].getint();
+    int haschildren = inforesponse.docInfo[0].metadata["haschildren"].values[0].getint();
 
     if (arg_gt == 0) {
@@ -879 +730 @@
       // text is to be expanded
       text_t exOID = OID;
-      if (haschildren != "1") 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)
-      // we need to pass the "classify" string to get_contents so that it 
+      // we need to pass "is_classify = true" 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 = 0; // not used
-      get_contents (exOID, classifytype, metadata, i, collection, 
+      bool is_classify = false;
+      if (args["d"].empty()) is_classify = true;
+
+      get_contents (exOID, is_classify, metadata, collection, 
             collectproto, inforesponse, logout);
     
-      ResultDocInfo_tarray::const_iterator sechere = inforesponse.docInfo.begin();
-      ResultDocInfo_tarray::const_iterator secend = inforesponse.docInfo.end();
+      ResultDocInfo_tarray::iterator sechere = inforesponse.docInfo.begin();
+      ResultDocInfo_tarray::iterator secend = inforesponse.docInfo.end();
     
       if (arg_gt == 1) {
@@ -902 +752 @@
     int seccount = 0;
     while (sechere != secend) {
-      const text_t &shastxt = (*sechere).metadata[metasize-2].values.back();
-      if (shastxt == "1") seccount ++;
+      int shastxt = (*sechere).metadata["hastxt"].values[0].getint();
+      if (shastxt == 1) seccount ++;
       if (seccount > 10) break;
       sechere ++;
@@ -927 +777 @@
       textout << outconvert << disp << "\n<p><a name=" << count << "></a>\n";
 
-      const text_t &shastxt = (*sechere).metadata[metasize-2].values.back();
+      int shastxt = (*sechere).metadata["hastxt"].values[0].getint();
 
       output_text (*sechere, formatlistptr, queryresponse.termInfo,