Changeset 257 for trunk/gsdl/src/recpt

Timestamp:

1999-05-10T15:40:44+12:00 (25 years ago)

Author:

sjboddie

Message:

lots of changes - slowly getting document action sorted out

Location:

trunk/gsdl/src/recpt

Files:

• Makefile (modified) (2 diffs)
• OIDtools.cpp (modified) (8 diffs)
• OIDtools.h (modified) (5 diffs)
• browsetools.cpp (modified) (13 diffs)
• browsetools.h (modified) (1 diff)
• comtypes.cpp (modified) (2 diffs)
• comtypes.h (modified) (1 diff)
• documentaction.cpp (modified) (12 diffs)
• librarymain.cpp (modified) (2 diffs)
• nullproto.cpp (modified) (2 diffs)
• nullproto.h (modified) (1 diff)
• recptproto.cpp (modified) (2 diffs)
• recptproto.h (modified) (1 diff)

trunk/gsdl/src/recpt/Makefile

@@ -599 +599 @@
  /usr/include/g++/map.h /usr/include/gdbm.h \
  ../../packages/mg-1.3d/lib/unitool.h ../../lib/gsdlunicode.h \
- ../../lib/fileutil.h
+ ../../lib/fileutil.h OIDtools.h recptproto.h comtypes.h
 mgq.o: mgq.c mgq.h /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/libio.h \
@@ -743 +743 @@
  /usr/include/g++/projectn.h /usr/include/g++/map \
  /usr/include/g++/map.h comtypes.h filter.h source.h infodbclass.h \
- /usr/include/gdbm.h /usr/include/assert.h
+ /usr/include/gdbm.h OIDtools.h recptproto.h /usr/include/assert.h
 colservrconfig.o: colservrconfig.cpp colservrconfig.h \
  ../../lib/gsdlconf.h ../../lib/site.h ../../lib/text_t.h \

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/05/10 03:40:25  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.5  1999/04/30 01:59:37  sjboddie
    lots of stuff - getting documentaction working (documentaction replaces
@@ -38 +41 @@
 
 
-// get first four characters of whatever string is passed in 
-// OID. This returns the CLSU, HASH etc.
-void get_head (const text_t &OID, text_t &head) {
-
-  head.clear();
-  if (OID.size() < 4) return;
-  head.appendrange (OID.begin(), (OID.begin() + 4));
-}
-
-
 // returns (in top) the top level of OID (i.e. everything
 // up until the first dot)
@@ -76 +69 @@
 
 
-// is_classification checks OID to see if it's a classification
-// or a document. I'm not sure how to do this - for now I'll just assume 
-// all documents start with HASH and classifications start with something
-// else.
-bool is_classification (const text_t &OID) {
-  text_t head;
-  get_head (OID, head);
-  if (head == "HASH") return false;
-  return true;
-}
-
 // get_parents_array loads the parents array with all the parents of the
-// document or classification specified by OID
-// note that this function doesn't clear the parents array
+// document or classification specified by OID 
 void get_parents_array (const text_t &OID, text_tarray &parents) {
+
+  parents.erase (parents.begin(), parents.end());
 
   text_t::const_iterator here = OID.begin ();
@@ -134 +117 @@
 }
 
+// has_children returns true if OID has children
+bool has_children (const text_t &OID, const text_t &collection, 
+           recptproto *collectproto, ostream &logout) {
+
+  FilterResponse_t response;
+  text_tarray metadata;
+  metadata.push_back ("haschildren");
+
+  if (get_info (OID, collection, metadata, collectproto,
+        response, logout)) {
+    if (response.docInfo[0].metadata[0].values[0] == "1")
+      return true;
+  }
+  return false;
+}
+
+
 // 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
@@ -168 +168 @@
 }
 
-// get_first_child does a protocol call and returns (in child) the OID
-// of the first child of OID if it exists
-bool get_first_child (const text_t &OID, text_t &child, const text_t &collection, 
-              recptproto *collectproto, ostream logout) {
-
-  comerror_t err;
-  FilterResponse_t response;
-  FilterRequest_t request;
-  OptionValue_t option;
-
-  request.filterName = "BrowseFilter";
-  option.name = "EndResults";
-  option.value = "1";
-  request.filterOptions.push_back (option);
-  option.name = "ParentNode";
-  option.value = OID;
-  request.filterOptions.push_back (option);
-  request.filterResultOptions = FROID;
-  
-  collectproto->filter (collection, request, response, err, logout);
-  
-  if (err != noError) {
-    outconvertclass text_t2ascii;
-    logout << text_t2ascii
-       << "Error: call to filter failed for " << OID 
-       << " in OIDtools::get_first_child (" 
-       << get_comerror_string (err) << ")\n";
-    return false;
-  } 
-    
-  if (response.docInfo[0].OID.empty())
-    return false;
-  else
-    child = response.docInfo[0].OID;
-  return true;
-}
-
 // get_parent returns the parent of the document or classification
 // specified by OID
@@ -222 +185 @@
 }
 
-// takes an OID like ".2.3 and replaces the " with parent
+// takes an OID like ".2 and replaces the " with parent
 void translate_parent (text_t &OID, const text_t &parent) {
 
@@ -240 +203 @@
 void shrink_parent (text_t &OID) {
   
-  text_t::iterator parit = findchar (OID.begin(), OID.end(), '.');
-  if (parit == OID.end()) return;
-
-  OID.erase (OID.begin(), parit);
-  OID = "\"" + OID;
+  text_tarray tmp;
+  splitchar (OID.begin(), OID.end(), '.', tmp);
+  OID = "\"." + tmp.back();
 }
 
@@ -260 +221 @@
   return false;
 }
+
+
+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 haschildren = section.metadata[1].values[0].getint();
+  const text_t &doctype = section.metadata[2].values[0];
+  int cols;
+
+  if ((haschildren == 1) && ((!classify) || (doctype == "classify"))) {
+    text_t parent = response.docInfo.back().OID;
+    int parentcols = countchar (parent.begin(), parent.end(), '.');
+    FilterResponse_t tmp;
+    get_children (section.OID, collection, metadata, collectproto, tmp, logout);
+    ResultDocInfo_tarray::const_iterator thisdoc = tmp.docInfo.begin();
+    ResultDocInfo_tarray::const_iterator lastdoc = tmp.docInfo.end();
+    while (thisdoc != lastdoc) {
+      if (((*thisdoc).metadata[2].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);
+      thisdoc ++;
+    }
+  }
+}
+
+// get_contents returns OIDs and metadata of all contents 
+// below (and including) OID.
+// metadata being returned for each is Title, haschildren, 
+// doctype, and hastxt
+void get_contents (const text_t &topOID, const text_t &classifytype, int &totalcols,
+           const text_t &collection, recptproto *collectproto, 
+           FilterResponse_t &response, ostream &logout) {
+
+  bool classify = false;
+  response.clear();
+  text_tarray metadata;
+  metadata.push_back ("Title");
+  metadata.push_back ("haschildren");
+  metadata.push_back ("doctype");
+  metadata.push_back ("hastxt");
+
+  // 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(), '.');
+
+  // get topOIDs info
+  if (get_info (topOID, collection, metadata, collectproto, response, logout))
+      recurse_contents (response.docInfo[0], classify, totalcols, collection, 
+            metadata, collectproto, response, logout);
+}

