Changeset 649

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 ;-)

Location:

trunk/gsdl/src/recpt

Files:

• OIDtools.cpp (modified) (9 diffs)
• OIDtools.h (modified) (3 diffs)
• browserclass.cpp (added)
• browserclass.h (added)
• browsetools.cpp (modified) (4 diffs)
• browsetools.h (modified) (2 diffs)
• datelistbrowserclass.cpp (added)
• datelistbrowserclass.h (added)
• documentaction.cpp (modified) (30 diffs)
• documentaction.h (modified) (6 diffs)
• formattools.cpp (modified) (23 diffs)
• formattools.h (modified) (3 diffs)
• hlistbrowserclass.cpp (added)
• hlistbrowserclass.h (added)
• librarymain.cpp (modified) (4 diffs)
• pageaction.cpp (modified) (9 diffs)
• pageaction.h (modified) (2 diffs)
• queryaction.cpp (modified) (4 diffs)
• receptionist.cpp (modified) (12 diffs)
• receptionist.h (modified) (4 diffs)
• vlistbrowserclass.cpp (added)
• vlistbrowserclass.h (added)

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.17  1999/10/10 08:14:02  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.16  1999/09/07 04:56:51  sjboddie
    added GPL notice
@@ -135 +140 @@
 
 // get_info does a protocol call and returns (in response) the metadata 
-// associated with OID. The metadata array should be loaded with whatever
+// associated with OID. Metadata should be loaded with whatever
 // metadata fields are to be requested.
 
 bool get_info (const text_t &OID, const text_t &collection,
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout) {
@@ -163 +168 @@
     return false;
   }
-
-  // check the result to make sure we have the right amount of metadata
-  if (!response.docInfo.empty() &&
-      response.docInfo[0].metadata.size() != metadata.size()) return false;
   
   return true;
@@ -172 +173 @@
 
 bool get_info (const text_tarray &OIDs, const text_t &collection,
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout) {
@@ -198 +199 @@
   }
 
-  // check the result to make sure we have the right amount of metadata
-  if (!response.docInfo.empty() &&
-      response.docInfo[0].metadata.size() != metadata.size()) return false;
-
   return true;
 }
@@ -210 +207 @@
 
   FilterResponse_t response;
-  text_tarray metadata;
-  metadata.push_back ("haschildren");
+  text_tset metadata;
+  metadata.insert ("haschildren");
 
   if (get_info (OID, collection, metadata, false, collectproto, response, logout)) {
-    if (response.docInfo[0].metadata[0].values[0] == "1")
+    if (response.docInfo[0].metadata["haschildren"].values[0] == "1")
       return true;
   }
@@ -222 +219 @@
 
 // get_children does a protocol call and returns (in response) the OIDs and 
-// metadata of all the children of OID. The metadata array should be loaded
+// metadata of all the children of OID. The metadata set should be loaded
 // with whatever metadata fields are to be requested.
 
 bool get_children (const text_t &OID, const text_t &collection, 
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout) {
@@ -323 +320 @@
 }
 
