Changeset 189

Timestamp:

1999-03-05T16:53:56+13:00 (25 years ago)

Author:

sjboddie

Message:

fixed some bugs

Location:

trunk/gsdl/src/recpt

Files:

• Makefile (modified) (1 diff)
• OIDtools.cpp (modified) (3 diffs)
• OIDtools.h (modified) (1 diff)
• cgiwrapper.cpp (modified) (2 diffs)
• cgiwrapper.h (modified) (1 diff)
• librarymain.cpp (modified) (2 diffs)
• receptionist.cpp (modified) (6 diffs)
• receptionist.h (modified) (1 diff)
• subjectbrowseaction.cpp (modified) (7 diffs)
• subjectbrowseaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/Makefile

@@ -11 +11 @@
 AR = ar
 CC = gcc
-CCFLAGS = -g -Wall -Wunused -pedantic -W -Woverloaded-virtual
+CCFLAGS = -g -Wall -Wunused -pedantic -W -Woverloaded-virtual # -Wshadow
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI -DGSDLSERVER
 INCLUDES = -I../../lib -I../../packages/mg-1.3d -I../../packages/mg-1.3d/lib \

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/03/05 03:53:53  sjboddie
+
+   fixed some bugs
+
    Revision 1.1  1999/03/04 22:38:20  sjboddie
 
@@ -24 +28 @@
 // targetdoc. targetdoc will normally be either a document
 // or classification OID so this returns the CLSU, HASH etc.