trunk/gsdl/src/recpt/OIDtools.h

@@ -17 +17 @@
 #include "recptproto.h"
 
-// get first four characters of whatever string is passed in 
-// OID. This returns the CLSU, HASH etc.
-void get_head (const text_t &OID, text_t &head);
-
 // returns (in top) the top level of OID (i.e. everything
 // up until the first dot)
@@ -27 +23 @@
 // checks if OID is top level (i.e. contains no dots)
 bool is_top (const text_t &OID);
-
-// is_classification checks OID to see if it's a classification
-// or a document. I'm not sure how to do this - for now I'll just assume 
-// all documents start with HASH and classifications start with something
-// else.
-bool is_classification (const text_t &OID);
 
 // get_parents_array loads the parents array with all the parents of the
@@ -46 +36 @@
            FilterResponse_t &response, ostream &logout);
 
+// has_children returns true if OID has children
+bool has_children (const text_t &OID, const text_t &collection, 
+           recptproto *collectproto, ostream &logout);
+
 // 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
@@ -52 +46 @@
            const text_tarray &metadata, recptproto *collectproto, 
            FilterResponse_t &response, ostream &logout);
-
-// get_first_child does a protocol call and returns (in child) the OID
-// of the first child of OID if it exists
-bool get_first_child (const text_t &OID, text_t &child, const text_t &collection, 
-              recptproto *collectproto, ostream logout);
 
 // get_parent returns the parent of the document or classification
@@ -73 +62 @@
 bool needs_translating (const text_t &OID);
 
+// get_contents returns OIDs and metadata of all contents 
+// below (and including) OID.
+// at present the only metadata being returned for each is
+// Title and haschildren
+void get_contents (const text_t &topOID, const text_t &classifytype, int &totalcols,
+           const text_t &collection, recptproto *collectproto, 
+           FilterResponse_t &response, ostream &logout);
+
 #endif

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/05/10 03:40:26  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.3  1999/04/30 01:59:39  sjboddie
    lots of stuff - getting documentaction working (documentaction replaces
@@ -32 +35 @@
 // ouput_book_toc generates and outputs a Book type table of contents
 // it should only be called for document level tocs (i.e. when "d"
-// argument is set) so it soes nothing if "d" isn't set
+// argument is set) so it does nothing if "d" isn't set
 // This toc is intended for use with collections whose documents are 
 // simply numbered as pages.
@@ -71 +74 @@
         << "<p><center>\n"
         << "<table cellpadding=0 cellspacing=0 width=_pagewidth_>\n"
-        << "<tr valign=absmiddle>\n";
+        << "<tr valign=top><td>\n";
 
     // don't want arrows and page number if text expanded
@@ -77 +80 @@
     
       // previous arrow
-      textout << outconvert << disp << "<td>_document:prevarrow_</td>\n";
+      textout << "<table><tr valign=top>\n";
+      textout << outconvert << disp << "<td align=left>_document:prevarrow_</td>\n";
     
       // page ? of ? text
@@ -100 +104 @@
   
       // next arrow
-      textout << outconvert << disp << "</td>\n<td>_document:nextarrow_</td>\n";
-    }
-    
+      textout << outconvert << disp << "</td>\n<td align=right>_document:nextarrow_</td>\n</table>\n";
+    }
+
+
+    // goto line
+    textout << outconvert << disp << "_document:gotoform_";
+
+    // control buttons
+    output_controls (args, collectproto, disp, outconvert, textout, logout);
+    textout << "</td>\n";
+
+    // title and author
     textout << outconvert << "\n<td valign=top align=right>\n<h2>" << title << "</h2>\n";
     
@@ -108 +121 @@
       textout << outconvert << "<h4><i>" << author << "</i></h4>\n";
 
-    textout << "</td></tr>\n";
-
-    // goto line
-    textout << outconvert << disp << "<tr><td colspan=4>_document:gotoform_</td></tr></table>";
+    textout << "</td></tr></table>\n";
     textout << "\n<!-- end of Table of Contents -->\n";
-  }
-}
-
+
+
+  }
+}
+
+// output_hierarchy_toc generates and outputs a Hierarchy type table of contents
+// this can be used either at top levels (i.e. when "d" argument isn't set) or
+// at document level
+// a Hierarchy table of contents may be either expanded or contracted
 void output_hierarchy_toc (const text_t &/*classifytitle*/, cgiargsclass &args, 
-               recptproto *collectproto, displayclass &/*disp*/, 
-               outconvertclass &/*outconvert*/, ostream &/*textout*/, 
-               ostream &/*logout*/) {
-  /*
-  toc.clear();
-  toc += "\n<!-- Table of Contents produced by browsetools::get_hierarchy_toc -->\n\n";
-  
-  toc += "<p><table width=100% cellpadding=0 cellspacing=0 border=0><tr>\n";
-  toc += "<td valign=top>\n";
+               recptproto *collectproto, displayclass &disp, 
+               outconvertclass &outconvert, ostream &textout, 
+               ostream &logout) {
+
+  textout << "\n<!-- Table of Contents produced by browsetools::get_hierarchy_toc -->\n\n";
+  textout << "<p><table width=100% cellpadding=0 cellspacing=0 border=0><tr>\n";
+
+  // get the cover image (if there is one) and the control buttons
+  if (!args["d"].empty()) {
+    textout << "<td valign=top width=200>\n";
+    output_cover_image (args, collectproto, disp, outconvert, textout, logout);
+    output_controls (args, collectproto, disp, outconvert, textout, logout);
+    textout << "</td>\n";
+  }
   
   // get table of contents
+  textout << "<td valign=top>\n";
   if (args.getintarg("gc"))
-    get_expanded_toc(args, collectproto, toc, logout);
+    output_expanded_hierarchy_toc(args, collectproto, disp, outconvert, textout, logout);
   else
-    get_contracted_toc(args, collectproto, toc, logout);
-  
-  toc += "</td></tr></table>\n";
-  toc += "\n<!-- end of Table of Contents -->\n";
-  */
-}
-
+    output_contracted_hierarchy_toc(args, collectproto, disp, outconvert, textout, logout);
+  
+  textout << "</td></tr></table>\n";
+  textout << "\n<!-- end of Table of Contents -->\n";
+}
+
+// at the moment this just sets a _thisOID_ macro to archivedir
+// and writes out the html to display the cover image
+// 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
+void output_cover_image (cgiargsclass &args, recptproto *collectproto, 
+             displayclass &disp, outconvertclass &outconvert, 
+             ostream &textout, ostream &logout) {
+
+  if (args["d"].empty()) return;
+  
+  FilterResponse_t response;
+  text_tarray metadata;
+  metadata.push_back ("archivedir");
+
+  text_t top;
+  get_top (args["d"], top);
+  if (get_info (top, args["c"], metadata, collectproto,
+        response, logout)) {
+
+    text_t &archivedir = response.docInfo[0].metadata[0].values[0];
+    disp.setmacro ("thisOID", "Global", archivedir);
+
+    textout << outconvert << disp << 
+      "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
+  }
+}
+
+// output_controls displays the detach, expand/contract contents,
+// expand/contract text and highlighting/no highlighting buttons
+// and the warning if expanded text is going to be large
+void output_controls (cgiargsclass &args, recptproto *collectproto, 
+              displayclass &disp, outconvertclass &outconvert, 
+              ostream &textout, ostream &logout) {
+
+  if (args["u"] != "1") {
+  
+    FilterResponse_t response;
+    text_tarray metadata;
+    text_t top;
+    get_top (args["d"], top);
+
+    text_tarray buttons;
+    
+    // detach button
+    buttons.push_back ("_imagedetach_");
+
+    // highlighting button
+    if (args["hl"] == "1") 
+      buttons.push_back ("_imagenohighlight_");
+    else 
+      buttons.push_back ("_imagehighlight_");
+
+    // expand/contract contents button - only have this if it's
+    // a Hierarchy type toc
+    metadata.push_back ("classifytype");
+    if (get_info (top, args["c"], metadata, collectproto,
+          response, logout)) {
+      if (response.docInfo[0].metadata[0].values[0] == "Hierarchy") 
+    if (args["gc"] == "1")
+      buttons.push_back ("_imagecontracttoc_");
+    else 
+      buttons.push_back ("_imageexpandtoc_");
+    }
+    
+    // expand/contract text button
+    if (args.getintarg("gt"))
+      buttons.push_back ("_imagecontracttext_");
+    else 
+      buttons.push_back ("_imageexpandtext_");
+
+    text_tarray::const_iterator here = buttons.begin();
+    text_tarray::const_iterator end = buttons.end();
+    int count = 0;
+    while (here != end) {
+      if ((count != 0) && ((count % 3) == 0)) textout << "<br>\n";
+      textout << outconvert << disp << *here;
+      count ++;
+      here ++;
+    }
+  }
+}
 
 
@@ -146 +249 @@
 }
 