-void recurse_contents (const ResultDocInfo_t section, const bool &classify, 
-               int &totalcols, const text_t &collection, 
-               const text_tarray &metadata, recptproto *collectproto, 
-               FilterResponse_t &response, ostream &logout) {
-  
-  int metasize = section.metadata.size();
-
-  int haschildren = section.metadata[metasize-2].values[0].getint();
-  const text_t &doctype = section.metadata[metasize-1].values[0];
-  int cols;
-
-  if ((haschildren == 1) && ((!classify) || (doctype == "classify"))) {
-    text_t parent = response.docInfo.back().OID;
-    int parentcols = countchar (parent.begin(), parent.end(), '.');
+static void recurse_contents (ResultDocInfo_t section, const bool &is_classify, 
+                  const text_t &collection, const text_tset &metadata, 
+                  recptproto *collectproto, FilterResponse_t &response, 
+                  ostream &logout) {
+
+  int haschildren = section.metadata["haschildren"].values[0].getint();
+  const text_t &doctype = section.metadata["doctype"].values[0];
+
+  if ((haschildren == 1) && ((!is_classify) || (doctype == "classify"))) {
     FilterResponse_t tmp;
     bool getParents = false;
     get_children (section.OID, collection, metadata, getParents, collectproto, tmp, logout);
-    ResultDocInfo_tarray::const_iterator thisdoc = tmp.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator lastdoc = tmp.docInfo.end();
+    ResultDocInfo_tarray::iterator thisdoc = tmp.docInfo.begin();
+    ResultDocInfo_tarray::iterator lastdoc = tmp.docInfo.end();
     while (thisdoc != lastdoc) {
-      if (((*thisdoc).metadata[metasize-1].values[0] != "classify") && (classify))
-    cols = parentcols + 1;
-      else 
-    cols = countchar ((*thisdoc).OID.begin(), (*thisdoc).OID.end(), '.');
-      if (cols > totalcols) totalcols = cols;
       response.docInfo.push_back (*thisdoc);
-      recurse_contents (*thisdoc, classify, totalcols, collection, 
-            metadata, collectproto, response, logout);
+      recurse_contents (*thisdoc, is_classify, collection, metadata, 
+            collectproto, response, logout);
       thisdoc ++;
     }
@@ -358 +345 @@
 // get_contents returns OIDs and metadata of all contents 
 // below (and including) OID.
-void get_contents (const text_t &topOID, const text_t &classifytype, 
-           text_tarray &metadata, int &totalcols,
-           const text_t &collection, recptproto *collectproto, 
-           FilterResponse_t &response, ostream &logout) {
+void get_contents (const text_t &topOID, const bool &is_classify, 
+           text_tset &metadata, const text_t &collection, 
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout) {
 
   if (topOID.empty()) return;
-  bool classify = false;
   response.clear();
 
-  metadata.push_back("haschildren");
-  metadata.push_back("doctype");
-
-  // we don't want to recurse all the way down through each document
-  // if we're expanding top level contents
-  if (classifytype == "classify") classify = true;
-
-  // update totalcols
-  totalcols = countchar (topOID.begin(), topOID.end(), '.');
+  metadata.insert ("haschildren");
+  metadata.insert ("doctype");
 
   // get topOIDs info
   if (get_info (topOID, collection, metadata, false, collectproto, response, logout))
-      recurse_contents (response.docInfo[0], classify, totalcols, collection, 
+      recurse_contents (response.docInfo[0], is_classify, collection, 
             metadata, collectproto, response, logout);
 }

trunk/gsdl/src/recpt/OIDtools.h

@@ -45 +45 @@
 
 // get_info does a protocol call and returns (in response) the info 
-// associated with OID. The metadata array should be loaded with whatever
+// associated with OID. Metadata should be loaded with whatever
 // metadata fields are to be requested
 bool get_info (const text_t &OID, const text_t &collection,
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout);
 bool get_info (const text_tarray &OIDs, const text_t &collection,
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout);
@@ -61 +61 @@
 
 // get_children does a protocol call and returns (in response) the OIDs and 
-// metadata of all the children of OID. The metadata array should be loaded
+// metadata of all the children of OID. The metadata set should be loaded
 // with whatever metadata fields are to be requested.
 bool get_children (const text_t &OID, const text_t &collection, 
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout);
@@ -89 +89 @@
 // get_contents returns OIDs and metadata of all contents 
 // below (and including) OID.
-void get_contents (const text_t &topOID, const text_t &classifytype, 
-           text_tarray &metadata, int &totalcols,
-           const text_t &collection, recptproto *collectproto, 
-           FilterResponse_t &response, ostream &logout);
+void get_contents (const text_t &topOID, const bool &is_classify, 
+           text_tset &metadata, const text_t &collection, 
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout);
 
 // is_child_of returns true if OID2 is a child of OID1

trunk/gsdl/src/recpt/browsetools.cpp

@@ +1 @@
+
 /**********************************************************************
  *
@@ -28 +29 @@
 /*
    $Log$
+   Revision 1.25  1999/10/10 08:14:04  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.24  1999/09/28 01:46:55  rjmcnab
    removed some unused stuff
@@ -123 +129 @@
  */
 
-
 #include "browsetools.h"
 #include "OIDtools.h"
+
 
 // simply checks to see if formatstring begins with a <td> tag
@@ -156 +162 @@
 }
 
-
-// output_controls displays the detach, expand/contract contents,
-// expand/contract text and highlighting/no highlighting buttons
-static void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
-                 recptproto * /*collectproto*/, displayclass &disp, 
-                 outconvertclass &outconvert, ostream &textout, 
-                 ostream &/*logout*/) {
-
-  if (args["u"] != "1") {
+// expects haschidren, doctype, and classifytype metadata elements
+static void recurse_contents (ResultDocInfo_t &section, cgiargsclass &args,
+                  browserclass *bptr, text_tset &metadata, bool &getParents, 
+                  format_t *formatlistptr, format_tmap &formatlistmap, 
+                  formatinfo_t &formatinfo, browsermapclass *browsermap, 
+                  int colnumber, recptproto *collectproto, displayclass &disp, 
+                  outconvertclass &outconvert, ostream &textout, ostream &logout) {
+  text_t formatstring;
+
+  bool is_classify = false;
+  if (args["d"].empty()) is_classify = true;
+
+  // output this section 
+  bool use_table = is_table_content (formatlistptr);
+  colnumber += bptr->output_section_group (section, args, colnumber, formatlistptr, 
+                       use_table, disp, outconvert, textout, logout);
+
+  text_t classification;
+  if (!is_classify) classification = "Document";
+  else get_top (section.OID, classification);
+
+  int haschildren = section.metadata["haschildren"].values[0].getint();
+  const text_t &doctype = section.metadata["doctype"].values[0];
+  text_t classifytype = section.metadata["classifytype"].values[0];
+  // HLists are displayed as VLists when contents are expanded,
+  // Books are displayed as HLists
+  if (classifytype == "HList") classifytype = "VList";
+  if (classifytype == "Book") classifytype = "HList";
+
+  // recurse through children
+  if ((haschildren == 1) && ((!is_classify) || (doctype == "classify"))) {
+
+    // get browser for displaying children
+    bptr = browsermap->getbrowser (classifytype);
+    bptr->load_metadata_defaults (metadata);
+
+    // get the formatstring if there is one 
+    if (!get_formatstring (classification, classifytype, 
+               formatinfo.formatstrings, formatstring))
+      formatstring = bptr->get_default_formatstring();
+
+    format_tmap::const_iterator it = formatlistmap.find (formatstring);
+    // check if formatlistptr is cached
+    if (it != formatlistmap.end()) formatlistptr = (*it).second;
+    else {
+      formatlistptr = new format_t();
+      parse_formatstring (formatstring, formatlistptr, metadata, getParents);
+      formatlistmap[formatstring] = formatlistptr;
+    }
+
+    FilterResponse_t tmp;
+    get_children (section.OID, args["c"], metadata, getParents, collectproto, tmp, logout);
+    ResultDocInfo_tarray::iterator thisdoc = tmp.docInfo.begin();
+    ResultDocInfo_tarray::iterator lastdoc = tmp.docInfo.end();
+
+    while (thisdoc != lastdoc) {
+      recurse_contents (*thisdoc, args, bptr, metadata, getParents, 
+            formatlistptr, formatlistmap, formatinfo, browsermap, 
+            colnumber, collectproto, disp, outconvert, textout, logout);
+      thisdoc ++;
+    }
+  }
+}
+
+
+// expanded_contents recurses through all contents. there's a special case
+// for an HList when contents are expanded (i.e. it's displayed as a VList)
+//
+// if we're inside a document we expand all contents from the top,
+// if we're at classification level we'll just expand out those contents below 
+// the current one
+
+static void expanded_contents (cgiargsclass &args, browsermapclass *browsermap, 
+                   formatinfo_t &formatinfo, recptproto *collectproto, 
+                   displayclass &disp, outconvertclass &outconvert, 
+                   ostream &textout, ostream &logout) {
   
-    FilterResponse_t response;
-    text_tarray metadata;
-    text_tarray buttons;
-
-    text_tarray::const_iterator here = ibuttons.begin();
-    text_tarray::const_iterator end = ibuttons.end();
-
-    while (here != end) {
-    
-      if (*here == "Detach")
-    buttons.push_back ("_document:imagedetach_");
-      else if (*here == "Highlight") {
-    if (args["hl"] == "1") 
-      buttons.push_back ("_document:imagenohighlight_");
-    else 
-      buttons.push_back ("_document:imagehighlight_");
-      } else if (*here == "Expand Contents") {
-    if (args["gc"] == "1")
-      buttons.push_back ("_document:imagecontracttoc_");
-    else 
-      buttons.push_back ("_document:imageexpandtoc_");
-      } else if (*here == "Expand Text") {
-    if (args.getintarg("gt"))
-      buttons.push_back ("_document:imagecontracttext_");
-    else 
-      buttons.push_back ("_document:imageexpandtext_");
-      }
-      here ++;
-    }
-
-    here = buttons.begin();
-    end = buttons.end();
-    int count = 0;
-    while (here != end) {
-      if ((count != 0) && ((count % 3) == 0)) textout << "<br>\n";
-      textout << outconvert << disp << *here;
-      count ++;
-      here ++;
-    }
-  }
-}
-
-
-// at the moment this just writes out the html to display 
-// the cover image (assuming it's called cover.jpg)
-// this whole thing should be done with a call to the collection
-// server which would send a link to the cover image if there
-// was one otherwise send title, author and stuff
-static void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
-                displayclass &disp, outconvertclass &outconvert, 
-                ostream &textout, ostream &/*logout*/) {
+  if (args["d"].empty() && args["cl"].empty()) return;
+  text_t OID;
   
-  if (args["d"].empty()) return;
-  
-  textout << outconvert << disp << 
-    "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
-}
-
-
-
-/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-Functions for generating a document type tables of contents. These aren't really tables of
-contents at all, just a title, some navigation buttons and arrows and maybe a page ? of ?
-type thing. These should only be called for document level tocs (i.e. when the "d" argument 
-is set) as I don't think it makes sense to display top level classifications in this way.
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
-
-void output_document_toc (cgiargsclass &args, const formatinfo_t &formatinfo,
-              recptproto *collectproto, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &logout) {
-
-  text_t &arg_d = args["d"];
-  if (arg_d.empty()) return;
-
-  text_tarray metadata;
   FilterResponse_t response;
   bool getParents = false;
-  ResultDocInfo_t docinfo;
-  text_t &collection = args["c"];
-  int gt = args.getintarg("gt");
-
-  bool istop = is_top (arg_d);
-
-  format_t *formatlistptr = new format_t();
-  parse_formatstring (formatinfo.DocumentHeading, formatlistptr, metadata, getParents);
-
-  text_tarray OIDs;
-  OIDs.push_back (arg_d);
-  if (formatinfo.DocumentArrowsTop && !gt && !istop)
-    OIDs.push_back (arg_d + ".pr.lc");
-
-  metadata.push_back ("Title");
-  int metasize = metadata.size();
-
-  if (get_info (OIDs, collection, metadata, getParents, collectproto, response, logout)) {
-    
-    text_t &thistitle = response.docInfo[0].metadata[metasize-1].values.back();
-    text_t last_sib_title;
-    if (formatinfo.DocumentArrowsTop && !gt && !istop) {
-      if (response.docInfo.size() == 1)
-    last_sib_title = response.docInfo[0].metadata[metasize-1].values.back();    
-      else
-    last_sib_title = response.docInfo[1].metadata[metasize-1].values.back();
-    }
-
-    textout 
-      << "\n<!-- Table of Contents produced by browsetools::output_document_toc -->\n\n";
-    
-    textout << outconvert << disp 
-        << "<p><center>\n"
-        << "<table cellpadding=0 cellspacing=0 width=_pagewidth_>\n"
-        << "<tr valign=top><td>\n";
-    
-    // top arrows and page ? of ? title
-    if (formatinfo.DocumentArrowsTop && !gt) {
-    
-      // previous arrow
-      textout << outconvert << disp << "<table><tr valign=top>\n"
-          << "<td align=left>_document:prevarrow_</td>\n";
-      
-      // page ? of ? text
-      textout << "<td align=center>\n";
-      
-      if (!istop && is_number (thistitle) && is_number (last_sib_title))
-    textout << outconvert << disp << "_document:page_" << thistitle
-        << "_document:of_" << last_sib_title;
-
-      else
-    textout << outconvert << thistitle;
-  
-      // next arrow
-      textout << outconvert << disp << "</td>\n<td align=right>_document:nextarrow_</td>\n</table>\n";
-    }
-
-    // goto line
-    if (formatinfo.DocumentGoTo)
-      textout << outconvert << disp << "_document:gotoform_";
-
-    // control buttons
-    output_controls (args, formatinfo.DocumentButtons, collectproto, 
-             disp, outconvert, textout, logout);
-    textout << "</td>\n";
-
-    // heading
-    textout << outconvert << "\n<td valign=top>\n"
-        << get_formatted_string (response.docInfo[0], formatlistptr);
-
-    textout << "</td></tr></table></center>\n";
-    textout << "\n<!-- end of Table of Contents -->\n";
-  }
-}
-
-
-/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-Functions for generating a "Hierarchy" type table of contents. These can be used either
-at top classification level or at document level (the difference being that a cover
-image and control buttons may be displayed at document level).
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
-
-// prototypes
-
-static void output_contracted_hierarchy_toc (const text_t &classifytype, text_t &formatstring, 
-                         cgiargsclass &args, recptproto *collectproto, 
-                         displayclass &disp, outconvertclass &outconvert, 
-                         ostream &textout, ostream &logout);
-
-static void output_expanded_hierarchy_toc (cgiargsclass &args, recptproto *collectproto,
-                       displayclass &disp, outconvertclass &outconvert,
-                       ostream &textout, ostream &logout);
-
-static void output_parents_toc (cgiargsclass &args, const FilterResponse_t &parents,
-                int &tabcount, displayclass &disp, recptproto *collectproto,
-                format_t *formatlistptr, outconvertclass &outconvert, 
-                ostream &textout, ostream &logout);
-
-static void output_siblings_toc (const text_t &classifytype, cgiargsclass &args, 
-                 const FilterResponse_t &siblings, int &tabcount, 
-                 displayclass &disp, format_t *formatlistptr, 
-                 outconvertclass &outconvert, ostream &textout, 
-                 ostream &logout);
-
-static void output_stdlist (cgiargsclass &args, ResultDocInfo_tarray::const_iterator &here,
-                ResultDocInfo_tarray::const_iterator &end, bool intable,
-                displayclass &disp, format_t *formatlistptr, 
-                 outconvertclass &outconvert, ostream &textout);
-
-static void output_datelist (cgiargsclass &args, ResultDocInfo_tarray::const_iterator &here,
-                 ResultDocInfo_tarray::const_iterator &end, bool intable,
-                 displayclass &disp, format_t *formatlistptr, 
-                 outconvertclass &outconvert, ostream &textout);
-
-
-void output_standard_toc (const text_t &classifytype, const formatinfo_t &formatinfo,
-              text_t &formatstring, cgiargsclass &args, 
-              recptproto *collectproto, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &logout) {
-
-  bool havecontrols = false;
-
-  textout << "\n<!-- Table of Contents produced by browsetools::output_standard_toc -->\n\n";
-
-  // get the cover image (if there is one) and the control buttons
-  // if we're inside a book
+  text_tset metadata;
+  text_t classifytype, classification, formatstring;
+  int colnumber = 0;
+
   if (!args["d"].empty()) {
-    textout << "<p><table cellpadding=0 cellspacing=0><tr>\n";
-    textout << "<td valign=top width=200>\n";
-    if (formatinfo.DocumentImages) 
-      output_cover_image (args, collectproto, disp, outconvert, textout, logout);
-    output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
-             outconvert, textout, logout);
-    textout << "</td><td valign=top>\n";
-    havecontrols = true;
-  }
-  
-  // get table of contents
-  textout << "<table>\n";
-
-  if (args.getintarg("gc"))
-    output_expanded_hierarchy_toc(args, collectproto, disp, outconvert, textout, logout);
-  else
-    output_contracted_hierarchy_toc(classifytype, formatstring, args, collectproto, 
-                    disp, outconvert, textout, logout);
-
-  textout << "</table>\n";
-
-  if (havecontrols) textout << "</td></tr></table>\n";
-
-  textout << "\n<!-- end of Table of Contents -->\n";
-}
-
-
-void output_contracted_hierarchy_toc (const text_t &classifytype, text_t &formatstring, 
-                      cgiargsclass &args, recptproto *collectproto, 
-                      displayclass &disp, outconvertclass &outconvert, 
-                      ostream &textout, ostream &logout) {
-
-  int tabcount = 0;
-  text_tarray parents, metadata;
-  FilterResponse_t fsiblings, fparents;
-  bool getParents = false;
-
-  text_t &arg_d = args["d"];
-  text_t OID = arg_d;
-  if (OID.empty()) {
-    // if classifytype is an AZList we need to jump to
-    // the first child
-    if (classifytype == "AZList") OID = args["cl"] + ".fc";
-    else OID = args["cl"];
-  }
-
-  text_t &collection = args["c"];
-
-  // if format string is empty use the default
-  if (formatstring.empty()) 
-    formatstring = "<td valign=top nowrap>[link][icon][/link]</td><td>{Or}{[Title],Untitled}</td>";
+    // document level - expand from top
+    get_top (args["d"], OID);
+    classification = "Document";
+  } else {
+    // classification level
+    OID = args["cl"];
+    get_top (args["cl"], classification);
+  }
+
+  // get classifytype of this level
+  text_t tOID;
+  if (is_top(OID)) {
+    classifytype = "thistype";
+    tOID = OID;
+  } else {
+    classifytype = "childtype";
+    tOID = get_parent (OID);
+  }
+  metadata.insert (classifytype);
+
+  if (!get_info (tOID, args["c"], metadata, getParents, collectproto, response, logout))
+    return;
+  classifytype = response.docInfo[0].metadata[classifytype].values[0];
+  // if we still don't have a classifytype we'll use the default
+  if (classifytype.empty()) {
+    browserclass *bptr = browsermap->get_default_browser ();
+    classifytype = bptr->get_browser_name ();
+  }
+
+  // HLists are displayed as VLists when contents are expanded,
+  // Books are displayed as HLists
+  if (classifytype == "HList") classifytype = "VList";
+  if (classifytype == "Book") classifytype = "HList";
+
+  metadata.erase (metadata.begin(), metadata.end());
+          
+  // metadata elements needed by recurse_contents
+  metadata.insert ("classifytype");
+  metadata.insert ("doctype");
+  metadata.insert ("haschildren");
+
+  // load up metadata array with browser defaults
+  browserclass *bptr = browsermap->getbrowser (classifytype);
+  bptr->load_metadata_defaults (metadata);
+
+  // get the formatstring if there is one or use the browsers default
+  if (!get_formatstring (classification, classifytype, 
+             formatinfo.formatstrings, formatstring))
+    formatstring = bptr->get_default_formatstring();
 
   format_t *formatlistptr = new format_t();
   parse_formatstring (formatstring, formatlistptr, metadata, getParents);
 
-  metadata.push_back ("Date");
-  metadata.push_back ("hastxt");
-  metadata.push_back ("haschildren");
-  metadata.push_back ("doctype");
-  metadata.push_back ("classifytype");
-
-  if (has_children (OID, collection, collectproto, logout)) {
-      get_parents_array (OID + ".fc", parents);
-
-      if (!get_children (OID, collection, metadata, getParents,
-             collectproto, fsiblings, logout))
-    return;
+  // protocol call
+  if (!get_info (OID, args["c"], metadata, getParents, collectproto, response, logout))
+    return;
+
+  format_tmap formatlistmap;
+  formatlistmap[formatstring] = formatlistptr;
+
+  recurse_contents (response.docInfo[0], args, bptr, metadata, 
+            getParents, formatlistptr, formatlistmap, formatinfo, browsermap, 
+            colnumber, collectproto, disp, outconvert, textout, logout);
+
+  // clean up format list pointers
+  format_tmap::const_iterator here = formatlistmap.begin();
+  format_tmap::const_iterator end = formatlistmap.end();
+  while (here != end) {
+    delete (*here).second;
+    here ++;
+  }
+}
+
+static void load_formatstring (const text_t &classifytype, text_tset &metadata,
+                   bool &getParents, const text_t &classification, 
+                   browsermapclass *browsermap, formatinfo_t &formatinfo,
+                   format_tmap &formatlistmap) {
+  text_t formatstring;
+
+  // load up metadata array with browser defaults
+  browserclass *bptr = browsermap->getbrowser (classifytype);
+  bptr->load_metadata_defaults (metadata);
+
+  // get the formatstring if there is one or use the browsers default
+  if (!get_formatstring (classification, classifytype, 
+             formatinfo.formatstrings, formatstring))
+    formatstring = bptr->get_default_formatstring();
+
+  // see if it's cached
+  format_tmap::const_iterator it = formatlistmap.find (formatstring);
+  if (it == formatlistmap.end()) {
+    format_t *formatlistptr = new format_t();
+    parse_formatstring (formatstring, formatlistptr, metadata, getParents);
+    formatlistmap[formatstring] = formatlistptr;
+  }
+}
+
+static void load_formatstrings (FilterResponse_t &response, text_tset &metadata,
+                bool &getParents, const text_t &classification,
+                browsermapclass *browsermap, formatinfo_t &formatinfo, 
+                format_tmap &formatlistmap) {
+
+  text_tset cache;
+
+  ResultDocInfo_tarray::iterator thisdoc = response.docInfo.begin();
+  ResultDocInfo_tarray::iterator lastdoc = response.docInfo.end();
+
+  while (thisdoc != lastdoc) {
+    if (classification != "Document" && is_top ((*thisdoc).OID)) {
+      text_t &thistype = (*thisdoc).metadata["thistype"].values[0];
+      if (!thistype.empty()) load_formatstring (thistype, metadata, getParents, classification,
+                        browsermap, formatinfo, formatlistmap);
+    }
+    text_t &childtype = (*thisdoc).metadata["childtype"].values[0];
+    text_tset::const_iterator it = cache.find (childtype);
+    if (it == cache.end()) {
+      if (!childtype.empty()) {
+    load_formatstring (childtype, metadata, getParents, classification,
+               browsermap, formatinfo, formatlistmap);
+    cache.insert (childtype);
+      }
+    }
+    thisdoc ++;
+  }
+}
+
+
+static void contracted_contents (cgiargsclass &args, browsermapclass *browsermap,
+                 formatinfo_t &formatinfo, recptproto *collectproto,
+                 displayclass &disp, outconvertclass &outconvert,
+                 ostream &textout, ostream &logout) {
+  FilterResponse_t response;
+  text_tset metadata;
+  bool getParents = false;
+  text_tarray parents;
+  text_t OID = args["d"];
+  if (OID.empty()) OID = args["d"];
+  text_t classification = "Document";
+  if (args["d"].empty()) get_top (args["cl"], classification);
+
+  bool haschildren = has_children (OID, args["c"], collectproto, logout);
+
+  if (haschildren) get_parents_array (OID + ".fc", parents);
+  else get_parents_array (OID, parents);
+
+  // get classifytypes of each parent
+  metadata.insert ("thistype");
+  metadata.insert ("childtype");
+  if (!get_info (parents, args["c"], metadata, getParents, collectproto, response, logout))
+    return;
+  
+  metadata.erase (metadata.begin(), metadata.end());
+
+  // get formatstrings for all parents
+  format_tmap formatlistmap;  
+  load_formatstrings (response, metadata, getParents, classification, 
+              browsermap, formatinfo, formatlistmap);
+
+  ///////////////////
+
+}
+
+void output_toc (cgiargsclass &args, browsermapclass *browsermap,
+                 formatinfo_t &formatinfo, recptproto *collectproto,
+                 displayclass &disp, outconvertclass &outconvert,
+                 ostream &textout, ostream &logout) {
+
+  if (args.getintarg("gc") == 1) {
+
+    // expanded table of contents
+    expanded_contents (args, browsermap, formatinfo, collectproto, 
+               disp, outconvert, textout, logout);
   } else {
-    get_parents_array (OID, parents);
-    if (!get_children (OID + ".pr", collection, metadata, 
-               getParents, collectproto, fsiblings, logout))
-      return;
-  }
-  if (!get_info (parents, collection, metadata, false, collectproto, fparents, logout)) return;
-  
-  if (!fparents.docInfo.empty()) 
-    output_parents_toc(args, fparents, tabcount, disp, collectproto,
-               formatlistptr, outconvert, textout, logout);
-  
-  if (!fsiblings.docInfo.empty()) 
-    output_siblings_toc (classifytype, args, fsiblings, tabcount, disp, 
-             formatlistptr, outconvert, textout, logout);
-}
-
-void output_parents_toc (cgiargsclass &args, const FilterResponse_t &parents,
-             int &tabcount, displayclass &disp, recptproto *collectproto,
-             format_t *formatlistptr, outconvertclass &outconvert, 
-             ostream &textout, ostream &logout) {  
-
-  text_t tab, icon;
-  text_t &arg_cl = args["cl"];
-  text_t &arg_d = args["d"];
-  int numcols = parents.docInfo.size() + 1;
-
-  bool intable = is_table_content (formatlistptr); 
-
-  ResultDocInfo_tarray::const_iterator thisparent = parents.docInfo.begin();
-  ResultDocInfo_tarray::const_iterator end = parents.docInfo.end();
-
-  int len = (*thisparent).metadata.size();
-  //  const text_t &classifytype = (*thisparent).metadata[len-1].values[0];
-
-  // don't want top level of any classifications to be displayed
-  if (arg_d.empty() && thisparent != end) {thisparent ++; numcols --;}
-
-  // don't want second level of classifications using classification links
-  //  if ((classifytype == "AZList" || classifytype == "DateList") && (thisparent != end))
-  //    {thisparent ++; numcols --;}
-
-  // the tab line
-  if (thisparent != end) {
-    text_t coltabs;
-    for (int i = 0; i < numcols; i ++) coltabs += "_document:tab_";
-    textout << outconvert << disp << "<tr>" << coltabs << "<td></td></tr>\n";
-  }
-
-  bool first = true;
-  while (thisparent != end) {
-
-    text_t link;
-    bool azlist = false;
-    // set azlist if we're in an AZList section (i.e. immediate parent
-    // has classifytype of AZList
-    if (!first && (*(thisparent-1)).metadata[len-1].values[0] == "AZList")
-      azlist = true;
-  
-    const text_t &doctype = (*thisparent).metadata[len-2].values.back();
-    //    bool thissection = false;
-
-    if (!azlist) {
-      // set up icon and pointer
-      icon = "_document:icon";
-      if ((doctype != "classify") && ((*thisparent).OID == arg_d))
-    icon += "arrow";
-      if (doctype == "classify") icon += "openbookshelf_";
-      else if (is_top((*thisparent).OID)) icon += "openbook_";
-      else icon += "openfolder_";
-    
-      // set up the link
-      link = "<a href=\"_httpdocument_";
-      if (is_top((*thisparent).OID) && args.getintarg("x")) link = "<a name=top>";
-      else 
-    if (doctype == "classify") link += "&cl=" + (*thisparent).OID + ".pr\">";
-    else 
-      if (is_top ((*thisparent).OID)) 
-        if (arg_cl.empty())
-          link = "<a name=top>";
-        else if (arg_cl == "search")
-          link = "<a href=\"_httpquery_\">";
-        else
-          link += "&cl=" + arg_cl + "\">";
-      else link += "&cl=" + arg_cl + "&d=" + (*thisparent).OID + ".pr\">";
-    }
-      
-    if (tabcount == 1) textout << "<td></td>\n";
-    else if (tabcount > 1) textout << "<td colspan=" << tabcount << "></td>";
-
-    if ((numcols-tabcount) == 1) textout << "<td>";
-    else if ((numcols-tabcount) > 1) textout << "<td colspan=" 
-                         << (numcols-tabcount) << ">";
-
-    if (intable) textout << "<table><tr>";
-
-    if (azlist) {
-      FilterResponse_t response;
-      // AZLists rely on Title metadata
-      text_tarray metadata;
-      metadata.push_back ("Title");
-
-      // need to get siblings of this classification
-      if (get_children ((*(thisparent-1)).OID, args["c"], metadata, false, 
-            collectproto, response, logout)) {
-
-    ResultDocInfo_tarray::const_iterator thissib = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator endsib = response.docInfo.end();
-
-    while (thissib != endsib) {
-      link = "<a href=\"_httpdocument_&cl=" + (*thissib).OID + "\">"; 
-      const text_t &title = (*thissib).metadata[0].values.back(); 
-      if ((*thissib).OID == (*thisparent).OID)
-        textout << outconvert << disp << "<b>" << title << "</b>\n";
-      else textout << outconvert << disp << link << title << "</a>\n";
-      thissib ++;
-    }
-      }
-    } else {
-      textout << outconvert << disp 
-          << get_formatted_string (*thisparent, formatlistptr, link, icon);
-    }
-    
-    if (intable) textout << "</tr></table>";
-    textout << "</td></tr>\n";
-
-    first = false;
-    tabcount ++;
-    thisparent ++;
-  }
-}
-
-
-void output_siblings_toc (const text_t &classifytype, cgiargsclass &args, 
-              const FilterResponse_t &siblings, int &tabcount, 
-              displayclass &disp, format_t *formatlistptr, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &/*logout*/) {
-
-  bool intable = is_table_content (formatlistptr); 
-
-  ResultDocInfo_tarray::const_iterator thissibling = siblings.docInfo.begin();
-  ResultDocInfo_tarray::const_iterator sibend = siblings.docInfo.end();
-
-  if (thissibling == sibend) return;
-
-  // tabbing
-  if (tabcount) {
-    if (tabcount == 1) textout << "<tr><td></td>\n";
-    else if (tabcount > 1) textout << "<tr><td colspan=" << tabcount << "></td>";
-    textout << "<td><table>\n";
-  }
-
-  if (!intable) textout << "<tr><td>\n";
-  
-  if (classifytype == "DateList")
-    output_datelist (args, thissibling, sibend, intable, disp, 
-             formatlistptr, outconvert, textout);
-  else 
-    output_stdlist (args, thissibling, sibend, intable, disp, 
-            formatlistptr, outconvert, textout);
-
-  if (!intable) textout << "</td></tr></table>\n";
-  if (tabcount) textout << "</table></td></tr>\n";
-}
-
-void output_stdlist (cgiargsclass &args, ResultDocInfo_tarray::const_iterator &here,
-             ResultDocInfo_tarray::const_iterator &end, bool intable,
-             displayclass &disp, format_t *formatlistptr, 
-             outconvertclass &outconvert, ostream &textout) {
-
-  text_t icon;
-  int count = 1;
-  int gt = args.getintarg("gt");
-  text_t &arg_cl = args["cl"];
-  text_t &arg_d = args["d"];
-
-  while (here != end) {
-
-    int len = (*here).metadata.size();
-    const text_t &doctype = (*here).metadata[len-2].values.back();
-    const text_t &hastxt = (*here).metadata[len-4].values.back(); 
-    const text_t &haschildren = (*here).metadata[len-3].values.back();
-
-    // set up icon and pointer
-    icon = "_document:icon";
-    if (doctype == "classify") {
-      if (((*here).OID == arg_cl) && (hastxt == "1"))
-        icon += "arrow";
-    } else if ((*here).OID == arg_d) icon += "arrow";
-
-    if (haschildren == "0") icon += "smalltext_";
-    else if (doctype == "classify") icon += "closedbookshelf_";
-    else if (is_top((*here).OID)) icon += "closedbook_";
-    else icon += "closedfolder_";
-    
-    // set up link
-    text_t link = "<a href=\"_httpdocument_";
-    if (doctype == "classify") link += "&cl=" + (*here).OID + "\">";
-    else link += "&cl=" + arg_cl + "&d=" + (*here).OID + "\">";
-    if (gt) {
-      link = "<a href=\"#" + text_t(count) + "\">";
-      count ++;
-    }
-
-    if (intable) textout << "<tr>";
-    
-    textout << outconvert << disp 
-        << get_formatted_string (*here, formatlistptr, link, icon) << "\n";
-    
-    if (intable) textout << "</tr>";
-
-    here ++;
-  }
-}
-
-
-void output_datelist (cgiargsclass &args, ResultDocInfo_tarray::const_iterator &here,
-              ResultDocInfo_tarray::const_iterator &end, bool intable,
-              displayclass &disp, format_t *formatlistptr, 
-              outconvertclass &outconvert, ostream &textout) {
-
-  text_t lastyear = "0000";
-  text_t lastmonth = "00";
-
-  while (here != end) {
-
-    int len = (*here).metadata.size();
-    const text_t &doctype = (*here).metadata[len-2].values.back();
-    const text_t &date = (*here).metadata[len-5].values.back(); 
-
-    // bail on this document if it has no date
-    if (date.empty()) continue;
-
-    text_t::const_iterator datebegin = date.begin();
-    int datesize = date.size();
-    
-    if (datesize < 4) continue;
-    text_t thisyear = substr (datebegin, datebegin+4);
-    text_t thismonth = "00";
-    if (datesize >= 6)
-      thismonth = substr (datebegin+4, datebegin+6); 
-
-    text_t link = "<a href=\"_httpdocument_&cl=";
-    text_t icon = "_document:iconclosedbook_";
-      
-    if (doctype == "classify") {
-      icon = "_document:iconclosedbookshelf_";
-      link += (*here).OID + "\">";
-    } else link += args["cl"] + "&d=" + (*here).OID + "\">";
-
-    textout << "<tr>\n";
-
-    if (thisyear != lastyear) {
-      textout << outconvert << "<td><b>" << thisyear << "</b></td>";
-      lastyear = thisyear;
-    } else
-      textout << "<td></td>";
-
-    if (thismonth != lastmonth) {
-      textout << outconvert << disp << ("<td><b>_textmonth" + thismonth + "_</b></td>");
-      lastmonth = thismonth;
-    } else
-      textout << "<td></td>";
-
-    if (!intable) textout << "<td>\n";
-    
-    textout << outconvert << disp 
-          << get_formatted_string (*here, formatlistptr, link, icon) << "\n";
-
-    if (!intable) textout << "</td>";
-      
-    textout << "</tr>\n";
-
-    here ++;
-  }
-}
-
-void output_expanded_hierarchy_toc (cgiargsclass &args, recptproto *collectproto,
-                    displayclass &disp, outconvertclass &outconvert,
-                    ostream &textout, ostream &logout) {
-
-  text_t OID, topOID, classifytype, icon;
-  FilterResponse_t response;
-  int tabcols=0, totalcols=0, lasttabcols=0;
-
-  int gt = args.getintarg("gt");
-  text_t doclink = "<a href=\"_httpdocument_&cl=";
-
-  text_t &arg_d = args["d"];
-  text_t &arg_cl = args["cl"];
-
-  if (arg_d.empty()) {
-    if (arg_cl.empty()) return;
-    OID = arg_cl;
-    topOID = OID; // don't always want to expand from top if expanding classifications
-    classifytype = "classify";
-  } else {
-    OID = arg_d;
-    get_top (arg_d, topOID);
-    classifytype = "Document";
-  }
-
-  // Get OIDs and metadata of all topOIDs contents (and topOID itself)
-  text_tarray metadata;
-  metadata.push_back ("Title");
-  metadata.push_back ("haschildren");
-  metadata.push_back ("doctype");
-  //  metadata.push_back ("hastxt");
-
-  get_contents (topOID, classifytype, metadata, totalcols, 
-        args["c"], collectproto, response, logout);
-  int excess = countchar (topOID.begin(), topOID.end(), '.');
-  totalcols -= excess;
-
-  // allow for pointer
-  if (classifytype == "Document" && !gt) totalcols += 2;
-  else totalcols += 1;
-
-  ResultDocInfo_tarray::const_iterator thissection = response.docInfo.begin();
-  ResultDocInfo_tarray::const_iterator lastsection = response.docInfo.end();
-  
-  int count = 1;
-  while (thissection != lastsection) {
-    
-    const text_t &title = (*thissection).metadata[0].values[0];
-    const int haschildren = (*thissection).metadata[1].values[0].getint();
-    const text_t &doctype = (*thissection).metadata[2].values[0];
-
-    text_t icontabs, tab, pointer;
-
-    // set up icon
-    icon = "_document:iconsmalltext_";
-    if (is_top((*thissection).OID))
-      if (classifytype == "Document") icon = "_document:iconopenbook_";
-      else 
-    if (doctype == "classify") icon = "_document:iconopenbookshelf_";
-    else icon = "_document:iconclosedbook_";
-    else if (haschildren) 
-      if (classifytype == "Document") icon = "_document:iconopenfolder_";
-      else icon = "_document:iconopenbookshelf_";
-    
-    // set up tabbing
-    if ((classifytype == "classify") && (doctype != "classify"))
-      tabcols = lasttabcols + 1;
-    else {
-      tabcols = countchar ((*thissection).OID.begin(), (*thissection).OID.end(), '.');
-      lasttabcols = tabcols;
-    }
-    tabcols -= excess;
-
-    for (int i = 0; i < tabcols; i++) 
-      icontabs += "_document:icontab_";
-    
-    // set up pointer
-    if (classifytype == "Document" && !gt) {
-      if ((*thissection).OID == OID) pointer = "_document:iconpointer_";
-      else pointer = "_document:icontab_";
-      tabcols ++;
-    }
-    
-    int colsremaining = totalcols - tabcols;
-
-    if (tabcols > 0) {
-      tab = "<td";
-      if (tabcols > 1) tab += " colspan=" + text_t(tabcols);
-      tab += ">" + icontabs + pointer + "</td>";
-    }
-
-    textout << outconvert << disp << "<tr>" << tab << "<td>";
-    
-    if ((classifytype == "Document") && (is_top((*thissection).OID)) && 
-    (args.getintarg("x")))
-      textout << outconvert << disp << icon << "</td><td";
-
-    else {
-      if (!gt) {
-    const text_t &thisOID = (*thissection).OID;
-    text_t link;
-    if (is_top (thisOID))
-      if (classifytype == "classify")
-        link = doclink + arg_cl + "&d=" + thisOID + "\">";
-      else
-        if (arg_cl.empty())
-          link.clear();
-        else if (arg_cl == "search")
-          link = "<a href=\"_httpquery_\">";
-        else
-          link = doclink + arg_cl + "\">";
-    else
-      if (haschildren)
-        if (classifytype == "classify")
-          link = doclink + thisOID + ".pr\">";
-        else
-          link = doclink + arg_cl + "&d=" + thisOID + ".pr\">";
-      else
-        if (classifytype == "classify")
-          link = doclink + thisOID + "\">";
-        else
-          link = doclink + arg_cl + "&d=" + thisOID + "\">";
-    
-    textout << outconvert << disp << link;
-      } else {
-    textout << "<a href=\"#" << count << "\">";
-    count ++;
-      }
-    
-      textout << outconvert << disp << icon << "</a></td><td";
-    }
-    if (colsremaining > 1) textout << " colspan=" << colsremaining;
-    textout << outconvert << disp << ">" << title << "</td></tr>\n";
-
-    thissection ++;
-  }
-}
-
-/*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
-
-// set_arrow_macros sets the _httpprevarrow_ and _httpnextarrow_ macros
-// it shouldn't be called if OID is the top level of a book 
-// as the "hasprevious" and "hasnext" metadata won't be set
-// when the filter can't get OIDs parent info - one day I'll
-// fix this ;-)
-void set_arrow_macros (const text_t &OID, const text_t &classifytype,
-               bool showtoppage, displayclass &disp, 
-               recptproto *collectproto, const text_t &collection, 
-               ostream &logout) {
-
-  if (OID.empty()) return;
-
-  text_tarray metadata;
-  FilterResponse_t response;
-
-  metadata.push_back ("haschildren");
-  metadata.push_back ("hasnext");
-  metadata.push_back ("hasprevious");
-  // get "haschildren", "hasnext" and "hasprevious" metadata for OID
-  if (get_info (OID, collection, metadata, false, collectproto, response, logout)) {
-
-    text_t haschildren = response.docInfo[0].metadata[0].values[0];
-    text_t hasnext = response.docInfo[0].metadata[1].values[0];
-    text_t hasprevious = response.docInfo[0].metadata[2].values[0];
-
-    if ((classifytype == "Hierarchy") || (classifytype == "Book")) {
-      if (haschildren == "1") 
-    disp.setmacro ("httpnextarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.fc,_httpdocument_&cl=_cgiargcl_.fc)");
-      else if (hasnext == "1")
-    disp.setmacro ("httpnextarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.ns,_httpdocument_&cl=_cgiargcl_.ns)");
-      else {
-    // see if parent has younger siblings
-    if (get_info (OID + ".pr", collection, metadata, false, collectproto, response, logout)) {
-      if (!response.docInfo[0].metadata.empty() &&
-          response.docInfo[0].metadata[1].values[0] == "1")
-        disp.setmacro ("httpnextarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.pr.ns,_httpdocument_&cl=_cgiargcl_.pr.ns)");
-    }
-      }
-
-      if (hasprevious == "1") {
-    // see if OIDs older sibling has children
-    if (get_info (OID + ".ps", collection, metadata, false, collectproto, response, logout)) {
-      if (response.docInfo[0].metadata[0].values[0] == "1")
-        disp.setmacro ("httpprevarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.ps.lc,_httpdocument_&cl=_cgiargcl_.ps.lc)");
-      else 
-        disp.setmacro ("httpprevarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.ps,_httpdocument_&cl=_cgiargcl_.ps)");
-    } 
-      } else if (showtoppage && !is_top (OID))
-    disp.setmacro ("httpprevarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.pr,_httpdocument_&cl=_cgiargcl_.pr)");
-    }
-
-    else {
-      if (hasnext == "1")
-    disp.setmacro ("httpnextarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.ns,_httpdocument_&cl=_cgiargcl_.ns)");
-      if (hasprevious == "1")
-    disp.setmacro ("httpprevarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.ps,_httpdocument_&cl=_cgiargcl_.ps)");
-    }
-  }
-}
+
+    // contracted table of contents
+    contracted_contents (args, browsermap, formatinfo, collectproto, 
+             disp, outconvert, textout, logout);
+
+  }
+}

trunk/gsdl/src/recpt/browsetools.h

@@ -1 +1 @@
 /**********************************************************************
  *
- * browsetools.h -- 
+ * browsetools.h --
  * Copyright (C) 1999  The New Zealand Digital Library Project
  *
@@ -36 +36 @@
 #include "recptproto.h"
 #include "formattools.h"
+#include "browserclass.h"
 
+typedef map<text_t, format_t*, lttext_t> format_tmap; 
 
-void output_document_toc (cgiargsclass &args, const formatinfo_t &formatinfo,
-              recptproto *collectproto, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &logout);
-
-void output_standard_toc (const text_t &classifytype, const formatinfo_t &formatinfo,
-              text_t &formatstring, cgiargsclass &args, 
-              recptproto *collectproto, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &logout);
-
-void set_arrow_macros (const text_t &OID, const text_t &classifytype,
-               bool showtoppage, displayclass &disp, 
-               recptproto *collectproto, const text_t &collection, 
-               ostream &logout);
+void output_toc (cgiargsclass &args, browsermapclass *browsermap,
+                 formatinfo_t &formatinfo, recptproto *collectproto,
+                 displayclass &disp, outconvertclass &outconvert,
+                 ostream &textout, ostream &logout);
 
 #endif

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, 

trunk/gsdl/src/recpt/documentaction.h

@@ -33 +33 @@
 #include "gsdlconf.h"
 #include "formattools.h"
+#include "receptionist.h"
 
 class documentaction : public action {
@@ -38 +39 @@
 protected:
 
+  receptionist *recpt;
+
   void load_formatinfo (const text_tmap &colformat, int gt);
 
-  void set_spacemacro (displayclass &disp, const FilterResponse_t &response);
+  void set_spacemacro (displayclass &disp, FilterResponse_t &response);
 
-  void set_navbarmacros (displayclass &disp, const FilterResponse_t &response, cgiargsclass &args);
+  void set_navbarmacros (displayclass &disp, FilterResponse_t &response, 
+             cgiargsclass &args);
 
   void set_java_macros (cgiargsclass &args, displayclass &disp);
@@ -50 +54 @@
                 ostream &logout);
 
-  virtual void output_text (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+  virtual void 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);
 
   virtual void output_document (const text_t &OID, cgiargsclass &args, 
@@ -67 +71 @@
 
   formatinfo_t formatinfo;
-  text_tset classify_meta;
-  
 
 public:
@@ -74 +76 @@
   virtual ~documentaction ();
 
-  bool init (ostream &logout);
+  text_t get_action_name () {return "d";}
 
-  text_t get_action_name () {return "d";}
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
 
   bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
@@ -84 +86 @@
                          text_t &response_data, ostream &logout);
 
-  void define_external_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
-                   cgiargsclass &args, recptproto *collectproto, 
-                   ostream &logout);
+  void define_external_macros (const ColInfoResponse_t &collectinfo, 
+                   displayclass &disp, cgiargsclass &args, 
+                   recptproto *collectproto, ostream &logout);
 
-  void define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
-                   cgiargsclass &args, recptproto *collectproto, 
-                   ostream &logout);
+  void define_internal_macros (const ColInfoResponse_t &collectinfo, 
+                   displayclass &disp, cgiargsclass &args, 
+                   recptproto *collectproto, ostream &logout);
 
   bool do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo, 

trunk/gsdl/src/recpt/formattools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.12  1999/10/10 08:14:07  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.11  1999/09/28 20:38:19  rjmcnab
    fixed a couple of bugs
@@ -73 +78 @@
 
 // a few function prototypes
-static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+static text_t format_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &link, const text_t &icon, const text_t &text);
 
 static bool parse_action (text_t::const_iterator &here, const text_t::const_iterator &end, 
-              format_t *formatlistptr, text_tarray &metadata, bool &getParents,
-              text_tmap &metamap, int &metacount);
+              format_t *formatlistptr, text_tset &metadata, bool &getParents);
 
 void metadata_t::clear() {
   metaname.clear();
-  metaindex = 0;
   metacommand = mNone;
   parentcommand = pNone;
-  parentindex = 0;
   parentoptions.clear();
 };
@@ -120 +122 @@
   DocumentButtons.push_back ("Expand Contents");
   DocumentText = "[Text]";
+  formatstrings.erase (formatstrings.begin(), formatstrings.end());
+}
+
+// returns false if key isn't in formatstringmap
+bool get_formatstring (const text_t &key, const text_tmap &formatstringmap,
+               text_t &formatstring) {
+
+  formatstring.clear();
+  text_tmap::const_iterator it = formatstringmap.find(key);
+  if (it == formatstringmap.end()) return false;
+  formatstring = (*it).second;
+  return true;
+}
+// tries to find "key1key2" then "key1" then "key2"
+bool get_formatstring (const text_t &key1, const text_t &key2,  
+               const text_tmap &formatstringmap,
+               text_t &formatstring) {
+
+  formatstring.clear();
+  text_tmap::const_iterator it = formatstringmap.find(key1 + key2);
+  if (it != formatstringmap.end()) {
+    formatstring = (*it).second;
+    return true;
+  }
+  it = formatstringmap.find(key1);
+  if (it != formatstringmap.end()) {
+    formatstring = (*it).second;
+    return true;
+  }
+  it = formatstringmap.find(key2);
+  if (it != formatstringmap.end()) {
+    formatstring = (*it).second;
+    return true;
+  }
+  return false;
 }
 
@@ -152 +189 @@
 static void get_parent_options (text_t &instring, metadata_t &metaoption) {
 
-  metaoption.clear();
   text_t meta, com, op;
   bool inbraces = false;
@@ -175 +211 @@
   else if (com == "Top")
     metaoption.parentcommand = pTop;
-  else if (is_number(com)) {
-    metaoption.parentcommand = pIndex;
-    metaoption.metaindex = com.getint();
-  } else if (com == "All") {
+  else if (com == "All") {
     metaoption.parentcommand = pAll;
     metaoption.parentoptions = op;
@@ -184 +217 @@
 }
 
-static bool parse_meta (text_t &meta, int &count, decision_t &decision,
-            text_tarray &metadata, bool &getParents, text_tmap &metamap) {
+static void parse_meta (text_t &meta, metadata_t &metaoption,
+            text_tset &metadata, bool &getParents) {
+
+  if (meta.size() > 8 && (substr(meta.begin(), meta.begin()+8) == "cgisafe:")) {
+    metaoption.metacommand = mCgiSafe;
+    meta = substr (meta.begin()+8, meta.end());
+  }
 
   if (meta.size() > 7 && (substr (meta.begin(), meta.begin()+6) == "parent")) {
     getParents = true;
-    metadata_t metaoption;
     get_parent_options (meta, metaoption);
-    decision.meta = metaoption;
-  }
-  text_tmap::const_iterator it;
-  if ((it = metamap.find(meta)) != metamap.end()) {
-      decision.meta.metaindex = (*it).second.getint();
-  } else {
-    metamap[meta] = count;
-    metadata.push_back (meta);
-    decision.meta.metaindex = count;
-    count ++;
-  }
-  return true;
-}
-
-static bool parse_meta (text_t &meta, int &count, format_t *formatlistptr,
-            text_tarray &metadata, bool &getParents, text_tmap &metamap) {
+  } 
+
+  metadata.insert (meta);
+  metaoption.metaname = meta;
+}
+
+static void parse_meta (text_t &meta, format_t *formatlistptr,
+            text_tset &metadata, bool &getParents) {
   
   if (meta == "link")
@@ -224 +253 @@
   else {
     formatlistptr->command = comMeta;
-
-    if (meta.size() > 8 && (substr(meta.begin(), meta.begin()+8) == "cgisafe:")) {
-      formatlistptr->meta.metacommand = mCgiSafe;
-      meta = substr (meta.begin()+8, meta.end());
-    }
-
-    if (meta.size() > 7 && (substr (meta.begin(), meta.begin()+6) == "parent")) {
-      getParents = true;
-      metadata_t metaoption;
-      get_parent_options (meta, metaoption);
-      formatlistptr->meta = metaoption;
-    } 
-
-    text_tmap::const_iterator it;
-    if ((it = metamap.find(meta)) != metamap.end()) {
-      formatlistptr->meta.metaindex = (*it).second.getint();
-    } else {
-      metamap[meta] = count;
-      metadata.push_back (meta);
-      formatlistptr->meta.metaindex = count;
-      count ++;
-    }
-    formatlistptr->meta.metaname = meta;
-  }
-  return true;
+    parse_meta (meta, formatlistptr->meta, metadata, getParents);
+  }
 }
 
 static bool parse_string (const text_t &formatstring, format_t *formatlistptr, 
-              text_tarray &metadata, bool &getParents, 
-              text_tmap &metamap, int &metacount) {
+              text_tset &metadata, bool &getParents) {
 
   text_t text;
@@ -273 +278 @@
     text.clear();
       }
-      if (parse_action (++here, end, formatlistptr, metadata, 
-            getParents, metamap, metacount)) {
+      if (parse_action (++here, end, formatlistptr, metadata, getParents)) {
     formatlistptr->nextptr = new format_t();
     formatlistptr = formatlistptr->nextptr;
@@ -295 +299 @@
     here ++;
       }
-      if (parse_meta (meta, metacount, formatlistptr, metadata, getParents, metamap)) {
-    formatlistptr->nextptr = new format_t();
-    formatlistptr = formatlistptr->nextptr;
-      }
+      parse_meta (meta, formatlistptr, metadata, getParents);
+      formatlistptr->nextptr = new format_t();
+      formatlistptr = formatlistptr->nextptr;
 
     } else 
@@ -317 +320 @@
 
 static bool parse_action (text_t::const_iterator &here, const text_t::const_iterator &end, 
-              format_t *formatlistptr, text_tarray &metadata, bool &getParents,
-              text_tmap &metamap, int &metacount) {
+              format_t *formatlistptr, text_tset &metadata, bool &getParents) {
 
   text_t::const_iterator it = findchar (here, end, '}');
@@ -371 +373 @@
       // it's metadata
       text_t meta = substr (beginbracket+1, endbracket);
-      parse_meta (meta, metacount, or_ptr, metadata, getParents, metamap);
+      parse_meta (meta, or_ptr, metadata, getParents);
 
     } else {
@@ -390 +392 @@
       if ((*beginbracket == '[') && (*endbracket == ']')) {
         text_t meta = substr (beginbracket+1, endbracket);
-        decision_t decision;
-        parse_meta (meta, metacount, formatlistptr->decision, 
-            metadata, getParents, metamap);
+        parse_meta (meta, formatlistptr->decision.meta, metadata, getParents);
         commacount ++;
         text.clear();
@@ -399 +399 @@
     } else if (commacount == 1) {
       formatlistptr->ifptr = new format_t();
-      parse_string (text, formatlistptr->ifptr, metadata, 
-            getParents, metamap, metacount);
+      parse_string (text, formatlistptr->ifptr, metadata, getParents);
       commacount ++;
       text.clear();
@@ -406 +405 @@
     } else if (commacount == 2) {
       formatlistptr->elseptr = new format_t();
-      parse_string (text, formatlistptr->elseptr, metadata, 
-            getParents, metamap, metacount);
+      parse_string (text, formatlistptr->elseptr, metadata, getParents);
       commacount ++;
       text.clear();
@@ -424 +422 @@
 
 bool parse_formatstring (const text_t &formatstring, format_t *formatlistptr, 
-             text_tarray &metadata, bool &getParents) {
+             text_tset &metadata, bool &getParents) {
 
   formatlistptr->clear();
-  metadata.erase (metadata.begin(), metadata.end());
   getParents = false;
 
-  text_tmap metamap;
-  int metacount = 0;
-  return (parse_string (formatstring, formatlistptr, metadata, 
-            getParents, metamap, metacount));
+  return (parse_string (formatstring, formatlistptr, metadata, getParents));
 }
 
@@ -440 +434 @@
 // be of the form yyyymmdd, this is of course, crap ;)
 
-static text_t get_meta (const ResultDocInfo_t &docinfo, const metadata_t &meta) {
-  int metasize = docinfo.metadata.size();
-  int mindex = meta.metaindex;
-  if (metasize < 1 || metasize <= mindex) return "";
-  int valuesize = docinfo.metadata[mindex].values.size();
+static text_t get_meta (ResultDocInfo_t &docinfo, const metadata_t &meta) {
+  
+  // make sure we have the requested metadata
+  MetadataInfo_tmap::iterator it = docinfo.metadata.find (meta.metaname);
+  if (it == docinfo.metadata.end()) return "";
+
+  MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
 
   switch (meta.parentcommand) {
   case pNone:
     if (meta.metaname == "Date")
-      return format_date (docinfo.metadata[mindex].values.back());
+      return format_date (docinfo.metadata[meta.metaname].values[0]);
     if (meta.metacommand == mCgiSafe) 
-      return cgi_safe (docinfo.metadata[mindex].values.back());
-    else return docinfo.metadata[mindex].values.back();
+      return cgi_safe (docinfo.metadata[meta.metaname].values[0]);
+    else return docinfo.metadata[meta.metaname].values[0];
 
   case pImmediate:
-    if (valuesize > 1) {
+    if (parent != NULL) {
       if (meta.metaname == "Date") 
-    return format_date (docinfo.metadata[mindex].values[metasize-2]);
-    if (meta.metacommand == mCgiSafe) 
-      return cgi_safe (docinfo.metadata[mindex].values[metasize-2]);
-    else return docinfo.metadata[mindex].values[metasize-2];
+    return format_date (parent->values[0]);
+      if (meta.metacommand == mCgiSafe) 
+    return cgi_safe (parent->values[0]);
+      else return parent->values[0];
     }
     break;
 
   case pTop:
-    if (valuesize > 1) {
+    if (parent != NULL) {
+      while (parent->parent != NULL) parent = parent->parent;
+
       if (meta.metaname == "Date") 
-    return format_date (docinfo.metadata[mindex].values[0]);
-    if (meta.metacommand == mCgiSafe) 
-      return cgi_safe (docinfo.metadata[mindex].values[0]);
-    else return docinfo.metadata[mindex].values[0];
+    return format_date (parent->values[0]);
+      if (meta.metacommand == mCgiSafe) 
+    return cgi_safe (parent->values[0]);
+      else return parent->values[0];
     }
     break;
 
-  case pIndex:
-    if (valuesize > meta.parentindex) {
-      if (meta.metaname == "Date") 
-    return format_date (docinfo.metadata[mindex].values[meta.parentindex]);
-      if (meta.metacommand == mCgiSafe) 
-    return cgi_safe (docinfo.metadata[mindex].values[meta.parentindex]);
-      else return docinfo.metadata[mindex].values[meta.parentindex];
-    }
-    break;
-
   case pAll:
-    bool first = true;
-    text_t tmp;
-    if (valuesize > 1) {
-      text_tarray::const_iterator here = docinfo.metadata[mindex].values.begin();
-      // don't want last value as that's the value of the current level (i.e. it's
-      // not a parent
-      text_tarray::const_iterator end = docinfo.metadata[mindex].values.end() - 1;
+    MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
+    if (parent != NULL) {
+      text_tarray tmparray;
+      while (parent != NULL) {
+    tmparray.push_back (parent->values[0]);
+    parent = parent->parent;
+      }
+      bool first = true;
+      text_t tmp;
+      text_tarray::reverse_iterator here = tmparray.rbegin();
+      text_tarray::reverse_iterator end = tmparray.rend();
       while (here != end) {
     if (!first) tmp += meta.parentoptions;
@@ -499 +491 @@
     here ++;
       }
+      if (meta.metacommand == mCgiSafe) return cgi_safe (tmp);
+      else return tmp;
     }
-    if (meta.metacommand == mCgiSafe) return cgi_safe (tmp);
-    else return tmp;
   }
   return "";
 }
 
-static text_t get_or (const ResultDocInfo_t &docinfo, format_t *orptr,
+static text_t get_or (ResultDocInfo_t &docinfo, format_t *orptr,
               const text_t &link, const text_t &icon, const text_t &text) {
 
@@ -520 +512 @@
 }
 
-static text_t get_if (const ResultDocInfo_t &docinfo, const decision_t &decision,
+static text_t get_if (ResultDocInfo_t &docinfo, const decision_t &decision,
               format_t *ifptr, format_t *elseptr, const text_t &link, 
               const text_t &icon, const text_t &text) {
@@ -538 +530 @@
 }
 
-text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t format_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
               const text_t &link, const text_t &icon, const text_t &text) {
 
@@ -569 +561 @@
 
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &link, const text_t &icon) {
 
@@ -583 +575 @@
 
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr) {
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr) {
 
   text_t link = "<a href=\"_httpdocument_&cl=search&d=" + docinfo.OID + "\">";
@@ -598 +590 @@
 
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &text) {
 
@@ -613 +605 @@
 
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &link, const text_t &icon, const text_t &text) {
 

trunk/gsdl/src/recpt/formattools.h

@@ -34 +34 @@
 
 enum command_t {comIf, comOr, comMeta, comText, comLink, comEndLink, comNum, comIcon, comDoc};
-enum pcommand_t {pNone, pImmediate, pTop, pIndex, pAll};
+enum pcommand_t {pNone, pImmediate, pTop, pAll};
 enum dcommand_t {dMeta};
 enum mcommand_t {mNone, mCgiSafe};
@@ -43 +43 @@
 
   text_t metaname;
-  int metaindex;
   mcommand_t metacommand;
   pcommand_t parentcommand;
-  int parentindex;
   text_t parentoptions;
 };
@@ -85 +83 @@
   text_tarray DocumentButtons;
   text_t DocumentText;
+  text_tmap formatstrings;
 };
 
+bool get_formatstring (const text_t &key, const text_tmap &formatstringmap,
+               text_t &formatstring);
+bool get_formatstring (const text_t &key1, const text_t &key2,  
+               const text_tmap &formatstringmap,
+               text_t &formatstring);
 
 text_t format_date (const text_t &date);
 
 bool parse_formatstring (const text_t &formatstring, format_t *formatlistptr, 
-             text_tarray &metadata, bool &getParents);
+             text_tset &metadata, bool &getParents);
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &link, const text_t &icon);
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr);
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr);
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &text);
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+text_t get_formatted_string (ResultDocInfo_t &docinfo, format_t *formatlistptr,
                  const text_t &link, const text_t &icon, const text_t &text);
 

trunk/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.14  1999/10/10 08:14:09  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.13  1999/09/16 21:39:35  sjboddie
    added gb converters
@@ -95 +100 @@
 #include "authenaction.h"
 
+#include "browserclass.h"
+#include "vlistbrowserclass.h"
+#include "hlistbrowserclass.h"
+#include "datelistbrowserclass.h"
+#include "invbrowserclass.h"
+
 #include "gsdlhome.h"
 
@@ -187 +198 @@
 
   documentaction adocumentaction;
+  adocumentaction.set_receptionist(&recpt);
   recpt.add_action (&adocumentaction);
 
@@ -196 +208 @@
   recpt.add_action (&aauthenaction);
 
+  // list of browsers
+  vlistbrowserclass avlistbrowserclass;
+  recpt.add_browser (&avlistbrowserclass);
+  recpt.setdefaultbrowser ("VList");
+
+  hlistbrowserclass ahlistbrowserclass;
+  recpt.add_browser (&ahlistbrowserclass);
+
+  datelistbrowserclass adatelistbrowserclass;
+  recpt.add_browser (&adatelistbrowserclass);
+
+  invbrowserclass ainvbrowserclass;
+  recpt.add_browser (&ainvbrowserclass);
+
   cgiwrapper (recpt, "");
   return 0;

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.16  1999/10/10 08:14:09  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.15  1999/09/17 04:46:05  sjboddie
    fixed a couple of problems with 'unknown' classifier
@@ -121 +126 @@
 }
 
-
-bool pageaction::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 pageaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &/*args*/, 
                 ostream &/*logout*/) {
@@ -154 +137 @@
   response_data = "text/html";
 }
-
-
-// define all the macros which might be used by other actions
-// to produce pages. 
-void pageaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &/*disp*/, 
-                     cgiargsclass &/*args*/, recptproto * /*collectproto*/, 
-                     ostream &/*logout*/) {
-}
-
 
 void pageaction::define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
@@ -203 +177 @@
     }
 
