Changeset 793 for trunk

Timestamp:

1999-11-26T12:01:09+13:00 (24 years ago)

Author:

sjboddie

Message:

now need to be able to handle it if no collection is selected

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.22  1999/11/25 23:01:09  sjboddie
+   now need to be able to handle it if no collection is selected
+
    Revision 1.21  1999/11/03 22:50:13  sjboddie
    now defaults to home page
@@ -268 +271 @@
   text_t &arg_p = args["p"];
 
+  recptproto* collectproto = protos->getrecptproto (args["c"], logout);
+  if (collectproto != NULL) {
+    comerror_t err;
+    ColInfoResponse_t cinfo;
+    collectproto->get_collectinfo (args["c"], cinfo, err, logout);
+  
+    disp.setmacro ("numdocs", "Global", cinfo.numDocs);
+    unsigned long current_time = time(NULL);
+    unsigned long builddate = (current_time - cinfo.buildDate) / 86400;
+    disp.setmacro ("builddate", "Global", builddate);
+  }
+
   if (arg_p == "home") set_homeextra_macro (disp, protos, logout);
 
   else if (arg_p == "about" || arg_p == "help") {
-    // get pointer to collection server
-    recptproto* collectproto = protos->getrecptproto (args["c"], logout);
     if (collectproto == NULL) return;
-    
-    if (arg_p == "about") {
-      comerror_t err;
-      ColInfoResponse_t cinfo;
-      collectproto->get_collectinfo (args["c"], cinfo, err, logout);
-
-      disp.setmacro ("numdocs", "about", cinfo.numDocs);
-      unsigned long current_time = time(NULL);
-      unsigned long builddate = (current_time - cinfo.buildDate) / 86400;
-      disp.setmacro ("builddate", "about", builddate);
-    }
     
     // _textbrowseoptions_ and _numbrowseoptions_