Changeset 1342 for branches/z3950-branch/gsdl/src/recpt/documentaction.cpp

Timestamp:

2000-08-03T14:49:41+12:00 (24 years ago)

Author:

johnmcp

Message:

Relatively stable z39.50 implementation now, merged with the mgpp source.
(Still needs a decent interface and query language though...)

File:

• branches/z3950-branch/gsdl/src/recpt/documentaction.cpp (modified) (7 diffs)

branches/z3950-branch/gsdl/src/recpt/documentaction.cpp

@@ -22 +22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
- *
  *********************************************************************/
-
-/*
-   $Log$
-   Revision 1.38  2000/05/04 05:18:46  sjboddie
-   attempting to get end-user collection building to work under windows
-
-   Revision 1.37  2000/04/07 04:40:44  sjboddie
-   Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
-   from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
-   separate development branch (New_Config_Format-branch) for now. The plan
-   is to redesign the configuration file format a bit and limit the number of
-   distributions floating around that take different configuration formats).
-
-   Revision 1.34  2000/02/15 22:53:49  kjm18
-   search history stuff added.
-
-   Revision 1.33  2000/02/13 20:40:05  sjboddie
-   now dm_safe _thisOID_ macro
-
-   Revision 1.32  2000/01/25 22:39:15  sjboddie
-   added DocumentUseHTML - tidied some things up (and messed up some others)
-
-   Revision 1.31  1999/11/13 08:57:00  sjboddie
-   fixed bug in last changes
-
-   Revision 1.30  1999/11/01 21:54:27  sjboddie
-   changes for cross-collection searching - changes to arguments
-   of many functions
-
-   Revision 1.29  1999/10/24 07:23:40  sjboddie
-   added FullTOC option
-
-   Revision 1.28  1999/10/19 03:23:42  davidb
-   Collection building support through web pages
-   and internal and external link handling for collection documents
-
-   Revision 1.27  1999/10/14 23:00:53  sjboddie
-   finished changes to browsing support
-
-   Revision 1.26  1999/10/10 08:14:06  sjboddie
-   - metadata now returns mp rather than array
-   - redesigned browsing support (although it's not finished so
-   won't currently work ;-)
-
-   Revision 1.25  1999/09/17 04:46:05  sjboddie
-   fixed a couple of problems with 'unknown' classifier
-
-   Revision 1.24  1999/09/17 04:00:26  sjboddie
-   tidied up navigation bar to produce a default "unknown" button if
-   it comes across metadata it can't display
-
-   Revision 1.23  1999/09/07 04:56:54  sjboddie
-   added GPL notice
-
-   Revision 1.22  1999/08/20 01:00:22  sjboddie
-   split some of the larger functions up to simplify the creation of
-   collection specific receptionists
-
-   Revision 1.21  1999/08/11 23:28:03  sjboddie
-   -added support for html classifier
-   - removed _random_ macro - now use _blank for detach page
-
-   Revision 1.20  1999/08/10 23:16:39  sjboddie
-   a couple of small changes to get format options DocumentArrowsBottom
-   and DocumentArrowsTop working correctly
-
-   Revision 1.19  1999/08/10 22:40:01  sjboddie
-   added some more format options including the ability to format the
-   document text
-
-   Revision 1.18  1999/08/09 04:25:18  sjboddie
-   moved OID translation stuff from documentaction::define_external_macros
-   to receptionist
-
-   Revision 1.17  1999/08/09 02:13:53  sjboddie
-   fixed small bug in ShowSectionTitles
-
-   Revision 1.16  1999/08/03 03:30:47  sjboddie
-   a few small changes related to new format options
-
-   Revision 1.15  1999/07/30 02:18:49  sjboddie
-   -added collectinfo argument to some functions
-   -caught up with changes to browsetools (allowing nested classifications)
-   -added showtoppage format option
-
-   Revision 1.14  1999/07/21 05:01:09  sjboddie
-   fixed up wrapping of classificationlinks
-
-   Revision 1.13  1999/07/20 02:59:54  sjboddie
-   List and AZList classifications now use format strings
-
-   Revision 1.12  1999/07/16 00:19:01  sjboddie
-   some changes to the way quoted queries are handled
-
-   Revision 1.11  1999/07/07 05:47:41  sjboddie
-   changed around the way browsetools works
-
-   Revision 1.10  1999/06/29 01:46:44  sjboddie
-   now sets a _navigationbar_ macro even if there aren't any
-   classifications (it will just have the 'search' button
-
-   Revision 1.9  1999/06/27 22:05:58  sjboddie
-   now set a _thisOID_ macro for use in displaying images
-
-   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
-   when page is detached as the javascript close() function I was using is
-   too unreliable over different browsers
-   note that in my last comment I meant the "cl" arg (not the "c" arg).
-
-   Revision 1.6  1999/06/16 23:53:15  sjboddie
-   tidied a few things up. documentaction::define_external_macros now
-   resets the "c" arg if it's set to something stupid by the .xx suffixes
-
-   Revision 1.5  1999/06/16 03:10:49  sjboddie
-   define_internal_macros() now sets _pagetitle_ macro to document's title
-   (including parents of current document)
-
-   Revision 1.4  1999/06/15 01:55:29  sjboddie
-   - got text highlighting working
-   - got multiple collections working (now outputs error message if an
-     attempt is made to get a document when the "c" arg isn't set.
-
-   Revision 1.3  1999/06/08 04:29:37  sjboddie
-   added argsinfo to the call to check_cgiargs to make it easy to set
-   args to their default if they're found to be screwed up
-
-   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
-   old browseaction)
-
-   Revision 1.2  1999/03/29 02:14:27  sjboddie
-
-   More changes to browseaction
-
-   Revision 1.1  1999/03/25 03:09:40  sjboddie
-
-   subjectbrowseaction became browseaction
-
-
- */
-
 
 #include <string.h>