-    unsigned long current_time = time(NULL);
-    text_t homeextra;
+    text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
 
     recptprotolistclass *rprotolist = recpt->get_recptprotolist_ptr ();
@@ -213 +186 @@
     while (rprotolist_here != rprotolist_end) {
       if ((*rprotolist_here).p != NULL) {
+
     text_tarray collist;
     comerror_t err;
@@ -220 +194 @@
       text_tarray::iterator collist_end = collist.end();
 
-      homeextra += "<dl>\n";
-
-      FilterResponse_t response;
-      text_tarray metadata;
-      metadata.push_back ("collectionname");
-
+      int row1 = 6;
+      int row2 = 4;
+      int count = 1;
       while (collist_here != collist_end) {
-        text_t collectionname = *collist_here;
-        if (get_info ("collection", *collist_here, metadata, false, (*rprotolist_here).p, response, logout))
-          collectionname = response.docInfo[0].metadata[0].values[0];
-        
+
         ColInfoResponse_t cinfo;
         (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
         if (err == noError) {
-          text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
-          if (!cinfo.receptionist.empty()) 
-        link = "<a href=\"" + cinfo.receptionist + "?a=p&p=about&c=" + *collist_here + "\">";
-          
-          homeextra += "<dt>" + link + collectionname + "</a></dt>\n";
-          homeextra += "<dd>";
-          if (cinfo.numDocs != 0) homeextra += text_t(cinfo.numDocs) + "_documents_";
-          if (cinfo.numWords != 0) homeextra += text_t(cinfo.numWords) + "_words_";
-          unsigned long last_update = (current_time - cinfo.buildDate) / 86400;
-          homeextra += "_lastupdate_ " + text_t(last_update) + " _ago_</dd>\n";
+          if (cinfo.isPublic) {
+
+        FilterResponse_t response;
+        text_tset metadata;
+        metadata.insert ("collectionname");
+        metadata.insert ("iconcollection");
+        metadata.insert ("iconcollectionsmall");
+        text_t collectionname = *collist_here;
+        text_t alt = collectionname;
+        if (get_info ("collection", *collist_here, metadata, false, 
+                  (*rprotolist_here).p, response, logout)) {
+          if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
+            alt = response.docInfo[0].metadata["collectionname"].values[0];
+          
+          if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty())
+            collectionname = "<img width=150 src=\""
+              + response.docInfo[0].metadata["iconcollectionsmall"].values[0]
+              + "\" alt=\"" + alt + "\">";
+          else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty())
+            collectionname = "<img width=150 src=\""
+              + response.docInfo[0].metadata["iconcollection"].values[0]
+              + "\" alt=\"" + alt + "\">";
+          else collectionname = alt;
+        }
+        
+        if ((count == 1) || (count == (row1+1)) || (count == ((row1+row2)+1))) 
+          homeextra += "<td align=center>";
+        else homeextra += "<p>";
+        text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
+        if (*collist_here == "chinese")
+          link = "<a href=\"_gwcgi_?a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
+
+        if (!cinfo.receptionist.empty()) 
+          link = "<a href=\"" + cinfo.receptionist + "?a=p&p=about&c=" 
+            + *collist_here + "\">";
+        
+        homeextra += link + collectionname + "</a>\n";
+        
+        if ((count == row1) || (count == (row1+row2))) 
+          homeextra += "</td>";
+        
+        count ++;
+          }
         }
+
         collist_here ++;
       }
-      homeextra += "</dl>\n";
+      homeextra += "</tr></table></center>\n";
       disp.setmacro ("homeextra", "home", homeextra); 
     }