-void targetdoc_gethead (const text_t &targetdoc, text_t &head) {
+void get_head (const text_t &targetdoc, text_t &head) {
 
   head.clear();
@@ -31 +35 @@
 }
 
+
+// returns (in top) the top level of targetdoc (i.e. everything
+// up until the first dot)
+void get_top (const text_t &targetdoc, text_t &top) {
+
+  top.clear();
+  text_t::const_iterator begin = targetdoc.begin();
+  text_t::const_iterator end = targetdoc.end();
+
+  top.appendrange (begin, findchar(begin, end, '.'));
+}   
+
+
+// checks if targetdoc is top level of a document (i.e. contains no dots)
+bool is_top (const text_t &targetdoc) {
+
+  text_t::const_iterator here = targetdoc.begin();
+  text_t::const_iterator end = targetdoc.end();
+  here = findchar (here, end, '.');
+
+  if (here == end) return true;
+  return false;
+}

trunk/gsdl/src/recpt/OIDtools.h

@@ -19 +19 @@
 // targetdoc. targetdoc will normally be either a document
 // or classification OID so this returns the CLSU, HASH etc.
-void targetdoc_gethead (const text_t &targetdoc, text_t &head);
+void get_head (const text_t &targetdoc, text_t &head);
 
+// returns (in top) the top level of targetdoc (i.e. everything
+// up until the first dot)
+void get_top (const text_t &targetdoc, text_t &top);
+
+// checks if targetdoc is top level of a document (i.e. contains no dots)
+bool is_top (const text_t &targetdoc);
 
 

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/03/05 03:53:54  sjboddie
+
+   fixed some bugs
+
    Revision 1.9  1999/03/04 22:38:21  sjboddie
 
@@ -323 +327 @@
 // collection then "collection" should be set, otherwise it
 // should equal "".
-void cgiwrapper (receptionist &recpt, const text_t &collection) {
+void cgiwrapper (receptionist &recpt, text_t collection) {
 #ifdef USE_FASTCGI
   fcgistreambuf outbuf;

trunk/gsdl/src/recpt/cgiwrapper.h

@@ -21 +21 @@
 // collection then "collection" should be set, otherwise it
 // should equal "".
-void cgiwrapper (receptionist &recpt, const text_t &collection);
+void cgiwrapper (receptionist &recpt, text_t collection);
 
 

trunk/gsdl/src/recpt/librarymain.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/03/05 03:53:54  sjboddie
+
+   fixed some bugs
+
    Revision 1.1  1999/02/21 22:35:22  rjmcnab
 
@@ -37 +41 @@
   recpt.add_protocol (&nproto);
 
-  cgiwrapper (recpt, "");
+  cgiwrapper (recpt, "gberg");
   return 0;
 }

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.10  1999/03/05 03:53:54  sjboddie
+
+   fixed some bugs
+
    Revision 1.9  1999/02/28 20:00:16  rjmcnab
 
@@ -125 +129 @@
       // look in $GSDLHOME/collect/collection-name/etc/collect.cfg and
       // then $GSDLHOME/etc/collect.cfg
-      text_t thecollectdir = filename_cat (configinfo.gsdlhome, "collect");
+      thecollectdir = filename_cat (configinfo.gsdlhome, "collect");
       thecollectdir = filename_cat (thecollectdir, configinfo.collection);
       text_t filename = filename_cat (thecollectdir, "etc");
@@ -339 +343 @@
   action *a = actions.getaction (args["a"]);
   if (a != NULL) {
-    if (a->uses_display(args)) prepare_page (a, args, collectproto, disp, logout);
+    if (a->uses_display(args)) prepare_page (a, args, collectproto, logout);
     if (!a->do_action (args, collectproto, disp, (*outconverter), contentout, logout))
       return false;
@@ -553 +557 @@
 // and opens the page ready for output 
 void receptionist::prepare_page (action *a, cgiargsclass &args, recptproto */*collectproto*/, 
-                 displayclass &disp, ostream &logout) {
+                 ostream &logout) {
   
   // set up page parameters
@@ -579 +583 @@
 
   // define general macros
-  define_general_macros (disp, args, logout);
+  define_general_macros (args, logout);
 
   
@@ -598 +602 @@
 }
 
-void receptionist::define_general_macros (displayclass &disp, cgiargsclass &args, 
-                      ostream &/*logout*/) {
+void receptionist::define_general_macros (cgiargsclass &args, ostream &/*logout*/) {
 
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);

trunk/gsdl/src/recpt/receptionist.h

@@ -50 +50 @@
   // and opens the page ready for output 
   void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto, 
-             displayclass &disp, ostream &logout);
-  void define_general_macros (displayclass &disp, cgiargsclass &args, 
-                  ostream &logout);
+             ostream &logout);
+  void define_general_macros (cgiargsclass &args, ostream &logout);
 
 public:

trunk/gsdl/src/recpt/subjectbrowseaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/03/05 03:53:56  sjboddie
+
+   fixed some bugs
+
    Revision 1.1  1999/03/04 22:38:22  sjboddie
 
@@ -21 +25 @@
 #include "subjectbrowseaction.h"
 #include "OIDtools.h"
-
 
 subjectbrowseaction::subjectbrowseaction () {
@@ -88 +91 @@
 }
 
-bool subjectbrowseaction::do_action (cgiargsclass &args, recptproto */*collectproto*/,
+bool subjectbrowseaction::do_action (cgiargsclass &args, recptproto *collectproto,
                      displayclass &disp, outconvertclass &outconvert, 
-                     ostream &textout, ostream &/*logout*/) {
+                     ostream &textout, ostream &logout) {
 
   text_t browsebar, locator, output;
+
+  if (collectproto == NULL) return false;
   
   // get browse bar unless page has been detached 
@@ -99 +104 @@
   
   // get top locator
-  get_top_locator(args, 0, locator);    
+  get_top_locator(args, collectproto, 0, locator, logout);  
 
   // expand and output page 
@@ -122 +127 @@
 
 void subjectbrowseaction::get_browse_bar(const text_t &classification, text_t &return_text) {
-  if (classification.empty()) return_text = "_imagebarstandard_";
+
+  return_text = "\n\n<!-- imagebar produced by subjectbrowseaction::get_browse_bar -->\n\n";
+  if (classification.empty()) return_text += "_imagebarstandard_";
   else {
     text_t head;
-    targetdoc_gethead(classification, head);
-    return_text = "_browse:imagebar" + head + "_";
+    get_head(classification, head);
+    return_text += "_browse:imagebar" + head + "_";
   }
 }
@@ -135 +142 @@
 // get_top_locator returns (in return_text) the html for the top browsing section
 
-void subjectbrowseaction::get_top_locator(cgiargsclass &args, int oversize, text_t &return_text) {
+void subjectbrowseaction::get_top_locator(cgiargsclass &args, recptproto *collectproto,
+                      int oversize, text_t &return_text, ostream &logout) {
   
   text_t alphabet_arrows, doclink;
@@ -141 +149 @@
   text_t &arg_cl = args["cl"];
 
-  return_text = "<p><table width=\"100%\" cellpadding=0 cellspacing=0 border=0><tr>\n";
+  return_text = "\n\n<!-- top_locator produced by subjectbrowseaction::get_top_locator -->\n\n";
+  return_text += "<p><table width=\"100%\" cellpadding=0 cellspacing=0 border=0><tr>\n";
   
   if (args["x"] == "1") doclink = "<a href=\"_gwcgi_?e=_compressedoptions_&q=_urlsafequerystring_&x=1";
   else doclink = "<a href=\"_gwcgi_?e=_compressedoptions_&q=_urlsafequerystring_";
 
-  /*  // get book cover jpeg and detach/expand/collapse buttons
-  if (!arg_d.empty() && !is_top_level(arg_d)) {
-    text_t book_top, jpeg_file;
-    gdbm_info info;
-    get_book_top(booksection, book_top);
+  // get book cover jpeg and detach/expand/collapse buttons
+  //  if (!arg_d.empty() && !is_top (arg_d)) {
+    text_t top, jpeg_file;
+    get_top(arg_d, top);
+
+    comerror_t err;
+    MetadataResponse_t resp;
+    MetadataRequest_t req;
+    req.OIDs.push_back (top);
+    req.fields.push_back ("jobnum");
+
+    collectproto->get_metadata (args["c"], req, resp, err, logout);
+
+    /*
     gdbm.getinfo(book_top, info);
 

trunk/gsdl/src/recpt/subjectbrowseaction.h

@@ -22 +22 @@
 protected:
   void get_browse_bar(const text_t &classification, text_t &return_text);
-  void get_top_locator(cgiargsclass &args, int oversize, text_t &return_text);
+  void get_top_locator(cgiargsclass &args, recptproto *collectproto,
+               int oversize, text_t &return_text, ostream &logout);
 
 public: