Changeset 284

Timestamp:

1999-06-24T17:12:25+12:00 (25 years ago)

Author:

sjboddie

Message:

lots of small changes

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (10 diffs)
• browsetools.h (modified) (1 diff)
• cgiwrapper.cpp (modified) (2 diffs)
• documentaction.cpp (modified) (11 diffs)
• documentaction.h (modified) (1 diff)
• pageaction.cpp (modified) (3 diffs)
• pageaction.h (modified) (3 diffs)
• queryaction.cpp (modified) (9 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.9  1999/06/24 05:12:15  sjboddie
+   lots of small changes
+
    Revision 1.8  1999/06/17 03:06:53  sjboddie
    got detach button working properly - the close book icon is now disabled
@@ -268 +271 @@
 }
 
+// ouput_list_toc generates and outputs a List 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) {
+
+  text_tarray metadata;
+  FilterResponse_t response;
+  text_t &arg_cl = args["cl"];
+  text_t doclink = "<a href=\"_httpdocument_&cl=" + arg_cl + "&d=";
+
+  if (classifytitle != "Title") metadata.push_back (classifytitle);
+  metadata.push_back ("Title");
+
+  if (get_children (arg_cl, args["c"], metadata, collectproto, response, logout)) {
+
+    textout
+      << "\n<!-- Table of Contents produced by browsetools::output_list_toc "
+      << "-->\n\n<table cellpadding=0 cellspacing=2>\n";
+
+    ResultDocInfo_tarray::const_iterator sechere = response.docInfo.begin();
+    ResultDocInfo_tarray::const_iterator secend = response.docInfo.end();
+
+    while (sechere != secend) {
+
+      const text_t &ctitle = (*sechere).metadata[0].values[0];
+      const text_t &title = (*sechere).metadata[1].values[0];
+
+      if (!ctitle.empty()) {
+      textout << outconvert << disp << "<tr><td valign=top>" << doclink << (*sechere).OID 
+          << "\">_document:iconclosedbook_</a></td><td>" 
+          << ctitle << "</td><td>";
+      } else if (!title.empty()) {
+      textout << outconvert << disp << "<tr><td valign=top>" << doclink << (*sechere).OID 
+          << "\">_document:iconclosedbook_</a></td><td>" << title << "</td><td>";
+      }
+
+      textout << "</td></tr>\n";
+      sechere ++;
+    }
+    textout << "</table>\n<!-- end of Table of Contents -->\n";
+  }
+}
+
 // ouput_azlist_toc generates and outputs an AZList type table of contents
 // it should only be called for classifications (i.e. when the "d"
@@ -289 +339 @@
 
     textout
-      << "\n<!-- Table of Contents produced by browsetools::output_list_toc "
+      << "\n<!-- Table of Contents produced by browsetools::output_azlist_toc "
       << "-->\n\n<table cellpadding=0 cellspacing=2>\n";
 
