Changeset 1129 for trunk/gsdl/src/recpt

Timestamp:

2000-04-20T10:30:25+12:00 (24 years ago)

Author:

sjboddie

Message:

tidied up status pages and end-user collection building

Location:

trunk/gsdl/src/recpt

Files:

• authenaction.cpp (modified) (3 diffs)
• buildaction.cpp (modified) (1 diff)
• statusaction.cpp (modified) (4 diffs)
• statusaction.h (modified) (1 diff)

trunk/gsdl/src/recpt/authenaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.10  2000/04/19 22:30:23  sjboddie
+   tidied up status pages and end-user collection building
+
    Revision 1.9  1999/11/01 21:11:35  sjboddie
    changed arguments passed to many functions
@@ -300 +303 @@
                          + "_"));
   // change style of header and footer if page is a frame
-  if (args["sp"] != "frameset") {
+  if ((args["sp"].empty()) || (args["sp"] == "frameset")) {
     disp.setmacro ("header", "authen", "_status:infoheader_(Log in)");
     disp.setmacro ("header", "authenok", "_status:infoheader_(Log in)");
@@ -306 +309 @@
     disp.setmacro ("footer", "authenok", "_status:infofooter_(Log in)");
   }
-  else {
-    //    disp.setmacro ("header", "authen", "_Global:header_"); //****
-    //    disp.setmacro ("header", "authenok", "_Global:header_");
-    //    disp.setmacro ("footer", "authen", "_Global:footer_");
-    //    disp.setmacro ("footer", "authenok", "_Global:footer_");
-    disp.setmacro ("header", "authen", "_:header_");
-    disp.setmacro ("header", "authenok", "_:header_");
-    disp.setmacro ("footer", "authen", "_:footer_");
-    disp.setmacro ("footer", "authenok", "_:footer_");
-  }
-    
 
   // get a list of saved configuration arguments (if possible)

trunk/gsdl/src/recpt/buildaction.cpp

@@ -80 +80 @@
 bool buildaction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
                  ostream &/*logout*/) {
-  if ((args["bca"] != "buildstatus") && (args["bca"] != "collog"))
+
+  text_t &arg_bca = args["bca"];
+  if (!((arg_bca == "buildstatus") || (arg_bca == "collog") || (arg_bca == "blankpage") 
+    || ((arg_bca == "buildcol") && (args["wizard"] == "buildexec"))))
     {
       // authenticate the user if authentication is avaiable

trunk/gsdl/src/recpt/statusaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.26  2000/04/19 22:30:23  sjboddie
+   tidied up status pages and end-user collection building
+
    Revision 1.25  2000/02/29 21:00:31  sjboddie
    fixed some compiler warnings
@@ -138 +141 @@
 }
 
-void statusaction::output_welcome (cgiargsclass &/*args*/, displayclass &disp, 
-                  outconvertclass &outconvert, 
-                  ostream &textout, ostream &/*logout*/) {
-  textout << outconvert << disp << "_status:infoheader_(_titlewelcome_)\n"
-    "_status:welcome_\n"
-    "_status:infofooter_\n";
+void statusaction::output_welcome (cgiargsclass &/*args*/, recptprotolistclass *protos, 
+                   displayclass &disp, outconvertclass &outconvert, 
+                   ostream &textout, ostream &logout) {
+
+  textout << outconvert << disp 
+      << "_status:infoheader_(_titlewelcome_)\n"
+      << "_status:welcome_"
+      << "<center><table width=_pagewidth_>\n"
+      << "<th align=left>abbrev.</th><th align=left>collection</th>"
+      << "<th align=left>public?</th><th align=left>running?</th></tr>\n";
+
+  recptprotolistclass::iterator rprotolist_here = protos->begin();
+  recptprotolistclass::iterator rprotolist_end = protos->end();
+  while (rprotolist_here != rprotolist_end) {
+    if ((*rprotolist_here).p != NULL) {
+      text_t protoname = (*rprotolist_here).p->get_protocol_name();
+      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();
+
+    while (collist_here != collist_end) {
+
+        textout << outconvert << disp
+            << "<tr><td><a href=\"_gwcgi_?e=_compressedoptions_&a=status&sp=collectioninfo&pr="
+            << protoname
+            << "&c="
+            << *collist_here
+            << "\">"
+            << *collist_here 
+            << "</a></td>";
+
+      ColInfoResponse_t cinfo;
+      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
+      if (err == noError) {
+        text_t collname = *collist_here;
+        text_tmap::iterator it = cinfo.collectionmeta.find("collectionname");
+        if (it != cinfo.collectionmeta.end()) collname = (*it).second;
+
+        textout << "<td>";
+        if (cinfo.buildDate > 0)
+          textout << outconvert << disp 
+              << "<a href=\"_httppagex_(about)&c=" << *collist_here
+              << "\" target=_top>";
+
+        textout << outconvert << disp << collname;
+
+        if (cinfo.buildDate > 0) textout << "</a>";
+
+        textout << "</td>";
+
+        if (cinfo.isPublic) textout << "<td>yes</td>";
+        else textout << "<td>no</td>";
+        
+        if (cinfo.buildDate > 0)
+          textout << outconvert << "<td>yes</td>";
+        else
+          textout << "<td>no</td>";
+        
+      } else {
+        textout << "<td></td><td></td><td></td>";
+      }
+
+      textout << "</tr>\n";
+      collist_here ++;
+    }
+      }
+    }
+    rprotolist_here ++;
+  }
+
+  textout << "</table></center>\n";
+  textout << outconvert << disp << "_status:infofooter_\n";
 }
 
@@ -856 +928 @@
 }
 