@@ -265 +267 @@
 
     FilterResponse_t response;
-    text_tarray metadata;
-    metadata.push_back ("Title");
+    text_tset metadata;
+    metadata.insert ("Title");
     bool getParents = false;
     get_children ("", args["c"], metadata, getParents, collectproto, response, logout);
@@ -272 +274 @@
     disp.setmacro ("numbrowseoptions", "help", response.docInfo.size()+1);
 
-    ResultDocInfo_tarray::const_iterator here = response.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator end = response.docInfo.end();
+    ResultDocInfo_tarray::iterator here = response.docInfo.begin();
+    ResultDocInfo_tarray::iterator end = response.docInfo.end();
 
     // we're assuming that we've always got a search button
@@ -280 +282 @@
 
     while (here != end) {
-      text_t title = (*here).metadata[0].values[0];
-
-      text_tset::const_iterator it = classify_meta.find (title);
-      if (it == classify_meta.end()) title = "Unknown";
-
-      shorttext += "<li>_text" + title + "short_\n";
-      longtext += "_text" + title + "long_";
+      text_t title = (*here).metadata["Title"].values[0];
+
+      text_t stext, ltext;
+      disp.expandstring ("document", "_text" + title + "short_", stext);
+      if (stext == ("_text" + title + "short_")) {
+    stext = "<li>_textdefaultshorttext_";
+    ltext = "_textdefaultlongtext_";
+      } else {
+    shorttext += "<li>" + stext;
+    longtext += "_text" + title + "long_";
+      }
       here ++;
     }