@@ -303 +353 @@
     if (!creator.empty()) {
       textout << outconvert << disp << "<tr><td valign=top>" << doclink << (*sechere).OID 
-          << "\">_iconclosedbook_</a></td><td>" 
+          << "\">_document:iconclosedbook_</a></td><td>" 
           << creator << "</td><td>";
 
@@ -312 +362 @@
     if (!title.empty()) {
       textout << outconvert << disp << "<tr><td valign=top>" << doclink << (*sechere).OID 
-          << "\">_iconclosedbook_</a></td><td>" << title << "</td><td>";
+          << "\">_document:iconclosedbook_</a></td><td>" << title << "</td><td>";
 
       if (!creator.empty())
@@ -437 +487 @@
 
     // set up icon
-    icon = "_iconsmalltext_";
+    icon = "_document:iconsmalltext_";
     if (is_top((*thissection).OID))
-      if (classifytype == "Document") icon = "_iconopenbook_";
+      if (classifytype == "Document") icon = "_document:iconopenbook_";
       else 
-    if (doctype == "classify") icon = "_iconopenbookshelf_";
-    else icon = "_iconclosedbook_";
+    if (doctype == "classify") icon = "_document:iconopenbookshelf_";
+    else icon = "_document:iconclosedbook_";
     else if (haschildren) 
-      if (classifytype == "Document") icon = "_iconopenfolder_";
-      else icon = "_iconopenbookshelf_";
+      if (classifytype == "Document") icon = "_document:iconopenfolder_";
+      else icon = "_document:iconopenbookshelf_";
     
     // set up tabbing
@@ -457 +507 @@
 
     for (int i = 0; i < tabcols; i++) 
-      icontabs += "_icontab_";
+      icontabs += "_document:icontab_";
     
     // set up pointer
     if (classifytype == "Document" && !gt) {
-      if ((*thissection).OID == OID) pointer = "_iconpointer_";
-      else pointer = "_icontab_";
+      if ((*thissection).OID == OID) pointer = "_document:iconpointer_";
+      else pointer = "_document:icontab_";
       tabcols ++;
     }
@@ -550 +600 @@
       
       // set up icon for this parent
-      icon = "_iconopenfolder_";
-      if (doctype == "classify") icon = "_iconopenbookshelf_";
-      else if (is_top(*thisparent)) icon = "_iconopenbook_";
+      icon = "_document:iconopenfolder_";
+      if (doctype == "classify") icon = "_document:iconopenbookshelf_";
+      else if (is_top(*thisparent)) icon = "_document:iconopenbook_";
 
       for (int j = 0; j < tabcount; j++)
-    icontabs += "_icontab_";
+    icontabs += "_document:icontab_";
 
       if (doctype != "classify") {
     if (*thisparent == args["d"]) {
-      icontabs += "_iconpointer_";
+      icontabs += "_document:iconpointer_";
       if (is_top (*thisparent))
         tabcount ++;
@@ -624 +674 @@
 
     // set up icon for this sibling
-    icon = "_iconclosedfolder_";
-    if (doctype == "classify") icon = "_iconclosedbookshelf_";
-    else if (is_top((*thissibling).OID)) icon = "_iconclosedbook_";
+    icon = "_document:iconclosedfolder_";
+    if (doctype == "classify") icon = "_document:iconclosedbookshelf_";
+    else if (is_top((*thissibling).OID)) icon = "_document: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_";
+    pointer = "_document:icontab_";
     if (doctype == "classify") {
       if ((*thissibling).OID == args["cl"] && hastxt)
-    pointer = "_iconpointer_";
-    } else if ((*thissibling).OID == args["d"]) pointer = "_iconpointer_";
+    pointer = "_document:iconpointer_";
+    } else if ((*thissibling).OID == args["d"]) pointer = "_document:iconpointer_";
     
     text_t thesetabs;
     for (int j = 0; j < (tabcount - 1); j++)
-      thesetabs += "_icontab_";
+      thesetabs += "_document:icontab_";
     
     tab = "<td valign=top";
@@ -647 +697 @@
     if (!haschildren) {
       // sibling is text document
-      icon = "_iconsmalltext_";
+      icon = "_document:iconsmalltext_";
       text_t link;
       if (doctype == "classify") link = "&cl=" + (*thissibling).OID;

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 output_azlist_toc (const text_t &classifytitle, cgiargsclass &args,
             recptproto *collectproto, displayclass &disp, 

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.13  1999/06/24 05:12:18  sjboddie
+   lots of small changes
+
    Revision 1.12  1999/04/30 01:59:40  sjboddie
    lots of stuff - getting documentaction working (documentaction replaces
@@ -352 +355 @@
 
   pageaction apageaction;
+  apageaction.set_receptionist (&recpt);
   recpt.add_action (&apageaction);
 

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.8  1999/06/24 05:12:20  sjboddie
+   lots of small changes
+
    Revision 1.7  1999/06/17 03:06:58  sjboddie
    got detach button working properly - the close book icon is now disabled
@@ -148 +151 @@
 }
 
-bool documentaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &/*args*/, 
-                    ostream &/*logout*/) {
-  // don't want to check anything yet.
+bool documentaction::check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
+                    ostream &logout) {
+
+  // note that "gp" argument gets checked in define_external_macros()
+
+  // check gc argument
+  int arg_gc = args.getintarg("gc");
+  if (arg_gc != 0 && arg_gc != 1) {
+    logout << "Warning: \"gc\" argument out of range (" << arg_gc << ")\n";
+    cgiarginfo *gcinfo = argsinfo.getarginfo ("gc");
+    if (gcinfo != NULL) args["gc"] = gcinfo->argdefault;
+  }
+
+  // check gt argument (may be either 0, 1 or 2)
+  int arg_gt = args.getintarg("gt");
+  if (arg_gt != 0 && arg_gt != 1 && arg_gt != 2) {
+    logout << "Warning: \"gt\" argument out of range (" << arg_gt << ")\n";
+    cgiarginfo *gtinfo = argsinfo.getarginfo ("gt");
+    if (gtinfo != NULL) args["gt"] = gtinfo->argdefault;
+  }
+
+  // check hl argument
+  int arg_hl = args.getintarg("hl");
+  if (arg_hl != 0 && arg_hl != 1) {
+    logout << "Warning: \"hl\" argument out of range (" << arg_hl << ")\n";
+    cgiarginfo *hlinfo = argsinfo.getarginfo ("hl");
+    if (hlinfo != NULL) args["hl"] = hlinfo->argdefault;
+  }
+
+  // check x argument
+  int arg_x = args.getintarg("x");
+  if (arg_x != 0 && arg_x != 1) {
+    logout << "Warning: \"x\" argument out of range (" << arg_x << ")\n";
+    cgiarginfo *xinfo = argsinfo.getarginfo ("x");
+    if (xinfo != NULL) args["x"] = xinfo->argdefault;
+  }
+
   return true;
 }
@@ -380 +417 @@
 
       text_t pagetitle;
-      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 ++;
+      if (args.getintarg("gt") == 2) 
+    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 ++;
+    }
       }
       disp.setmacro ("pagetitle", "document", pagetitle);
@@ -423 +464 @@
     text_t &classifytype = response.docInfo[0].metadata[1].values[0];
 
-    disp.setmacro ("imagethispage", "document", 
-               "_icon" + title + "page_");
+    disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
+
+    disp.setmacro ("imagethispage", "document", "_icon" + title + "page_");
 
     // now get the metadata for each child of top level
@@ -495 +537 @@
     text_tarray metadata;
     FilterResponse_t response;
-    FilterResponse_t queryresponse;
-    DocumentRequest_t docrequest;
-    DocumentResponse_t docresponse;
     text_t topparent, classifytype, classifytitle;
-    comerror_t err;
-    bool highlight = false;
     
     text_t &arg_d = args["d"];
     text_t &arg_cl = args["cl"];
-    text_t &collection = args["c"];
     
     text_t OID = arg_d;
@@ -515 +551 @@
       textout << outconvert << disp << "Document contains no data_document:footer_\n";
       return true;
-    }
-    
-    // if we have a query string and highlighting is turned on we need
-    // to redo the query to get the terms for highlighting
-    if (!args["q"].empty() && args.getintarg("hl")) {
-      FilterRequest_t request;
-      text_t quotedstring; // don't use this here
-      request.filterResultOptions = FRmatchTerms;
-      if (do_query (request, args, collectproto, quotedstring, queryresponse, logout))
-    highlight = true;
     }
     
@@ -531 +557 @@
     metadata.push_back ("Title");
     metadata.push_back ("classifytype");
-    if (get_info (topparent, collection, metadata, false, collectproto, response, logout)) {
+    if (get_info (topparent, args["c"], metadata, false, collectproto, response, logout)) {
       classifytitle = response.docInfo[0].metadata[0].values[0];
       classifytype = response.docInfo[0].metadata[1].values[0];
     }
     
+    // output the table of contents
     if (!arg_d.empty()) {
       
@@ -542 +569 @@
                   outconvert, textout, logout);
       else
-    // Book is the default for a document level toc - AZList and Datelist don't
-    // make sense for document level
+    // Book is the default for a document level toc - AZList, List and 
+    // Datelist don't make sense for document level
     output_book_toc (classifytitle, args, collectproto, disp,
              outconvert, textout, logout);
@@ -554 +581 @@
     output_datelist_toc (classifytitle, args, collectproto, disp, 
                  outconvert, textout, logout);
+      else if (classifytype == "List")
+    output_list_toc (classifytitle, args, collectproto, disp, 
+             outconvert, textout, logout);
       else 
     // AZList is the default for a classification level toc - Book doesn't make 
@@ -560 +590 @@
                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, false, 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();
+
+    // output the document text
+    output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+
+    textout << outconvert << disp << "_document:footer_\n";
+  }
+  return true;
+}
+
+
+void documentaction::output_document (const text_t &OID, cgiargsclass &args, 
+                      recptproto *collectproto, displayclass &disp, 
+                      outconvertclass &outconvert, ostream &textout, 
+                      ostream &logout) {
+  FilterResponse_t inforesponse;
+  DocumentRequest_t docrequest;
+  DocumentResponse_t docresponse;
+  FilterResponse_t queryresponse;
+  comerror_t err;
+  text_tarray metadata;
+  bool highlight = false;
+  int arg_gt = args.getintarg("gt");
+  text_t &collection = args["c"];
+    
+  // if we have a query string and highlighting is turned on we need
+  // to redo the query to get the terms for highlighting
+  if (!args["q"].empty() && args.getintarg("hl")) {
+    FilterRequest_t request;
+    request.filterResultOptions = FRmatchTerms;
+    text_t quotedquery; // not used
+    if (do_query (request, args, collectproto, quotedquery, queryresponse, logout))
+      highlight = true;
+  }
+
+  // get info on this document
+  metadata.push_back("Title");
+  metadata.push_back("hastxt");
+  metadata.push_back("haschildren");
+    
+  if (get_info (OID, collection, metadata, false, collectproto, inforesponse, logout)) {
+    text_t title = inforesponse.docInfo[0].metadata[0].values[0];
+    int hastxt = inforesponse.docInfo[0].metadata[1].values[0].getint();
+    int haschildren = inforesponse.docInfo[0].metadata[2].values[0].getint();
       
-      int gt = args.getintarg("gt");
-      if (gt == 0) {
-    if (hastxt == 1) {
-      // get the text
+    if (arg_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>";
+      if (highlight)
+        highlighttext(docresponse.doc, queryresponse.termInfo, disp,
+              outconvert, textout, logout);
+      else
+        textout << outconvert << disp << docresponse.doc;
+      }
+    } else {
+    
+      // text is to be expanded
+      text_t exOID = OID;
+      if (!haschildren) exOID = get_parent (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 
+      // doesn't recurse all the way through each document in the classification
+      text_t classifytype;
+      if (args["d"].empty()) classifytype = "classify";
+
+      int i; // not used
+      get_contents (exOID, classifytype, i, collection, collectproto, inforesponse, logout);
+    
+      ResultDocInfo_tarray::const_iterator sechere = inforesponse.docInfo.begin();
+      ResultDocInfo_tarray::const_iterator secend = inforesponse.docInfo.end();
+    
+      if (arg_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) {
+      // more than 10 sections so output warning message and text 
+      // for current section only
+      textout << outconvert << disp << "_document:textltwarning_";
       docrequest.OID = OID;
       collectproto->get_document (collection, docrequest, docresponse, err, logout);
@@ -586 +690 @@
         textout << outconvert << disp << 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 ++;
+    else arg_gt = 2;
+      }
+
+      if (arg_gt == 2) {
+    // get the text for each section
+    sechere = inforesponse.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);
+        if (highlight)
+          highlighttext(docresponse.doc, queryresponse.termInfo, disp, 
+                outconvert, textout, logout);
+        else
+          textout << outconvert << disp << docresponse.doc;
       }
-      if (seccount > 10) textout << outconvert << disp << "_document:textltwarning_";
-      else gt = 2;
+      count ++;
+      sechere ++;
     }
-
-    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);
-          if (highlight)
-        highlighttext(docresponse.doc, queryresponse.termInfo, disp, 
-                  outconvert, textout, logout);
-          else
-        textout << outconvert << disp << docresponse.doc;
-        }
-        count ++;
-        sechere ++;
-      }
-    }
-      }
-    }
-    textout << outconvert << disp << "_document:footer_\n";
-  }
-  return true;
-}
-
+      }
+    }
+  }
+}
 
 // highlighttext highlights query terms in text string and outputs the resulting text string