-// ouput_list_toc generates and outputs a List type table of contents
+// ouput_azlist_toc generates and outputs an AZList type table of contents
 // it should only be called for classifications (i.e. when the "d"
 // argument isn't set) as it doesn't make sense to display document
 // level stuff in this way (I think !!)
-void output_list_toc (const text_t &classifytitle, cgiargsclass &args, 
-              recptproto *collectproto, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &logout) {
+void output_azlist_toc (const text_t &classifytitle, cgiargsclass &args, 
+            recptproto *collectproto, displayclass &disp, 
+            outconvertclass &outconvert, ostream &textout, 
+            ostream &logout) {
 
   text_tarray metadata;
@@ -200 +303 @@
 }
 
-
-void get_contracted_toc (cgiargsclass &args, recptproto */*collectproto*/,
-             text_t &return_text, ostream &/*logout*/) {
-  /*
+void output_contracted_hierarchy_toc (cgiargsclass &args, recptproto *collectproto,
+                      displayclass &disp, outconvertclass &outconvert,
+                      ostream &textout, ostream &logout) {
+
   int colnum, tabcount = 0;
-  text_tarray parents, siblings;
-  
-  // load up the parents array
-  // don't want classifications unless at top level contents
-  if (!(args["cl"]).empty() && is_top(args["d"]))
-    get_parents_array (args["cl"] + ".", parents); 
-  get_parents_array (args["d"], parents);
-
-  // load up siblings array
-  if ((args["d"]).empty()) get_children_array (get_parent(args["cl"]), siblings);
-  else if (is_top (args["d"])) get_children_array (args["cl"], siblings);
-  else get_children_array (get_parent(args["d"]), siblings);
-
-  return_text += "<table>\n";
+  text_tarray parents, metadata;
+  FilterResponse_t siblings;
+  FilterResponse_t response;
+
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
+
+  metadata.push_back ("doctype");
+  metadata.push_back ("Title");
+  metadata.push_back ("hastxt");
+  metadata.push_back ("haschildren");
+
+  // load up parent and sibling arrays
+  if (arg_d.empty()) {
+    if (has_children (arg_cl, args["c"], collectproto, logout)) {
+      get_parents_array (arg_cl + ".fc", parents);
+      if (!get_children (arg_cl, args["c"], metadata, 
+             collectproto, siblings, logout))
+    return;
+    } else {
+      get_parents_array (arg_cl, parents);
+      if (!get_children (arg_cl + ".pr", args["c"], metadata, 
+             collectproto, siblings, logout))
+    return;
+    }
+    // don't want top parent of classification to be displayed
+    if (!parents.empty()) parents.erase (parents.begin());
+  } else {
+    if (has_children (arg_d, args["c"], collectproto, logout)) {
+      get_parents_array (arg_d + ".fc", parents);
+      if (!get_children (arg_d, args["c"], metadata, 
+             collectproto, siblings, logout))
+    return;
+    } else {
+      get_parents_array (arg_d, parents);
+      if (!get_children (arg_d + ".pr", args["c"], metadata, 
+             collectproto, siblings, logout))
+    return;
+    }
+  }
+
+  textout << "<table>\n";
   colnum = parents.size() + 1;
 
   // sort out toc of sections parents
-  if (parents.size() > 0) 
-    get_parents_toc(args, parents, tabcount, colnum, return_text);
+  if (!parents.empty()) 
+    output_parents_toc(args, parents, tabcount, colnum, disp, collectproto,
+               outconvert, textout, logout);
   
   // sort out toc of sections siblings
-  if (siblings.size() > 0) 
-    get_siblings_toc (args, siblings, tabcount, colnum, return_text);
+  if (!siblings.docInfo.empty()) 
+    output_siblings_toc (args, siblings, tabcount, colnum, disp,
+             outconvert, textout, logout);
               
-  return_text += "</table>\n";
-  */
-}
-
-
-void get_expanded_toc (cgiargsclass &/*args*/, recptproto */*collectproto*/,
-               text_t &/*return_text*/, ostream &/*logout*/) {
-
-  /*
-  text_t doclink, icon, pointer, tab, pagetype;
-  int totalcols, tabcols, tabsleft;
-  text_tarray contents;
-  
-  // get array of all contents to be included (all contents of entire book)
-  text_t book_top;
-  get_book_top (booksection, book_top);
-  get_contents (book_top, gdbm, contents, totalcols);
-  
-  vector<text_t>::const_iterator section = contents.begin();
-  vector<text_t>::const_iterator end = contents.end();
+  textout << "</table>\n";
+}
+
+
+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, totalcols, lasttabcols;
+
+  int gt = args.getintarg("gt");
+  text_t doclink = "<a href=\"_httpdocument_&cl=";
+
+  if (args["d"].empty()) {
+    if (args["cl"].empty()) return;
+    OID = args["cl"];
+    topOID = OID; // don't always want to expand from top if expanding classifications
+    classifytype = "classify";
+  } else {
+    OID = args["d"];
+    get_top (args["d"], topOID);
+    classifytype = "Document";
+  }
+
+  textout << "<table>\n";
+
+  // Get OIDs and metadata of all topOIDs contents (and topOID itself)
+  get_contents (topOID, classifytype, 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 (section != end) {
-    tab.clear();
-    gdbm.getinfo(*section, info);
-    text_t icontabs;
+  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 = "_iconsmalltext_";
-    if (is_top_level(*section)) icon = "_iconopenbook_";
-    else if (!info.contents.empty()) icon = "_iconopenfolder_";
-
+    if (is_top((*thissection).OID))
+      if (classifytype == "Document") icon = "_iconopenbook_";
+      else 
+    if (doctype == "classify") icon = "_iconopenbookshelf_";
+    else icon = "_iconclosedbook_";
+    else if (haschildren) 
+      if (classifytype == "Document") icon = "_iconopenfolder_";
+      else icon = "_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 += "_icontab_";
+    
     // set up pointer
-    if (*section == booksection) pointer = "_iconpointer_";
-    else pointer = "_icontab_";
-
-    // set up tabbing
-    tabcols = count_dots(*section);
-    for (int i = 0; i < (tabcols - 1); i++) {
-      icontabs += "_icontab_";
-    }
-    //char *tabcolsstr;
-    //itoa(tabcols, tabcolsstr, 10);
-    tab = "<td valign=top colspan=" + text_t(tabcols);
-    tab += ">" + icontabs + pointer + "</td>";
-    tabsleft = totalcols - tabcols;
-    
-    // set up url
-    if (is_book(*section) && !is_top_level(*section))   
-      doclink = "<a href=\"_httptext_";
-    else doclink = "<a href=\"_httpbrowse_";
-    if (args["x"] == "1") doclink += "&x=1";
-    
-    return_text += "<tr>" + tab + "<td valign=top>";
-    if (is_top_level(*section) && args["x"] == "1") {
-      return_text += "<a href=\"\" onClick = \"close_detach()";
-    } else {
-      if (args["g"][1] == '0' || is_top_level(*section) ||
-      !are_same_chapter(booksection, *section) ||
-      !info.contents.empty()) {
-    return_text += doclink + "d=" + classification;
-    return_text += "." + *section + "&a=" + pagetype;
+    if (classifytype == "Document" && !gt) {
+      if ((*thissection).OID == OID) pointer = "_iconpointer_";
+      else pointer = "_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 << "<a href=\"\" onClick = \"close_detach()";
+    else {
+      if (!gt) {
+    const text_t &thisOID = (*thissection).OID;
+    text_t link;
+    if (is_top (thisOID))
+      if (classifytype == "classify")
+        link = args["cl"] + "&d=" + thisOID;
+      else
+        link = args["cl"];
+    else
+      if (haschildren)
+        if (classifytype == "classify")
+          link = thisOID + ".pr";
+        else
+          link = args["cl"] + "&d=" + thisOID + ".pr";
+      else
+        if (classifytype == "classify")
+          link = thisOID;
+        else
+          link = args["cl"] + "&d=" + thisOID;
+    
+    textout << outconvert << disp << doclink << link;
       } else {
-    return_text += "<a href=\"#";
-    return_text += count;
+    textout << "<a href=\"#" << count;
     count ++;
       }
     }
-    return_text += "\">" + icon + "</a></td>";
-    return_text += "<td colspan=" + text_t(tabsleft);
-    return_text += ">" + info.title;
-    return_text += "</td></tr>\n";
-    
-    section ++;
-  }
-  return_text += "</table>\n";
-  return_text += "</td></tr></table>\n";
-  */
-}
-
-
-void get_parents_toc (cgiargsclass &args, const text_tarray &parents,
-              int &tabcount, int &colnum, text_t &return_text) {  
-
-  text_t section, tab, icon, doclink;
-
-  doclink = "<a href=\"_httpbrowse_";
-  if (args["x"] == "1") doclink += "&x=1";
+    
+    textout << outconvert << disp << "\">" << icon << "</a></td><td";
+    if (colsremaining > 1) textout << " colspan=" << colsremaining;
+    textout << outconvert << disp << ">" << title << "</td></tr>\n";
+
+    thissection ++;
+  }
+  textout << "</table>\n";
+}
+
+
+void output_parents_toc (cgiargsclass &args, const text_tarray &parents,
+             int &tabcount, int &colnum, displayclass &disp,
+             recptproto *collectproto, outconvertclass &outconvert,
+             ostream &textout, ostream &logout) {  
+
+  text_t tab, icon;
+  text_tarray metadata;
+  FilterResponse_t response;
+  text_t doclink = "<a href=\"_httpdocument_";
+
+  metadata.push_back ("doctype");
+  metadata.push_back ("Title");
 
   text_tarray::const_iterator thisparent = parents.begin();
@@ -322 +509 @@
 
   while (thisparent != end) {
-    text_t icontabs;
-    section.clear();
-    tab.clear();
-    
-    // set up icon for this parent
-    icon = "_iconopenfolder_";
-    if (is_classification(*thisparent)) icon = "_iconopenbookshelf_";
-    else if (is_top(*thisparent)) icon = "_iconopenbook_";
-    
-    for (int j = 0; j < tabcount; j++)
-      icontabs += "_icontab_";
-     
-    if (!icontabs.empty()) {
-      tab = "<td valign=top";
-      if (tabcount > 1) tab += " colspan=" + text_t(tabcount);
-      tab += ">" + icontabs + "</td>";
-    }
-    tabcount ++;
-    
-    if (is_top(*thisparent) && args["x"] == "1") {
-      return_text += "<tr>" + tab + "<td valign=top><a href=\"\" ";
-      return_text += "onClick = \"close_detach()\">" + icon + "</a></td>";
-    } else {
-      if (is_classification (*thisparent))
-    return_text += "<tr>" + tab + "<td valign=top>" + doclink + "&cl=" + *thisparent;
-      else
-    // this may not need cl= bit once compressed args is done
-    return_text += "<tr>" + tab + "<td valign=top>" + doclink + "&cl=" + args["cl"] + "&d=" + *thisparent;
-      return_text += "\">" + icon + "</a></td>";
-    }
-    return_text += "<td"; 
-    if (colnum > 1) return_text += " colspan=" + text_t(colnum);
-    return_text += ">" + *thisparent + " title ";
-    return_text += " by " + *thisparent + " author ";
-    return_text += "</td></tr>\n";
-    colnum --;
+    if (get_info (*thisparent, args["c"], metadata, collectproto,
+          response, logout)) {
+      text_t &doctype = response.docInfo[0].metadata[0].values[0];
+      text_t &title = response.docInfo[0].metadata[1].values[0];
+
+      text_t icontabs, pointer;
+      tab.clear();
+      
+      // set up icon for this parent
+      icon = "_iconopenfolder_";
+      if (doctype == "classify") icon = "_iconopenbookshelf_";
+      else if (is_top(*thisparent)) icon = "_iconopenbook_";
+
+      for (int j = 0; j < tabcount; j++)
+    icontabs += "_icontab_";
+
+      if (doctype != "classify") {
+    if (*thisparent == args["d"]) {
+      icontabs += "_iconpointer_";
+      if (is_top (*thisparent))
+        tabcount ++;
+      else 
+        icontabs.erase (icontabs.begin(), icontabs.begin()+9);
+    }
+      }
+      
+      if (!icontabs.empty()) {
+    tab = "<td valign=top";
+    if (tabcount > 1) tab += " colspan=" + text_t(tabcount);
+    tab += ">" + icontabs + "</td>";
+      }
+      tabcount ++;
+      
+      if (is_top(*thisparent) && args["x"] == "1") {
+    textout << outconvert << disp << "<tr>" << tab << "<td valign=top><a href=\"\" "
+        << "onClick = \"close_detach()\">" << icon << "</a></td>";
+      } else {
+    text_t link;
+    if (doctype == "classify") link = "&cl=" + *thisparent + ".pr";
+    else 
+      if (is_top (*thisparent)) link = "&cl=" + args["cl"];
+      else link = "&cl=" + args["cl"] + "&d=" + *thisparent + ".pr";
+
+    textout << outconvert << disp << "<tr>" << tab << "<td valign=top>" 
+        << doclink << link << "\">" << icon << "</a></td>";
+      }
+      textout << "<td"; 
+      if (colnum > 1) textout << outconvert << " colspan=" << text_t(colnum);
+      textout << outconvert << disp << ">" << title << "</td></tr>\n";
+      colnum --;
+    }
     thisparent ++;
   }
 }
 