-bool statusaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/, 
+bool statusaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
                   browsermapclass * /*browsers*/, displayclass &disp, 
                   outconvertclass &outconvert, ostream &textout, 
@@ -898 +970 @@
   if (arg_sp == "frameset") output_frameset (args, disp, outconvert, textout, logout);
   else if (arg_sp == "select") output_select (args, disp, outconvert, textout, logout);
-  else if (arg_sp == "welcome") output_welcome (args, disp, outconvert, textout, logout);
+  else if (arg_sp == "welcome") output_welcome (args, protos, disp, outconvert, textout, logout);
   else if (arg_sp == "generalinfo") output_generalinfo (args, disp, outconvert, textout, logout);
   else if (arg_sp == "argumentinfo") output_argumentinfo (args, disp, outconvert, textout, logout);

trunk/gsdl/src/recpt/statusaction.h

@@ -44 +44 @@
             outconvertclass &outconvert, 
             ostream &textout, ostream &logout);
+
   void output_select (cgiargsclass &args, displayclass &disp, 
               outconvertclass &outconvert, 
               ostream &textout, ostream &logout);
 
-  void output_welcome (cgiargsclass &args, displayclass &disp, 
-               outconvertclass &outconvert, 
-               ostream &textout, ostream &logout);
+  void output_welcome (cgiargsclass &args, recptprotolistclass *protos,
+               displayclass &disp, outconvertclass &outconvert, 
+               ostream &textout, ostream &logout);
+
   void output_generalinfo (cgiargsclass &args, displayclass &disp, 
                outconvertclass &outconvert, 
                ostream &textout, ostream &logout);
+
   void output_argumentinfo (cgiargsclass &args, displayclass &disp, 
                 outconvertclass &outconvert, 
                 ostream &textout, ostream &logout);
+
   void output_actioninfo (cgiargsclass &args, displayclass &disp, 
               outconvertclass &outconvert, 
               ostream &textout, ostream &logout);
+
   void output_protocolinfo (cgiargsclass &args, displayclass &disp, 
                 outconvertclass &outconvert, 
                 ostream &textout, ostream &logout);
+
   void output_collectioninfo (cgiargsclass &args, displayclass &disp, 
                   outconvertclass &outconvert, 
                   ostream &textout, ostream &logout);
+
   void output_initlog (cgiargsclass &args, displayclass &disp, 
                outconvertclass &outconvert, 
                ostream &textout, ostream &logout);
+
   void output_errorlog (cgiargsclass &args, displayclass &disp, 
             outconvertclass &outconvert,