Changeset 1485 for trunk/gsdl/src/recpt/collectoraction.cpp

Timestamp:

2000-08-31T20:07:53+12:00 (24 years ago)

Author:

sjboddie

Message:

More improvements to collector

File:

• trunk/gsdl/src/recpt/collectoraction.cpp (modified) (11 diffs)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -251 +251 @@
   // note that the "bildstatus" and "bildframe1" pages don't actually do anything
   // functional so we don't need to worry about authenticating them (it's the 
-  // underlying "bild" page that does the building (anc creates the frameset))
+  // underlying "bild" page that does the building (and creates the frameset))
   // This helps us overcome a bit of a problem we have with multiple pages trying
   // to read from the key.db database at the same time.
@@ -324 +324 @@
     // turned on).
     update_cfgfile_clone (args, logout);
+
+    // if cloning has just been turned on we'll also copy the rest of the files 
+    // (excluding collect.cfg which we've already done) from the cloned collections
+    // etc directory to the new collection.
+    if (args["bc1clone"] == "1") {
+      text_t clone_etc = filename_cat(gsdlhome, "collect", args["bc1clonecol"], "etc");
+      text_t new_etc = filename_cat(get_collectdir(args), args["bc1dirname"], "etc");
+      text_tarray files;
+
+      if (read_dir (clone_etc, files)) {
+    text_tarray::const_iterator here = files.begin();
+    text_tarray::const_iterator end = files.end();
+    while (here != end) {
+      if (*here != "collect.cfg" && *here != "collect.cfg.org") {
+        file_copy (filename_cat(clone_etc, *here), filename_cat(new_etc, *here));
+      }
+      here ++;
+    }
+      } else {
+    outconvertclass text_t2ascii;
+    logout <<text_t2ascii << "collectoraction::check_cgiargs couldn't read from " 
+           << clone_etc << " directory\n";
+      }
+    }
   }
   
@@ -578 +602 @@
 }
 
-// set the _fullnamemenu_ macro
+// set the _fullnamemenu_ macro (and _warnindex_ if we're on the "srce" page)
 void collectoraction::set_fullnamemenu (displayclass &disp, cgiargsclass &args, 
                     recptprotolistclass *protos, ostream &logout) {
@@ -633 +657 @@
         dirnames.push_back(*collist_here);
         fullnames.push_back(collectionname);
-        // check to see if the "collection" is writable
+        // check to see if the collection is writable
         if (collection_protected (*collist_here)) write_protected.push_back(true);
         else write_protected.push_back(false);
+
         if (*collist_here == currentname) selected_index = index;       
-        
         index ++;
       }
@@ -647 +671 @@
   }
 
-  bool have_one = false;
+  bool first = true;
+  text_t warnindex;
   text_t fullnamemenu = "<select name=\"bc1dirname\">\n";
-  if (current_page == "srce") fullnamemenu = "<select name=\"bc1clonecol\">\n";
+  if (current_page == "srce") fullnamemenu = "<select name=\"bc1clonecol\" onChange=\"menuchange();\">\n";
   for (int i = 0; i < index; i ++) {
     // don't want write protected collections in list on "change existing
     // collection" page
     if (write_protected[i] && current_page == "existing") continue;
-    have_one = true;
     fullnamemenu += "<option value=\"" + dirnames[i] + "\"";
     if (i == selected_index) fullnamemenu += " selected";
@@ -660 +684 @@
     fullnamemenu += fullnames[i];
     if (write_protected[i]) fullnamemenu += " <b>(write protected)</b>";
+    fullnamemenu.push_back ('\n');
+    
+    // add to Warnindex if collection uses any dubious plugins 
+    // (if creating clone collection list)
+    if (current_page == "srce") {
+      if (!first) warnindex.push_back(',');
+      if (uses_weird_plugin (dirnames[i])) {
+    warnindex += text_t (1);
+      } else {
+    warnindex += text_t (0);
+      }
+    }
+    first = false;
   }
   fullnamemenu += "</select>\n";
