Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/documentaction.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/documentaction.cpp (modified) (5 diffs)

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

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.37.2.3  2000/07/12 22:21:37  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+
+   Revision 1.39  2000/07/05 21:49:31  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.37.2.2  2000/06/30 00:46:16  nzdl
    caught New_Config_Format-branch up with changes to trunk
 
+   Revision 1.38  2000/05/04 05:18:46  sjboddie
+   attempting to get end-user collection building to work under windows
+
    Revision 1.37.2.1  2000/04/09 23:16:46  sjboddie
    Added DocumentColumns stuff to New_Config_Format-branch branch
+
+   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.36  2000/04/03 07:26:28  sjboddie
@@ -187 +205 @@
 
 documentaction::documentaction () {
+  recpt = NULL;
+
 
   // this action uses cgi variables "a", "d", "cl",
@@ -632 +652 @@
   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;
@@ -638 +665 @@
   text_tset metadata;
 
-
-  // 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) {
@@ -658 +682 @@
       disp.setmacro ("gsdltop", "Global", "documenttop");
     }
-    text_tmap::iterator it = cinfo.format.find ("homepage");
-    if (it != cinfo.format.end()) {
+    text_tmap::iterator it = cinfo->format.find ("homepage");
+    if (it != cinfo->format.end()) {
       text_t httppagehome;
       if (get_link (args, protos, (*it).second, httppagehome, logout))