trunk/gsdl/src/recpt/pageaction.h

@@ -47 +47 @@
   virtual ~pageaction ();
 
-  bool init (ostream &logout);
-
   text_t get_action_name () {return "p";}
 
@@ -57 +55 @@
   void get_cgihead_info (cgiargsclass &args, response_t &response,
              text_t &response_data, ostream &logout);
-
-  void define_external_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
-                   cgiargsclass &args, recptproto *collectproto, 
-                   ostream &logout);
 
   void define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.26  1999/10/10 08:14:10  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/24 04:49:39  sjboddie
    fixed up the query selection boxes to display properly if there's only
@@ -517 +522 @@
 
     if (havequerylink)
-      request.fields.push_back (querylinkmeta);
-
-    int metasize = request.fields.size();
+      request.fields.insert (querylinkmeta);
 
     // do the query
@@ -535 +538 @@
     // 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();
+    ResultDocInfo_tarray::iterator this_doc = response.docInfo.begin();
+    ResultDocInfo_tarray::iterator end_doc = response.docInfo.end();
 
     while (this_doc != end_doc) {
@@ -544 +547 @@
       textout << "<tr>\n";
       if (havequerylink) {
-    const text_t &qlmeta = (*this_doc).metadata[metasize-1].values.back();
+    const text_t &qlmeta = (*this_doc).metadata[querylinkmeta].values[0];
     if (qlmeta.empty())
       textout << outconvert << disp 

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.33  1999/10/10 08:14:10  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.32  1999/09/21 11:28:45  sjboddie
    tidied up file locking
@@ -290 +295 @@
   // add the cgi arguments from this action
   argsinfo.addarginfo (NULL, theaction->getargsinfo());
+}
+
+
+void receptionist::add_browser (browserclass *thebrowser) {
+  // make sure we have a browser to add
+  if (thebrowser == NULL) return;
+
+  // add this browser to the list of browsers
+  browsers.addbrowser(thebrowser);
+}
+
+
+void receptionist::setdefaultbrowser (const text_t &browsername) {
+  browsers.setdefaultbrowser (browsername);
 }
 
@@ -378 +397 @@
     }
   }