@@ -183 +33 @@
 
 documentaction::documentaction () {
+  recpt = NULL;
+
 
   // this action uses cgi variables "a", "d", "cl",
@@ -500 +352 @@
   if (collectproto == NULL) return;
   
+  if (recpt == NULL) {
+    logout << "ERROR (documentaction::define_external_macros): This action does not contain\n"
+       << "      information about any receptionists. The method set_receptionist was\n"
+       << "      probably not called from the module which instantiated this action.\n";
+    return;
+  }
+
   outconvertclass text_t2ascii;
   comerror_t err;
@@ -505 +364 @@
   FilterResponse_t response;
   text_tset metadata;
-
 
   // get info on current collection and load up formatinfo
@@ -513 +371 @@
   // fix it ... maybe - Stefan.
   ColInfoResponse_t cinfo;
+
   collectproto->get_collectinfo (collection, cinfo, err, logout);
   load_formatinfo (cinfo.format, args.getintarg("gt"));
+  //  ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, collection, logout);
+  //  if (cinfo == NULL) {
+  //    logout << "ERROR (documentaction::define_external_macros): get_collectinfo_ptr returned NULL\n";
+  //    return;
+  //  }
+  //load_formatinfo (cinfo->format, args.getintarg("gt"));
 
   if (formatinfo.DocumentUseHTML) {
@@ -738 +603 @@
 
     metadata.insert ("archivedir");
-    
+
+    OptionValue_tarray options;
+    // we need to know what the query was for the z3950proto
+    if (collectproto->get_protocol_name()=="z3950proto") {
+      OptionValue_t opt;
+      opt.name="Query";
+      opt.value=args["q"];
+      options.push_back(opt);
+    }
+
     // get metadata for this document and it's parents
-    if (get_info (arg_d, collection, metadata, true, collectproto, response, logout)) {
+    if (get_info (arg_d, collection, metadata, options, 
+          true, collectproto, response, logout)) {
       disp.setmacro ("header", "document", "_textheader_");
 
@@ -1101 +976 @@
   textout << outconvert << disp << buffer;
 }
-
-
-
-
-
-
-
-
-
-
-