-
-void get_siblings_toc (cgiargsclass &args, const text_tarray &siblings, 
-               int &tabcount, int &colnum, text_t &return_text) {
-  /*  
+void output_siblings_toc (cgiargsclass &args, const FilterResponse_t &siblings, 
+              int &tabcount, int &colnum, displayclass &disp, 
+              outconvertclass &outconvert, ostream &textout, 
+              ostream &/*logout*/) {
+
   text_t tab, icon, pointer, child, doclink;
   int count = 1;
 
-  doclink = "<a href=\"_httpbrowse_";
-  if (args["x"] == "1") doclink += "&x=1";
-  
-  text_tarray::const_iterator thissibling = siblings.begin();
-  text_tarray::const_iterator sibend = siblings.end();
+  doclink = "<a href=\"_httpdocument_";
+  
+  ResultDocInfo_tarray::const_iterator thissibling = siblings.docInfo.begin();
+  ResultDocInfo_tarray::const_iterator sibend = siblings.docInfo.end();
   
   while (thissibling != sibend) {
+
+    const text_t &doctype = (*thissibling).metadata[0].values[0];
+    const text_t &title = (*thissibling).metadata[1].values[0];
+    int hastxt = (*thissibling).metadata[2].values[0].getint(); 
+    int haschildren = (*thissibling).metadata[3].values[0].getint();
+    int gt = args.getintarg("gt");
 
     // set up icon for this sibling
     icon = "_iconclosedfolder_";
-    if (is_classification(*thissibling)) icon = "_iconclosedbookshelf_";
-    else if (is_top(*thissibling)) icon = "_iconclosedbook_";
+    if (doctype == "classify") icon = "_iconclosedbookshelf_";
+    else if (is_top((*thissibling).OID)) icon = "_iconclosedbook_";
     
     // fit pointer into tabbing if current section
+    // note that we don't want pointers at classification levels anymore
+    // (unless the classification contains text)
     pointer = "_icontab_";
-    if (is_classification(*thissibling)) {
-      if (*thissibling == args["cl"])
+    if (doctype == "classify") {
+      if ((*thissibling).OID == args["cl"] && hastxt)
     pointer = "_iconpointer_";
-    } else if (*thissibling == args["d"]) pointer = "_iconpointer_";
+    } else if ((*thissibling).OID == args["d"]) pointer = "_iconpointer_";
     
     text_t thesetabs;
@@ -397 +607 @@
     tab += ">" + thesetabs + pointer + "</td>";
     
-    if (contains_text(*thissibling)) {
+    if (!haschildren) {
       // sibling is text document
       icon = "_iconsmalltext_";
-      
-      return_text += "<tr>" + tab + "<td valign=top>";
-      if (args["g"][1] == '0') {
-    return_text += doclink + "&d=" + *thissibling;
+      text_t link;
+      if (doctype == "classify") link = "&cl=" + (*thissibling).OID;
+      else link = "&cl=" + args["cl"] + "&d=" + (*thissibling).OID;
+
+      textout << outconvert << disp << "<tr>" << tab << "<td valign=top>";
+      if (!gt) {
+    textout << outconvert << disp << doclink << link;
       } else {
-    return_text += "<a href=\"#";
-    return_text += count;
+    textout << "<a href=\"#" << count;
     count ++;
       }
-      return_text += "\">" + icon + "</a></td><td";
-      if (colnum > 1) return_text += " colspan=" + text_t(colnum);
-      return_text += ">" + *thissibling + " title";
-      return_text += " by " + *thissibling + " author";
-      return_text += "</td></tr>\n";
+      textout << outconvert << disp << "\">" << icon << "</a></td><td";
+      if (colnum > 1) textout << " colspan=" << colnum;
+      textout << outconvert << disp << ">" << title << "</td></tr>\n";
+
     } else {
-      // sibling is closed book or folder so clicking 
-      // it should open contents
-      //      get_first_child(*thissibling, child);
-      
-      return_text += "<tr>" + tab + "<td valign=top>" + doclink + "&d=" + child;
-      return_text += "\">" + icon + "</a></td><td";
-      if (colnum > 1) return_text += " colspan=" + text_t(colnum);
-      return_text += ">" + *thissibling + " title";
-      return_text += " by " + *thissibling + " author";
-      return_text += "</td></tr>\n";
+      // sibling is closed book or folder
+      text_t link;
+      if (doctype == "classify") link = "&cl=" + (*thissibling).OID;
+      else link = "&cl=" + args["cl"] + "&d=" + (*thissibling).OID;
+
+      textout << outconvert << disp << "<tr>" << tab << "<td valign=top>" 
+          << doclink << link << "\">" << icon << "</a></td><td";
+      if (colnum > 1) textout << " colspan=" << colnum;
+      textout << outconvert << disp << ">" << title << "</td></tr>\n";
     }
     thissibling ++;
-  }  */
+  }
 }
 
@@ -442 +652 @@
   if (OID.empty()) return;
 
-  text_t haschildren, hasnext, hasprevious;
   text_tarray metadata;
   FilterResponse_t response;
@@ -452 +661 @@
   if (get_info (OID, collection, metadata, collectproto, response, logout)) {
 
-    haschildren = response.docInfo[0].metadata[0].values[0];
-    hasnext = response.docInfo[0].metadata[1].values[0];
-    hasprevious = response.docInfo[0].metadata[2].values[0];
+    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")) {
@@ -463 +672 @@
     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, collectproto, response, logout)) {
+      if (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
-    metadata.erase (metadata.begin()+1, metadata.end());
-    if (get_info (OID + ".p", collection, metadata, collectproto, response, logout)) {
+    if (get_info (OID + ".ps", collection, metadata, collectproto, response, logout)) {
       if (response.docInfo[0].metadata[0].values[0] == "1")
         disp.setmacro ("httpprevarrow", "document", 
-               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.pr.lc,_httpdocument_&cl=_cgiargcl_.pr.lc)");
+               "_If_(_cgiargd_,_httpdocument_&cl=_cgiargcl_&d=_cgiargd_.ps.lc,_httpdocument_&cl=_cgiargcl_.ps.lc)");
       else 
         disp.setmacro ("httpprevarrow", "document", 

trunk/gsdl/src/recpt/browsetools.h

@@ -38 +38 @@
               outconvertclass &outconvert, ostream &textout, 
               ostream &logout);
-void output_list_toc (const text_t &classifytitle, cgiargsclass &args,
-              recptproto *collectproto, displayclass &disp, 
-              outconvertclass &outconvert, ostream &textout, 
-              ostream &logout); 
-
-void get_contracted_toc (cgiargsclass &args, recptproto *collectproto,
-             text_t &return_text, ostream &logout);
-void get_expanded_toc (cgiargsclass &args, recptproto *collectproto,
-               text_t &return_text, ostream &logout);
-void get_parents_toc (cgiargsclass &args, const text_tarray &parents,
-              int &tabcount, int &colnum, text_t &return_text);
-void get_siblings_toc (cgiargsclass &args, const text_tarray &siblings, 
-               int &tabcount, int &colnum, text_t &return_text);
+void output_azlist_toc (const text_t &classifytitle, cgiargsclass &args,
+            recptproto *collectproto, displayclass &disp, 
+            outconvertclass &outconvert, ostream &textout, 
+            ostream &logout); 
+void output_contracted_hierarchy_toc (cgiargsclass &args, recptproto *collectproto,
+                      displayclass &disp, outconvertclass &outconvert,
+                      ostream &textout, ostream &logout);
+void output_expanded_hierarchy_toc (cgiargsclass &args, recptproto *collectproto,
+                    displayclass &disp, outconvertclass &outconvert,
+                    ostream &textout, ostream &logout);
+void output_parents_toc (cgiargsclass &args, const text_tarray &parents,
+             int &tabcount, int &colnum, displayclass &disp,
+             recptproto *collectproto, outconvertclass &outconvert,
+             ostream &textout, ostream &logout);
+void output_siblings_toc (cgiargsclass &args, const FilterResponse_t &siblings, 
+              int &tabcount, int &colnum, displayclass &disp, 
+              outconvertclass &outconvert, ostream &textout, ostream &logout);
 void set_arrow_macros (const text_t &OID, const text_t &classifytype,
                displayclass &disp, recptproto *collectproto, 
                const text_t &collection, ostream &logout);
+void output_controls (cgiargsclass &args, recptproto *collectproto, 
+              displayclass &disp, outconvertclass &outconvert, 
+              ostream &textout, ostream &logout);
+void output_cover_image (cgiargsclass &args, recptproto *collectproto, 
+             displayclass &disp, outconvertclass &outconvert, 
+             ostream &textout, ostream &logout);
+
+
 
 

trunk/gsdl/src/recpt/comtypes.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/05/10 03:40:33  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.7  1999/04/21 05:23:14  sjboddie
 
@@ -179 +182 @@
 }
 
+
+void DocumentRequest_t::clear () {
+  OID.clear();
+  docType.clear();
+  docFormat.clear();
+}
+
+void DocumentResponse_t::clear () {
+  doc.clear();
+}
+
+
+

trunk/gsdl/src/recpt/comtypes.h

@@ -285 +285 @@
 
 
+// DocumentRequest ::= SEQUENCE {
+//   OID       GeneralString,
+//   docType   GeneralString,
+//   docFormat GeneralString
+// }
+struct DocumentRequest_t {
+  void clear ();
+  DocumentRequest_t () {clear();}
+
+  text_t OID;
+  text_t docType;
+  text_t docFormat;
+};
+
+
+// DocumentResponse ::= SEQUENCE {
+//   doc OCTET STRING
+// }
+
+struct DocumentResponse_t {
+  void clear ();
+  DocumentResponse_t () {clear();}
+
+  text_t doc;
+};
+
 
 #endif

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/05/10 03:40:35  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.1  1999/04/30 01:59:40  sjboddie
    lots of stuff - getting documentaction working (documentaction replaces
@@ -34 +37 @@
 documentaction::documentaction () {
   // this action uses cgi variables "a", "d", "cl",
-  // "x", "gc", and "gt"
+  // "x", "gc", "gt", "gp", and "hl"
   cgiarginfo arg_ainfo;
   arg_ainfo.shortname = "a";
@@ -71 +74 @@
 
   // in this action "gt" controls the expand/contract
-  // text function
+  // text function 0 = not expanded, 1 = expand unless 
+  // there are more than 10 sections containing text,
+  // 2 = expand all
   arg_ainfo.shortname = "gt";
   arg_ainfo.longname = "expand text";
@@ -88 +93 @@
   arg_ainfo.argdefault = "";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // in this action "hl" is the "highlighting on/
+  // highlighting off control
+  arg_ainfo.shortname = "hl";
+  arg_ainfo.longname = "highlighting on/off";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "1";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
 
@@ -199 +214 @@
       
       metadata.push_back ("Title");
+      metadata.push_back ("classifytype");
       get_children ("", args["c"], metadata, collectproto, response, logout);
 
@@ -236 +252 @@
     dochere = response.docInfo.begin();
     while (dochere != docend) {
+      const text_t &title = (*dochere).metadata[0].values[0];
+      const text_t &classifytype = (*dochere).metadata[1].values[0];
+
       // if we're inside a document all the classification buttons should be enabled
       if (args["d"].empty() && ((*dochere).OID == topparent))
-        navigationbar += "_imagespacer__icontab" + (*dochere).metadata[0].values[0] + "green_";
+        navigationbar += "_imagespacer__icontab" + title + "green_";
       else {
-        navigationbar += "_imagespacer__image" + (*dochere).metadata[0].values[0] + "_";
+        navigationbar += "_imagespacer__image" + title + "_";
 
         // set the _httpbrowseXXX_ macro for this classification
-        disp.setmacro ("httpbrowse" + (*dochere).metadata[0].values[0],
-               "Global", "_httpdocument_&cl=" + (*dochere).OID + ".fc");
+        text_t link = (*dochere).OID;
+        if (classifytype == "AZList" || classifytype == "Datelist") link += ".fc";
+        disp.setmacro ("httpbrowse" + title, "Global", 
+               "_httpdocument_&cl=" + link);
       }
-      javaimagesnavbar += "_java" + (*dochere).metadata[0].values[0] + "_";
+      javaimagesnavbar += "_java" + title + "_";
       dochere ++;
     }
@@ -277 +298 @@
 
   // _httpprevarrow_        these are set if next or previous arrows
-  // _httpnextarrow_        are to be used - (i.e. if it's a List or a Datelist 
+  // _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 
@@ -283 +304 @@
   // _header_               the header macro is overridden if we're not at a top level 
   //                        classification to remove the title block
+
+  // _javaimagescontent_     this is the javascript code to shove in to make the 
+  //                         flashy buttons work
+
   
   text_tarray metadata;
@@ -292 +317 @@
   if (!args["d"].empty()) {
     // we're at document level
+    text_t javaimagescontent;
 
     // get metadata for top level of document
-    text_t doctop = args["d"]; 
-    text_t classifytype;
+    text_t doctop;
     get_top (args["d"], doctop);
     if (get_info (doctop, args["c"], metadata, collectproto, response, logout)) {
       disp.setmacro ("header", "document", "_textheader_");
-      classifytype = response.docInfo[0].metadata[1].values[0];
+      text_t &classifytype = response.docInfo[0].metadata[1].values[0];
       if (classifytype.empty()) classifytype = "Book"; // defaults to Book
       if ((classifytype == "Book") || (classifytype == "Hierarchy"))
     set_arrow_macros (args["d"], classifytype, disp, collectproto, args["c"], logout);
+
+      if (args["u"] != "1") {
+    javaimagescontent += "_javadetach_";
+    if (args["gt"] == "1") 
+      javaimagescontent += "_javacontracttext__javacontinue_";
+    else 
+      javaimagescontent += "_javaexpandtext_";
+    if (classifytype == "Hierarchy")
+      if (args["gc"] == "1")
+        javaimagescontent += "_javacontractcontents_";
+      else 
+        javaimagescontent += "_javaexpandcontents_";
+    if (args["hl"] != "1")
+      javaimagescontent += "_javahighlighting_";
+    else 
+      javaimagescontent += "_javanohighlighting_";
+    disp.setmacro ("javaimagescontent", "document", javaimagescontent);
+      }
     }
   } else {
@@ -308 +351 @@
     
       // get metadata for top level classification
-      text_t classtop = args["cl"];
+      text_t classtop;
       get_top (args["cl"], classtop);
       if (get_info (classtop, args["c"], metadata, collectproto, response, logout)) {
       
+    text_t &title = response.docInfo[0].metadata[0].values[0];
+    text_t &classifytype = response.docInfo[0].metadata[1].values[0];
+
     disp.setmacro ("imagethispage", "document", 
-               "_icon" + response.docInfo[0].metadata[0].values[0] + "page_");
+               "_icon" + title + "page_");
 
     // now get the metadata for each child of top level
@@ -319 +365 @@
     // (if they're required by the current classification type)
     
-    if ((response.docInfo[0].metadata[1].values[0] == "List") || 
-        (response.docInfo[0].metadata[1].values[0] == "Datelist")) {
+    if ((classifytype == "AZList") || (classifytype == "Datelist")) {
       
       text_t classificationlinks, navarrows;
@@ -378 +423 @@
   text_tarray metadata;
   FilterResponse_t response;
+  DocumentRequest_t docrequest;
+  DocumentResponse_t docresponse;
   text_t topparent, classifytype, classifytitle;
+  comerror_t err;
+
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
+  text_t &collection = args["c"];
+
+  text_t OID = arg_d;
+  if (arg_d.empty()) OID = arg_cl;
 
   textout << outconvert << disp << "_document:header_\n"
       << "_document:content_\n";
   
-  if (args["d"].empty() && args["cl"].empty())
-    textout << outconvert << "Document contains no data\n";
-  else {
-
-    if (!args["d"].empty()) get_top (args["d"], topparent);
-    else get_top (args["cl"], topparent);
-
-    // get the classifytitle and classifytype
-    metadata.push_back ("Title");
-    metadata.push_back ("classifytype");
-    if (get_info (topparent, args["c"], metadata, collectproto, response, logout)) {
-      classifytitle = response.docInfo[0].metadata[0].values[0];
-      classifytype = response.docInfo[0].metadata[1].values[0];
+  if (arg_d.empty() && arg_cl.empty()) {
+    textout << outconvert << "Document contains no data_document:footer_\n";
+    return true;
+  }
+
+  // get the classifytitle and classifytype
+  get_top (OID, topparent);
+  metadata.push_back ("Title");
+  metadata.push_back ("classifytype");
+  if (get_info (topparent, collection, metadata, collectproto, response, logout)) {
+    classifytitle = response.docInfo[0].metadata[0].values[0];
+    classifytype = response.docInfo[0].metadata[1].values[0];
+  }
+
+  if (!arg_d.empty()) {
+    
+    if (classifytype == "Hierarchy")
+      output_hierarchy_toc (classifytitle, args, collectproto, disp, 
+                outconvert, textout, logout);
+    else
+      // Book is the default for a document level toc - AZList and Datelist don't
+      // make sense for document level
+      output_book_toc (classifytitle, args, collectproto, disp,
+               outconvert, textout, logout);
+  } else {
+    
+    if (classifytype == "Hierarchy")
+      output_hierarchy_toc (classifytitle, args, collectproto, disp, 
+                outconvert, textout, logout);
+    else if (classifytype == "Datelist")
+      output_datelist_toc (classifytitle, args, collectproto, disp, 
+               outconvert, textout, logout);
+    else 
+      // AZList is the default for a classification level toc - Book doesn't make 
+      // sense for classification level
+      output_azlist_toc (classifytitle, args, collectproto, disp, 
+             outconvert, textout, logout);
+  }
+
+  // get info on this document
+  metadata.erase (metadata.begin(), metadata.end());
+  metadata.push_back("Title");
+  metadata.push_back("hastxt");
+  metadata.push_back("haschildren");
+
+  if (get_info (OID, collection, metadata, collectproto, response, logout)) {
+    text_t &title = response.docInfo[0].metadata[0].values[0];
+    int hastxt = response.docInfo[0].metadata[1].values[0].getint();
+    int haschildren = response.docInfo[0].metadata[2].values[0].getint();
+
+    int gt = args.getintarg("gt");
+    if (gt == 0) {
+      if (hastxt == 1) {
+    // get the text
+    docrequest.OID = OID;
+    collectproto->get_document (collection, docrequest, docresponse, err, logout);
+    
+    textout << outconvert << disp 
+        << "<p>\n<h3>" << title << "</h3>" << docresponse.doc;
+      }
+    } else {
+
+      // text is to be expanded
+      int tmp; // this doesn't get used here
+      if (!haschildren)
+    OID = get_parent (OID);
+
+      get_contents (OID, classifytype, tmp, collection, collectproto, response, logout);
+          
+      ResultDocInfo_tarray::const_iterator sechere = response.docInfo.begin();
+      ResultDocInfo_tarray::const_iterator secend = response.docInfo.end();
+          
+      if (gt == 1) {
+    // check if there are more than 10 sections containing text to be expanded - 
+    // if there are output warning message - this isn't a great way to do this
+    // since the sections may be very large or very small - one day I'll fix it 
+    // -- Stefan.
+    int seccount = 0;
+    while (sechere != secend) {
+      if ((*sechere).metadata[3].values[0] == "1") seccount ++;
+      if (seccount > 10) break;
+      sechere ++;
+    }
+    if (seccount > 10) textout << outconvert << disp << "_document:textltwarning_";
+    else gt = 2;
+      }
+
+      if (gt == 2) {
+    // get the text for each section
+    sechere = response.docInfo.begin();
+    int count = 0;
+    while (sechere != secend) {
+      textout << outconvert << disp << "\n<p><a name=" << count << "><h3>" 
+          << (*sechere).metadata[0].values[0] << "</h3></a>\n";
+      if ((*sechere).metadata[3].values[0] == "1") {
+        docrequest.OID = (*sechere).OID;
+        collectproto->get_document (collection, docrequest, docresponse, err, logout);
+        textout << outconvert << disp << docresponse.doc;
+      }
+      count ++;
+      sechere ++;
+    }
+      }
     }
-
-    if (!args["d"].empty()) {
-
-      if (classifytype == "Hierarchy")
-    output_hierarchy_toc (classifytitle, args, collectproto, disp, 
-                  outconvert, textout, logout);
-      else
-    // Book is the default for a document level toc - List and Datelist don't
-    // make sense for document level
-    output_book_toc (classifytitle, args, collectproto, disp,
-             outconvert, textout, logout);
-    } else {
-
-      if (classifytype == "Hierarchy")
-    output_hierarchy_toc (classifytitle, args, collectproto, disp, 
-                  outconvert, textout, logout);
-      else if (classifytype == "Datelist")
-    output_datelist_toc (classifytitle, args, collectproto, disp, 
-                 outconvert, textout, logout);
-      else 
-    // List is the default for a classification level toc - Book doesn't make 
-    // sense for classification level
-    output_list_toc (classifytitle, args, collectproto, disp, 
-             outconvert, textout, logout);
-    }
-
   }
   textout << outconvert << disp << "_document:footer_\n";

trunk/gsdl/src/recpt/librarymain.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/05/10 03:40:39  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.5  1999/04/19 23:56:10  rjmcnab
    Finished the gdbm metadata stuff
@@ -49 +52 @@
   
   // add a collection server for each collection ... (not implemented yet)
-  collectserver cserver;
-  gdbmclass gdbmhandler;
-  mgsearchclass mgsearch;
+  //  text_tarray collections;
+  //  collections.push_back ("gberg");
+  //  collections.push_back ("hdl");
 
-  // add a null filter
-  filterclass filter;
-  cserver.add_filter (&filter);
+  //  text_tarray::const_iterator thiscol = collections.begin();
+  //  text_tarray::const_iterator endcol = collections.end();
 
-  // add a browse filter
-  browsefilterclass browsefilter;
-  browsefilter.set_gdbmptr (&gdbmhandler);
-  cserver.add_filter (&browsefilter);
+  //  while (thiscol != endcol) {
 
-  // add a query filter
-  queryfilterclass queryfilter;
-  queryfilter.set_gdbmptr (&gdbmhandler);
-  queryfilter.set_mgsearchptr (&mgsearch);
-  cserver.add_filter (&queryfilter);
+    collectserver cserver;
+    gdbmclass gdbmhandler;
+    mgsearchclass mgsearch;
 
-  // add a mg and gdbm source
-  mggdbmsourceclass mggdbmsource;
-  mggdbmsource.set_gdbmptr (&gdbmhandler);
-  mggdbmsource.set_mgsearchptr (&mgsearch);
-  cserver.add_source (&mggdbmsource);
-
-  // inform collection server and everything it contains about its
-  // collection name
-  cserver.configure ("collection", "gberg");
-
-  nproto.add_collectserver (&cserver);
+    // add a null filter
+    filterclass filter;
+    cserver.add_filter (&filter);
+    
+    // add a browse filter
+    browsefilterclass browsefilter;
+    browsefilter.set_gdbmptr (&gdbmhandler);
+    cserver.add_filter (&browsefilter);
+    
+    // add a query filter
+    queryfilterclass queryfilter;
+    queryfilter.set_gdbmptr (&gdbmhandler);
+    queryfilter.set_mgsearchptr (&mgsearch);
+    cserver.add_filter (&queryfilter);
+    
+    // add a mg and gdbm source
+    mggdbmsourceclass mggdbmsource;
+    mggdbmsource.set_gdbmptr (&gdbmhandler);
+    mggdbmsource.set_mgsearchptr (&mgsearch);
+    cserver.add_source (&mggdbmsource);
+    
+    // inform collection server and everything it contains about its
+    // collection name
+    cserver.configure ("collection", "hdl");
+    
+    nproto.add_collectserver (&cserver);
+    //    thiscol ++;
+    //  }
 
   // add the protocol to the receptionist
   recpt.add_protocol (&nproto);
 
-  cgiwrapper (recpt, "gberg");
+  cgiwrapper (recpt, "hdl");
   return 0;
 }

trunk/gsdl/src/recpt/nullproto.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/05/10 03:40:41  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.5  1999/04/30 01:59:41  sjboddie
    lots of stuff - getting documentaction working (documentaction replaces
@@ -166 +169 @@
 }
 
+void nullproto::get_document (const text_t &collection,
+                  const DocumentRequest_t &request,
+                  DocumentResponse_t &response,
+                  comerror_t &err, ostream &logout) {
+  collectserver *cserver = cservers.getcollectserver (collection);
+  if (cserver != NULL) cserver->get_document (request, response, err, logout);
+  else err = protocolError;
+}

trunk/gsdl/src/recpt/nullproto.h

@@ -57 +57 @@
            FilterResponse_t &response,
            comerror_t &err, ostream &logout);
+
+  void get_document (const text_t &collection,
+             const DocumentRequest_t &request,
+             DocumentResponse_t &response,
+             comerror_t &err, ostream &logout);
+
 };
 

trunk/gsdl/src/recpt/recptproto.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/05/10 03:40:43  sjboddie
+   lots of changes - slowly getting document action sorted out
+
    Revision 1.5  1999/04/30 01:59:43  sjboddie
    lots of stuff - getting documentaction working (documentaction replaces
@@ -113 +116 @@
 }
 
+void recptproto::get_document (const text_t &/*collection*/,
+                   const DocumentRequest_t &/*request*/,
+                   DocumentResponse_t &/*response*/,
+                   comerror_t &err, ostream &/*logout*/) {
+  err = protocolError;
+}
+
+
 
 

trunk/gsdl/src/recpt/recptproto.h

@@ -93 +93 @@
                FilterResponse_t &response,
                comerror_t &err, ostream &logout);
+
+  // gets a document (duh!)
+  virtual void get_document (const text_t &collection,
+                 const DocumentRequest_t &request,
+                 DocumentResponse_t &response,
+                 comerror_t &err, ostream &logout);
 };