trunk/gsdl/src/recpt/documentaction.h

@@ -20 +20 @@
 
 protected:
+  void output_document (const text_t &OID, cgiargsclass &args, 
+            recptproto *collectproto, displayclass &disp, 
+            outconvertclass &outconvert, ostream &textout, 
+            ostream &logout);
+
   void highlighttext(text_t &text, TermInfo_tarray &terms, displayclass &disp,
              outconvertclass &outconvert, ostream &textout, ostream &logout);

trunk/gsdl/src/recpt/pageaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/06/24 05:12:24  sjboddie
+   lots of small changes
+
    Revision 1.6  1999/06/10 00:39:16  sjboddie
    navigation bar is no longer written out for every page (it should
@@ -42 +45 @@
 #include "pageaction.h"
 #include "receptionist.h"
-
+#include <time.h>
 
 pageaction::pageaction () {
+
+  recpt = NULL;
+
   // this action uses cgi variables "a" and "p"
   cgiarginfo arg_ainfo;
@@ -79 +85 @@
 }
 
+
+void pageaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
+                     recptproto */*collectproto*/, ostream &logout) {
+
+  // define_internal_macros sets the following macros:
+
+  // _homeextra_   this is the list of available collections and collection info
+  //               to be displayed on the home page
+
+  if (args["p"] == "home") {
+    // make sure we know about a receptionist
+    if (recpt == NULL) {
+      logout << "The page action does not contain information\n"
+         << "about any receptionists. The method set_receptionist\n"
+         << "was probably not called from the module which instantiated\n"
+         << "this page action.\n";
+      return;
+    }
+
+    unsigned long current_time = time(NULL);
+    text_t homeextra;
+
+    recptprotolistclass *rprotolist = recpt->get_recptprotolist_ptr ();
+    if (rprotolist == NULL) return;
+
+    recptprotolistclass::iterator rprotolist_here = rprotolist->begin();
+    recptprotolistclass::iterator rprotolist_end = rprotolist->end();
+    while (rprotolist_here != rprotolist_end) {
+      if ((*rprotolist_here).p != NULL) {
+    text_tarray collist;
+    comerror_t err;
+    (*rprotolist_here).p->get_collection_list (collist, err, logout);
+    if (err == noError) {
+      text_tarray::iterator collist_here = collist.begin();
+      text_tarray::iterator collist_end = collist.end();
+
+      homeextra += "<dl>\n";
+
+      while (collist_here != collist_end) {
+        ColInfoResponse_t collectinfo;
+        (*rprotolist_here).p->get_collectinfo (*collist_here, collectinfo, err, logout);
+        if (err == noError) {
+
+          homeextra += "<dt><a href=\"_httppagex_(about)&c=" + *collist_here + "\">" 
+        + *collist_here + "</a></dt>\n";
+          homeextra += "<dd>";
+          if (collectinfo.numDocs != 0) homeextra += text_t(collectinfo.numDocs) + "_documents_";
+          if (collectinfo.numWords != 0) homeextra += text_t(collectinfo.numWords) + "_words_";
+          unsigned long last_update = (current_time - collectinfo.buildDate) / 86400;
+          homeextra += "_lastupdate_ " + text_t(last_update) + " _ago_</dd>\n";
+        }
+        collist_here ++;
+      }
+      homeextra += "</dl>\n";
+      disp.setmacro ("homeextra", "home", homeextra); 
+    }
+      }
+      rprotolist_here ++;
+    }
+  }
+}
+
 bool pageaction::do_action (cgiargsclass &args, recptproto */*collectproto*/,
                 displayclass &disp, outconvertclass &outconvert, 

trunk/gsdl/src/recpt/pageaction.h

@@ -17 +17 @@
 #include "gsdlconf.h"
 #include "action.h"
+#include "receptionist.h"
 
 
 class pageaction : public action {
   
+protected:
+  receptionist *recpt;
+
 public:
   pageaction ();
@@ -27 +31 @@
   text_t get_action_name () {return "p";}
 
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
   bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
               ostream &logout);
@@ -32 +37 @@
   void get_cgihead_info (cgiargsclass &args, response_t &response,
              text_t &response_data, ostream &logout);
+
+  void define_internal_macros (displayclass &disp, cgiargsclass &args, 
+                   recptproto *collectproto, ostream &logout);
 
   bool do_action (cgiargsclass &args, recptproto *collectproto,

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/06/24 05:12:25  sjboddie
+   lots of small changes
+
    Revision 1.5  1999/06/16 04:03:48  sjboddie
    Now sets "cl" arg to "search" when going to a document from a search
@@ -90 +93 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  // "t"
+  // "t" - 1 = ranked 0 = boolean
   arg_ainfo.shortname = "t";
   arg_ainfo.longname = "search type";
   arg_ainfo.multiplechar = false;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "0";
+  arg_ainfo.argdefault = "1";
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -160 +163 @@
   if (arg_t != 0 && arg_t != 1) {
     logout << "Warning: \"t\" argument out of range (" << arg_t << ")\n";
-    args["t"] = argsinfo["t"].argdefault;
+    cgiarginfo *tinfo = argsinfo.getarginfo ("t");
+    if (tinfo != NULL) args["t"] = tinfo->argdefault;
   }
 
@@ -167 +171 @@
   if (arg_k != 0 && arg_k != 1) {
     logout << "Warning: \"k\" argument out of range (" << arg_k << ")\n";
-    args["k"] = argsinfo["k"].argdefault;
+    cgiarginfo *kinfo = argsinfo.getarginfo ("k");
+    if (kinfo != NULL) args["k"] = kinfo->argdefault;
   }
 
@@ -174 +179 @@
   if (arg_s != 0 && arg_s != 1) {
     logout << "Warning: \"s\" argument out of range (" << arg_s << ")\n";
-    args["s"] = argsinfo["s"].argdefault;
+    cgiarginfo *sinfo = argsinfo.getarginfo ("s");
+    if (sinfo != NULL) args["s"] = sinfo->argdefault;
   }
 
@@ -181 +187 @@
   if (arg_m < 0) {
     logout << "Warning: \"m\" argument less than 0 (" << arg_m << ")\n";
-    args["m"] = argsinfo["m"].argdefault;
+    cgiarginfo *minfo = argsinfo.getarginfo ("m");
+    if (minfo != NULL) args["m"] = minfo->argdefault;
   }
 
@@ -188 +195 @@
   if (arg_o < 0) {
     logout << "Warning: \"o\" argument less than 0 (" << arg_o << ")\n";
-    args["o"] = argsinfo["o"].argdefault;
+    cgiarginfo *oinfo = argsinfo.getarginfo ("o");
+    if (oinfo != NULL) args["o"] = oinfo->argdefault;
   }
 
@@ -195 +203 @@
   if (arg_r < 1) {
     logout << "Warning: \"r\" argument less than 1 (" << arg_r << ")\n";
-    args["r"] = argsinfo["r"].argdefault;
+    cgiarginfo *rinfo = argsinfo.getarginfo ("r");
+    if (rinfo != NULL) args["r"] = rinfo->argdefault;
   }
 
@@ -387 +396 @@
 
   // can't use isApprox here as it will be false as long 
-  // as numDocs < MAXDOCS (currently 200). If arg_m is less
+  // as numDocs < MAXDOCS (currently 500). If arg_m is less
   // than MAXDOCS numDocs can be greater than arg_m while
   // isApprox is false.
-  if (response.numDocs >= numdocs) resline = "_textmorethan_";
+  if (response.numDocs > numdocs || 
+      ((response.numDocs == numdocs) && response.isApprox))
+    resline = "_textmorethan_";
   if (numdocs == 0) resline = "_textnodocs_";
   else if (numdocs == 1) resline += "_text1doc_";
-  else resline += text_t(numdocs) + "_textlotsdocs_";
+  else resline += text_t(numdocs) + " _textlotsdocs_";
 
   disp.setmacro("resultline", "query", resline);