Changeset 1485 for trunk

Timestamp:

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

Author:

sjboddie

Message:

More improvements to collector

Location:

trunk/gsdl

Files:

• bin/script/build (modified) (1 diff)
• bin/script/filecopy.pl (modified) (1 diff)
• lib/fileutil.cpp (modified) (3 diffs)
• lib/fileutil.h (modified) (1 diff)
• macros/collect.dm (modified) (10 diffs)
• src/recpt/collectoraction.cpp (modified) (11 diffs)
• src/recpt/collectoraction.h (modified) (1 diff)

trunk/gsdl/bin/script/build

@@ -140 +140 @@
         # we assume anything not beginning with http:// or ftp://
         # is a file or directory on the local file system.
-        $download_dir =~ s/^file:\/\///;
+        $download_dir =~ s/^file:(\/\/)?//;
         
         if (-e $download_dir) {

trunk/gsdl/bin/script/filecopy.pl

@@ -54 +54 @@
     my $full_importname 
     = &util::filename_cat($collectdir, $dirname, "import");
-
-    print $out "full_importname: $full_importname\n";
 
     # split argv into 2 lists: files and directories

trunk/gsdl/lib/fileutil.cpp

@@ -280 +280 @@
 }
 
-// returns the last line (or last 256 characters)
-// of filename file
+
+text_t file_tail (const text_t &filename, int numlines) {
+  if (numlines < 1) numlines = 1;
+  int numchars = 256*numlines;
+
+  text_tarray lines;
+  text_t ret;
+
+  char *filenamec = filename.getcstr();
+  char linec[256];
+  ifstream file_in (filenamec);
+  delete filenamec;
+  if (file_in) {
+
+    // this should be here to keep things reasonably fast
+    // when there's a long file to tail but I can't work out 
+    // how to tell when it's rewound past the beginning of the file 
+    // (which causes some problems) 
+
+    //    file_in.seekg (-numchars, ios::end);
+
+    while (!file_in.eof()) {
+      file_in.getline (linec, 256);
+      ret.setcstr(linec);
+      text_t::const_iterator here = ret.begin();
+      text_t::const_iterator end = ret.end();
+      // make sure line has content
+      while (here != end) {
+    if (*here != '\n' && *here != ' ') {
+      lines.push_back (ret);
+      break;
+    }
+    here ++;
+      }
+    }
+    file_in.close();
+  }
+
+  ret.clear();
+  int numlinesgot = lines.size();
+  int sindex = 0;
+  if (numlinesgot > numlines) sindex = numlinesgot - numlines;
+  for (int i = sindex; i < numlinesgot; i++) {
+    ret += lines[i] + "\n";
+  }
+
+  return ret;
+}
+
+// returns the last numlines lines (or last numlines*256 
+// characters) of file
+/*
 text_t file_tail (const text_t &filename) {
+
 
   text_t return_str, tmpstr;
   char *filenamec = filename.getcstr();
   char linec[256];
-
 
   ifstream file_in (filenamec);
@@ -313 +363 @@
   return return_str;
 }
-
+*/
 #ifdef __WIN32__
 
@@ -343 +393 @@
 
 #endif
+
+// read in file from filename and load into content
+bool read_file (const text_t &filename, text_t &content) {
+
+  content.clear();
+
+  char *filenamec = filename.getcstr();
+#ifdef GSDL_USE_IOS_H
+  ifstream file_in (filenamec, ios::in | ios::nocreate);
+#else
+  ifstream file_in (filenamec, ios::in);
+#endif
+  delete filenamec;
+
+  if (file_in) {
+    char c;
+    file_in.get(c);
+    while (!file_in.eof ()) {
+      content.push_back(c);
+      file_in.get(c);
+    }
+    file_in.close();
+  } else {
+    return false;
+  }
+  return true;
+}

trunk/gsdl/lib/fileutil.h

@@ -53 +53 @@
 bool file_copy (const text_t &fromfile, const text_t &tofile);
 
-text_t file_tail (const text_t &filename);
+text_t file_tail (const text_t &filename, int numlines);
 
 // returns true if directory created successfully
 bool mk_dir (const text_t &dirname);
 
+bool read_file (const text_t &filename, text_t &content);
+
 #endif

trunk/gsdl/macros/collect.dm

@@ -19 +19 @@
 _gstimage_ [v=1] {<a href="_1_" target="\_top">_5_</a><br>}
 
-
-
 # a plain header for those pages that need it (the _pagebanner_ macro
 # will be set to this by the server for those pages.
 _plainbanner_ {}
+
+# dont want links to "help" or "preferences" pages from within
+# collector
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
 
 #######################################################################
@@ -79 +85 @@
 _httpconf_ {_gwcgi_?e=_compressedoptions_&cp=conf}
 _httpbild_ {_gwcgi_?e=_compressedoptions_&cp=bild}
-_httpview_ {_gwcgi_?e=_compressedoptions_&a=p&p=about&c=_cgiargbc1dirname_}
+_httpview_ {_gwcgi_?a=p&p=about&c=_cgiargbc1dirname_}
 _httpdel_  {javascript:do_delete();}
 
