Changeset 1437 for trunk/gsdl/src/recpt

Timestamp:

2000-08-21T16:47:48+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (7 diffs)
• collectoraction.h (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -511 +511 @@
   while (rprotolist_here != rprotolist_end) {
     if ((*rprotolist_here).p != NULL) {
+
+      // don't include z39.50 collection
+      if ((*rprotolist_here).p->get_protocol_name () == "z3950proto") {
+    rprotolist_here ++;
+    continue;
+      }
+
       text_tarray collist;
       comerror_t err;
@@ -601 +608 @@
 }
 
+// set the _statusline_ macro
+void collectoraction::set_statusline (displayclass &disp, const text_t &collection, ostream &logout) {
+
+  // the build command creates .bld.download, .bld.import, and .bld.build files (in that
+  // order) and deletes them (also in that order) when each stage is complete. the .bld
+  // file is the concatenation of all these files.
+  text_t bld_file = filename_cat (gsdlhome, "tmp", collection + ".bld");
+  text_t statusline;
+
+  if (file_exists (bld_file + ".download")) {
+    statusline = "Downloading files ...<br>";
+    statusline += file_tail (bld_file + ".download");
+  } else if (file_exists (bld_file + ".import")) {
+    statusline = "Importing collection ...<br>";
+    statusline += file_tail (bld_file + ".import");
+  } else if (file_exists (bld_file + ".build")) {
+    statusline = "Building collection ...";
+    statusline += file_tail (bld_file + ".build");
+  } else {
+    statusline += file_tail (bld_file);
+  }
+
+  disp.setmacro ("statusline", "collector", statusline);
+
+}
+
 void collectoraction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                           recptprotolistclass *protos, ostream &logout) {
@@ -610 +643 @@
   //                   collection" page
   // _cfgfile_ -- if displaying the "configure collection" page
+  // _statusline_ -- if displaying the bildstatus page
+  // _pagebanner_ -- may be set to _collector:plainbanner_ for some pages
 
   text_t &collector_page = args["cp"];
@@ -617 +652 @@
   // set _pagescriptextra_ macro to _cpagescriptextra_
   disp.setmacro ("pagescriptextra", "collector", "_" + collector_page + "scriptextra_");
+
+  // set _pagebanner_ for those pages that don't want a fancy header (e.g. those
+  // displayed in frames
+  if (collector_page == "bildstatus") {
+    disp.setmacro ("pagebanner", "collector", "_plainbanner_");
+  }
 
   // set the collectorbar macro
@@ -696 +737 @@
   if (collector_page == "conf") 
     set_cfgfile (disp, args["bc1dirname"], logout);
+  if (collector_page == "bildstatus")
+    set_statusline (disp, args["bc1dirname"], logout);
 }
 
@@ -705 +748 @@
   text_t &collector_page = args["cp"];
   text_t &collection = args["bc1dirname"];
-  text_t message;
-
-  if (do_mkcol) {
-    // execute mkcol.pl (do_mkcol is set from within check_cgiargs)
-    text_t mkcol_cmd = "perl ";
-    mkcol_cmd += filename_cat (gsdlhome, "bin", "script", "mkcol.pl");
-    mkcol_cmd += " -creator \"" + args["bc1contactemail"] + "\"";
-    mkcol_cmd += " -title \"" + args["bc1fullname"] + "\"";
-    mkcol_cmd += " -about \"" + carriage_replace (args["bc1aboutdesc"], 0) + "\" ";
-    mkcol_cmd += collection;
-    char *mkcol_cmdc = mkcol_cmd.getcstr();
-    system (mkcol_cmdc);
-    delete mkcol_cmdc;
-    
-    // make sure it went ok
-    text_t cfgfile = filename_cat (gsdlhome, "collect", collection, 
-                   "etc", "collect.cfg");
-    if (!file_writable (cfgfile)) message = "mkcolfail";
-    do_mkcol = false; // reset for fast-cgi
-  }
 
   if (collector_page == "bild") {
@@ -759 +782 @@
 #endif
     delete build_cmdc;
-  }
-
-  if (args["bc1dodelete"] == "1") {
-    // delete bcidirname collection
-    if (collection_protected (collection)) {
-      message = "delinvalid";
-
+
+    // don't want header and stuff for build page as it uses frames
+    textout << outconvert << disp << ("_collector:bildcontent_\n");
+
+  } else {
+
+    // not bild page
+
+    text_t message;
+
+    if (do_mkcol) {
+      // execute mkcol.pl (do_mkcol is set from within check_cgiargs)
+      text_t mkcol_cmd = "perl ";
+      mkcol_cmd += filename_cat (gsdlhome, "bin", "script", "mkcol.pl");
+      mkcol_cmd += " -creator \"" + args["bc1contactemail"] + "\"";
+      mkcol_cmd += " -title \"" + args["bc1fullname"] + "\"";
+      mkcol_cmd += " -about \"" + carriage_replace (args["bc1aboutdesc"], 0) + "\" ";
+      mkcol_cmd += collection;
+      char *mkcol_cmdc = mkcol_cmd.getcstr();
+      system (mkcol_cmdc);
+      delete mkcol_cmdc;
+      
+      // make sure it went ok
+      text_t cfgfile = filename_cat (gsdlhome, "collect", collection, 
+                     "etc", "collect.cfg");
+      if (!file_writable (cfgfile)) message = "mkcolfail";
+      do_mkcol = false; // reset for fast-cgi
+    }
+
+    if (args["bc1dodelete"] == "1") {
+      // delete bcidirname collection
+      if (collection_protected (collection)) {
+    message = "delinvalid";
+    
+      } else {
+    
+    text_t delete_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "delcol.pl");
+    delete_cmd += " -f " + collection;
+    char *delete_cmdc = delete_cmd.getcstr();
+    int rv = system (delete_cmdc);
+    delete delete_cmdc;
+    if (rv != 0) {
+      // deletion failed -- permissions?
+      message = "delpermission";
+    } else {
+      message = "delsuccess";
+    }
+      }
+    }
+    
+    if (clone_failed) {
+      // clone_failed is set from check_cgiargs if an attempt was made 
+      // to clone an invalid collection
+      message = "clonefail";
+      clone_failed = false;
+    }
+    
+    if (message.empty()) {
+      textout << outconvert << disp << ("_collector:header_\n")
+          << ("_collector:" + collector_page + "content_\n")
+          << ("_collector:footer_\n");
     } else {
-
-      text_t delete_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "delcol.pl");
-      delete_cmd += " -f " + collection;
-      char *delete_cmdc = delete_cmd.getcstr();
-      int rv = system (delete_cmdc);
-      delete delete_cmdc;
-      if (rv != 0) {
-    // deletion failed -- permissions?
-    message = "delpermission";
-      } else {
-    message = "delsuccess";
-      }
-    }
-  }
-
-  if (clone_failed) {
-    // clone_failed is set from check_cgiargs if an attempt was made 
-    // to clone an invalid collection
-    message = "clonefail";
-    clone_failed = false;
-  }
-  
-  if (message.empty()) {
-    textout << outconvert << disp << ("_collector:header_\n")
-        << ("_collector:" + collector_page + "content_\n")
-        << ("_collector:footer_\n");
-  } else {
-    textout << outconvert << disp << ("_collector:header_\n")
-        << ("_collector:" + message + "content_\n")
-        << ("_collector:footer_\n");
-  }
-
+      textout << outconvert << disp << ("_collector:header_\n")
+          << ("_collector:" + message + "content_\n")
+          << ("_collector:footer_\n");
+    }
+  }
   return true;
 }

trunk/gsdl/src/recpt/collectoraction.h

@@ -50 +50 @@
   void set_cfgfile (displayclass &disp, const text_t &dirname, ostream &logout);
 
+  void set_statusline (displayclass &disp, const text_t &collection, ostream &logout);
+
   void update_cfgfile_clone (cgiargsclass &args, ostream &logout);