-
   
   // configure the actions
@@ -403 +421 @@
     protohere++;
   }
-}
+
+  // configure the browsers
+  browserptrmap::iterator browserhere = browsers.begin ();
+  browserptrmap::iterator browserend = browsers.end ();
+
+  while (browserhere != browserend) {
+    assert ((*browserhere).second.b != NULL);
+    if ((*browserhere).second.b != NULL) 
+      (*browserhere).second.b->configure(key, cfgline);
+    
+    browserhere++;
+  }
+}
+
 
 void receptionist::configure (const text_t &key, const text_t &value) {
@@ -450 +481 @@
   }
 
+  // there must be at least one browser defined
+  if (browsers.empty()) {
+    logout << "Error: no browsers have been added to the receptionist\n";
+    return false;
+  }
+
   // create a saveconf string if there isn't one already
   if (configinfo.saveconf.empty())
@@ -502 +539 @@
     !(*protohere).p->init(logout)) return false;
     protohere++;
+  }
+
+  // init the browsers
+  browserptrmap::iterator browserhere = browsers.begin ();
+  browserptrmap::iterator browserend = browsers.end ();
+  while (browserhere != browserend) {
+    if (((*browserhere).second.b == NULL) || 
+    !(*browserhere).second.b->init(logout)) return false;
+    browserhere++;
   }
 