@@ -429 +435 @@
 function check\_submit (gotopage) \{
   var form = document.collectorform;
-  if (form.bc1inputdir1.value.match(/^\\s*$/) &&
-      form.bc1inputdir2.value.match(/^\\s*$/) &&
-      form.bc1inputdir3.value.match(/^\\s*$/) &&
-      form.bc1inputdir4.value.match(/^\\s*$/))
+  var found = 0;
+  var i = 0;
+  if (!form.bc1inputdir1.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir1.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel1.selectedIndex;
+      form.bc1inputdir1.value = form.sel1.options[i].value + form.bc1inputdir1.value;
+    \}
+    found = 1;
+  \}
+  if (!form.bc1inputdir2.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir2.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel2.selectedIndex;
+      form.bc1inputdir2.value = form.sel2.options[i].value + form.bc1inputdir2.value;
+    \}
+    found = 1;
+  \}
+  if (!form.bc1inputdir3.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir3.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel3.selectedIndex;
+      form.bc1inputdir3.value = form.sel3.options[i].value + form.bc1inputdir3.value;
+    \}
+    found = 1;
+  \}
+  if (!form.bc1inputdir4.value.match(/^\\s*$/)) \{
+    if (!form.bc1inputdir4.value.match(/^\(http|ftp|file\):/)) \{
+      i = form.sel4.selectedIndex;
+      form.bc1inputdir4.value = form.sel4.options[i].value + form.bc1inputdir4.value;
+    \}
+    found = 1;
+  \}
+
+  if (!found)
   \{
     alert("At least one input source must be specified");
@@ -449 +483 @@
   \} else \{
     form.bc1clonechanged.value = 0;
+  \}
+  menuchange();
+\}
+
+function menuchange () \{
+  var form = document.collectorform;
+  var warnlist = new Array (_warnindex_);
+
+  if (warnlist[form.bc1clonecol.selectedIndex] == 1) \{
+    alert ("The collection you are cloning has a non-standard input file\\n" +
+           "format, and/or uses metadata specified in auxiliary files.  If your\\n" +
+       "new input lacks this information, some browsing facilities may not\\n" +
+           "work properly.");
   \}
 \}
@@ -499 +546 @@
 
 <h4>Input source:</h4>
-<input type=text name="bc1inputdir1" value="_cgiargbc1inputdir1_" size=72>
+_typeselect_(1,file)<input type=text name="bc1inputdir1" value="_cgiargbc1inputdir1_" size=60>
 <br>
-<input type=text name="bc1inputdir2" value="_cgiargbc1inputdir2_" size=72>
+_typeselect_(2,http)<input type=text name="bc1inputdir2" value="_cgiargbc1inputdir2_" size=60>
 <br>
-<input type=text name="bc1inputdir3" value="_cgiargbc1inputdir3_" size=72>
+_typeselect_(3,ftp)<input type=text name="bc1inputdir3" value="_cgiargbc1inputdir3_" size=60>
 <br>
-<input type=text name="bc1inputdir4" value="_cgiargbc1inputdir4_" size=72>
+_typeselect_(4,file)<input type=text name="bc1inputdir4" value="_cgiargbc1inputdir4_" size=60>
 <br>
 <font color="#909090">
@@ -525 +572 @@
 
 <p>_iconblankbar_
-<p>Remember, you can always revisit a previous stage by clicking its yellow
-button. 
+<p>Click one of the green buttons. If you are an advanced user you may want
+to adjust the collection configuration. Alternatively, go straight to the
+building stage. Remember, you can always revisit an earlier stage by
+clicking its yellow button.
 
 <p><center>
@@ -537 +586 @@
 </form>
 }
+
+_typeselect_ {<select name="sel_1_">
+<option value="file://" _If_("_2_" eq "file",selected)>file://
+<option value="http://" _If_("_2_" eq "http",selected)>http://
+<option value="ftp://" _If_("_2_" eq "ftp",selected)>ftp://
+</select>}
 
 _srcemenu_ {<input type=radio name=bc1clone onClick="clone_changed(1);" value=1 
@@ -622 +677 @@
 <frameset rows="*,150" border=0>
   <noframes><body bgcolor="#ffffff">
-  <p>You must have a frame enabled browser to view this.</p>
+  <p>You must have a frame enabled browser to obtain feedback
+  on how the building process is progressing. The collection <i>will</i>
+  continue to build as normal however.
+
+  <table>
+  <tr valign=center><td>
+  To stop the building process at any time, click here.
+  <br>The collection you are working on will remain intact.
+  </td>
+  <td><input type="submit" value="stop building"></td>
+  </table>
+
   </body>
   </noframes>
@@ -681 +747 @@
 status line below gives feedback on how the operation is progressing.
 <p>
-To stop the building process at any time, click here:
-<input type="submit" value="stop building">
+
+<table>
+<tr valign=center><td>
+To stop the building process at any time, click here.
 <br>The collection you are working on will remain intact.
+</td>
+<td><input type="submit" value="stop building"></td>
+</table>
+
 <p>
 If you leave this page (and have not cancelled the building process with
@@ -814 +886 @@
 <tr><td>
 <p>An error has occurred while attempting to build your collection.
+<br> The build log contains the following:
+<p>_faillog_
 </td></tr>
 </table></center>

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;
+}

trunk/gsdl/src/recpt/collectoraction.h

@@ -75 +75 @@
   text_t get_collectdir (cgiargsclass &args);
 
+  bool collectoraction::uses_weird_plugin (const text_t &collection);
+
 public:
   collectoraction ();