-  if (have_one) disp.setmacro ("fullnamemenu", "collector", fullnamemenu);
+
+  if (!first) {
+    disp.setmacro ("fullnamemenu", "collector", fullnamemenu);
+    if (current_page == "srce")
+      disp.setmacro ("warnindex", "collector", warnindex);
+  }
 }
 
@@ -718 +760 @@
   if (file_exists (bld_file + ".download")) {
     statusline = "Downloading files ...<br>\n";
-    statusline += file_tail (bld_file + ".download");
+    statusline += file_tail (bld_file + ".download", 1);
   } else if (file_exists (bld_file + ".import")) {
     statusline = "Importing collection ...<br>\n";
-    statusline += file_tail (bld_file + ".import");
+    statusline += file_tail (bld_file + ".import", 1);
   } else if (file_exists (bld_file + ".build")) {
     statusline = "Building collection ...<br>\n";
-    statusline += file_tail (bld_file + ".build");
+    statusline += file_tail (bld_file + ".build", 1);
   } else {
     statusline += "creating collection ...<br>\n";
-    statusline += file_tail (bld_file);
+    statusline += file_tail (bld_file, 1);
   }
 
@@ -745 +787 @@
   // _statusline_ -- if displaying the bildstatus page
   // _header_ -- may be set for pages that require it
+  // _faillog_ - set to last 6 lines of .bld file if build failed
 
   text_t &collector_page = args["cp"];
@@ -797 +840 @@
     collectorbar += get_button (collector_page, "green", "conf", true);
     collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "grey", "bild", false);
+    collectorbar += get_button (collector_page, "green", "bild", true);
     collectorbar += "<td>_icongreyarrow_</td>\n";
     collectorbar += get_button (collector_page, "grey", "view", false);
@@ -857 +900 @@
     collectorbar += "<td>_icongreyarrow_</td>\n";
     collectorbar += get_button (collector_page, "grey", "view", false);
+  }
+
+  if (collector_page == "bildfail") {
+    text_t bldlog = filename_cat(gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld");
+    text_t rawlog = file_tail (bldlog, 6);
+    // we'll shove in some <br> tags where \n's occur
+    text_t faillog;
+    text_t::const_iterator here = rawlog.begin();
+    text_t::const_iterator end = rawlog.end();
+    while (here != end) {
+      if (*here == '\n') faillog += "<br>";
+      faillog.push_back (*here);
+      here ++;
+    }
+    disp.setmacro ("faillog", "collector", faillog);
   }
 
@@ -1229 +1287 @@
   }
 }
+
+// checks to see if any of the plugins in pluginset occur in 
+// collections configuration file
+bool collectoraction::uses_weird_plugin (const text_t &collection) {
+
+  text_tset pluginset;
+  pluginset.insert ("HBPlug");
+
+  text_t cfgfile_content;
+  text_t cfgfile_name = filename_cat (gsdlhome, "collect", collection, "etc", "collect.cfg");
+  text_t pluginstr, pluginname;
+
+  if (read_file (cfgfile_name, cfgfile_content)) {
+    text_t::const_iterator here = cfgfile_content.begin();
+    text_t::const_iterator end = cfgfile_content.end();
+    while (here != end) {
+      here = findchar (here, end, 'p');
+      if (here == end) break;
+      if ((here+6 < end) && (substr (here, here+6) == "plugin")) {
+    getdelimitstr (here+6, end, '\n', pluginstr);
+    text_t::const_iterator hp = pluginstr.begin();
+    text_t::const_iterator ep = pluginstr.end();
+    bool found = false;
+    // remove any leading whitespace, trailing options etc.
+    while (hp != ep) {
+      if (*hp == '\t' || *hp == ' ' || *hp == '\n') {
+        if (found) break;
+      } else {
+        pluginname.push_back (*hp);
+        found = true;
+      }
+      hp ++;
+    }
+    text_tset::const_iterator it = pluginset.find (pluginname);
+    if (it != pluginset.end()) return true; // found matching plugin
+    pluginname.clear();
+      }
+      here ++;
+    }
+  }
+  return false;
+}