Changeset 1347 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

2000-08-03T17:21:26+12:00 (24 years ago)

Author:

jrm21

Message:

merged z39.50 receptionist stuff into main trunk (along with the mgpp stuff)

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -365 +365 @@
   text_tset metadata;
 
-  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"));
+  // get info on current collection and load up formatinfo
+  // I'd prefer not to do this here as we're getting 
+  // collection info every time (and probably also getting
+  // it in other places some of the time) - One day I'll
+  // 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) {
@@ -594 +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_");