@@ -800 +846 @@
   }
 
+  // get browsers to process OID
+  text_t OID = args["d"];
+  if (OID.empty()) OID = args["cl"];
+  text_tset metadata;
+  FilterResponse_t response;
+  metadata.insert ("classifytype");
+  if (get_info (OID + ".pr", args["c"], metadata, false, collectproto, response, logout)) {
+    browserclass *b = 
+      browsers.getbrowser (response.docInfo[0].metadata["classifytype"].values[0]);
+    b->processOID (args);
+  }
+
   // translate "d", "cl", and "hp" arguments if required
   translate_OIDs (args, collectproto, logout);
@@ -947 +1005 @@
 // if they use the tricky ".fc", ".lc" type syntax. also sorts out the "d" argument
 // if the goto page ("gp") argument was used
-void receptionist::translate_OIDs (cgiargsclass &args, recptproto *collectproto, ostream &logout) {
+void receptionist::translate_OIDs (cgiargsclass &args, recptproto *collectproto, 
+                   ostream &logout) {
 
   FilterResponse_t response;
@@ -957 +1016 @@
   text_t &collection = args["c"];
   text_t &arg_gp = args["gp"];
-
-  bool DocumentTopPages = true;
-  text_tmap::const_iterator it = collectinfo.format.find("DocumentTopPages");
-  if ((it != collectinfo.format.end()) && ((*it).second == "false")) DocumentTopPages = false;
   
   // do a call to translate OIDs if required
   request.filterName = "NullFilter";
   request.filterResultOptions = FROID;
-  if ((!arg_d.empty()) && (needs_translating (arg_d) || !DocumentTopPages)) {
+  if (!arg_d.empty() && needs_translating (arg_d)) {
     request.docSet.push_back (arg_d);
-    request.fields.push_back ("classifytype");
-    request.filterResultOptions = FRmetadata;
-    request.getParents = true;
     collectproto->filter (collection, request, response, err, logout);
     arg_d = response.docInfo[0].OID;
-    
-    text_t &classifytype = response.docInfo[0].metadata[0].values[0];
-    if (classifytype.empty() || classifytype == "Book")
-      if (!DocumentTopPages && is_top (arg_d)) arg_d += ".fc";
-    
     request.clear();
   }
@@ -982 +1029 @@
   // (in case ".fc" or ".lc" have screwed up)
   if (needs_translating (arg_cl)) {
-    request.fields.push_back("doctype");
+    request.fields.insert ("doctype");
     request.docSet.push_back (arg_cl);
     request.filterResultOptions = FRmetadata;
     collectproto->filter (collection, request, response, err, logout);
     // set to original value (without .xx stuff) if doctype isn't "classify"
-    if (response.docInfo[0].metadata[0].values[0] != "classify")
+    if (response.docInfo[0].metadata["doctype"].values[0] != "classify")
       strip_suffix (arg_cl);
     else
@@ -1004 +1051 @@
     text_t top;
     get_top (arg_d, top);
-    text_tarray metadata;
-    metadata.push_back ("Title");
+    text_tset metadata;
+    metadata.insert ("Title");
     bool getParents = false;
     get_children (top, collection, metadata, getParents, collectproto, response, logout);
-    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();
     while (dochere != docend) {
-      if ((*dochere).metadata[0].values[0] == arg_gp) {
+      if ((*dochere).metadata["Title"].values[0] == arg_gp) {
     arg_d = (*dochere).OID;
     break;
@@ -1099 +1146 @@
   if ((!collection.empty()) && (collectproto != NULL)) {
     FilterResponse_t response;
-    text_tarray metadata;
-    //    metadata.push_back (".collectionimage");
-    
+    text_tset metadata;
     get_info ("collection", collection, metadata, false, 
           collectproto, response, logout);
 
     if (!response.docInfo[0].metadata.empty()) {
-      MetadataInfo_tarray::const_iterator here = response.docInfo[0].metadata.begin();
-      MetadataInfo_tarray::const_iterator end = response.docInfo[0].metadata.end();
+      MetadataInfo_tmap::const_iterator here = response.docInfo[0].metadata.begin();
+      MetadataInfo_tmap::const_iterator end = response.docInfo[0].metadata.end();
       while (here != end) {
-    if (((*here).name != "haschildren") && ((*here).name != "hasnext") &&
-        ((*here).name != "hasprevious")) {
-      disp.setmacro ((*here).name, "Global", (*here).values[0]);
+    if (((*here).first != "haschildren") && ((*here).first != "hasnext") &&
+        ((*here).first != "hasprevious")) {
+      disp.setmacro ((*here).first, "Global", (*here).second.values[0]);
     }
     here ++;

trunk/gsdl/src/recpt/receptionist.h

@@ -35 +35 @@
 #include "display.h"
 #include "action.h"
+#include "browserclass.h"
 #include "recptproto.h"
 #include "converter.h"
@@ -75 +76 @@
   cgiargsinfoclass argsinfo;
   actionmapclass actions;
+  browsermapclass browsers;
   recptprotolistclass protocols;
   displayclass disp;
@@ -85 +87 @@
                  outconvertclass &outconvert, ostream &logout);
   
-  virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto, ostream &logout);
+  virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto,
+                   ostream &logout);
 
   bool get_cookie (text_t &cookie);
@@ -106 +109 @@
   void add_action (action *theaction);
   actionmapclass *get_actionmap_ptr () {return &actions;}
+
+  // add_browser makes another browser available to the receptionist
+  // the browser remains the property of the calling code and that
+  // code should destroy it after the recptionist has been
+  // destroyed.
+  void add_browser (browserclass *thebrowser);
+  browsermapclass *get_browsermap_ptr () {return &browsers;}
+  void setdefaultbrowser (const text_t &browsername);
 
   // add_protocol makes another protocol available to the receptionist