Changeset 1425 for trunk

Timestamp:

2000-08-18T17:40:07+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl

Files:

• etc/main.cfg (modified) (1 diff)
• macros/collect.dm (modified) (13 diffs)
• src/recpt/collectoraction.cpp (modified) (12 diffs)
• src/recpt/collectoraction.h (modified) (1 diff)

trunk/gsdl/etc/main.cfg

@@ -6 +6 @@
                 gsdl.dm english.dm chinese.dm french.dm german.dm maori.dm \
                 english2.dm french2.dm arabic.dm spanish.dm \
-                home.dm
+                home.dm collect.dm
 
 status          enabled

trunk/gsdl/macros/collect.dm

@@ -9 +9 @@
 # this is just like the _gsimage_ macro but it calls the check_submit() javascript
 # function instead of linking directly to the page (_1_ argument isn't used)
-_gsjimage_ {<a href="javascript:check_submit('_4_');" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);"><img
+_gsjimage_ {<a href="javascript:check\_submit('_4_');" onMouseover="roll('_4_',1);" onMouseOut="roll('_4_',0);"><img
 name="_4_" src="_2_" onLoad="gbutton(this,'_3_');" border=0 alt="_5_"></a>}
 
-_gsimage_ [v=1] {<a href="#" onClick="check_submit(_4_);">_5_</a><br>}
+_gsimage_ [v=1] {<a href="#" onClick="check\_submit(_4_);">_5_</a><br>}
 
 
@@ -106 +106 @@
 <form name="collectorform" method=post action="_gwcgi_">
 <input type=hidden name="e" value="_decodedcompressedoptions_">
-<input type=hidden name="pcp" value="_cgiargcp_">
 
 <center>
@@ -226 +225 @@
 
 _infoscriptextra_ {
-function check_submit (gotopage) \{
+function check\_submit (gotopage) \{
   var form = document.collectorform;
   if (form.bc1fullname.value.match(/^\\s*$/))
@@ -261 +260 @@
 <input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="cp" value="_cgiargcp_">
-<input type=hidden name="pcp" value="_cgiargcp_">
+<input type=hidden name="bc1infochanged" value="0">
 
 <center>
@@ -278 +277 @@
 
 <h4>Title for collection:</h4>
-<input type="text" name="bc1fullname" value="_cgiargbc1fullname_") size=72>
+<input type="text" name="bc1fullname" value="_cgiargbc1fullname_"
+onChange="document.collectorform.bc1infochanged.value=1;") size=72>
 <br>
 <font color="#909090">
@@ -288 +288 @@
 
 <h4>Contact email address:</h4>
-<input type="text" name="bc1contactemail" value="_cgiargbc1contactemail_" size=72>
+<input type="text" name="bc1contactemail" value="_cgiargbc1contactemail_"
+onChange="document.collectorform.bc1infochanged.value=1;" size=72>
 <br>
 <font color="#909090">
@@ -298 +299 @@
 
 <h4>About this collection:</h4>
-<textarea name="bc1aboutdesc"  cols=72 rows=6 
-     wrap=physical>_cgiargbc1aboutdesc_</textarea>
+<textarea name="bc1aboutdesc"  cols=72 rows=6 wrap=physical
+onChange="document.collectorform.bc1infochanged.value=1;">
+_cgiargbc1aboutdesc_
+</textarea>
 <br>
 <font color="#909090">
@@ -331 +334 @@
 
 _srcescriptextra_ {
-function check_submit (gotopage) \{
+function check\_submit (gotopage) \{
   var form = document.collectorform;
 
@@ -353 +356 @@
 <input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="cp" value="_cgiargcp_">
-<input type=hidden name="pcp" value="_cgiargcp_">
 
 <center>
@@ -433 +435 @@
 var changed = 0;
 
-function check_submit (gotopage) \{
+function check\_submit (gotopage) \{
   var form = document.collectorform;
   form.bc1cfgchanged.value = changed;
@@ -440 +442 @@
 \}
 
-function reset_button () \{
+function reset\_button () \{
   document.collectorform.reset();
   changed = 0;
@@ -450 +452 @@
 <input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="cp" value="_cgiargcp_">
-<input type=hidden name="pcp" value="_cgiargcp_">
 <input type=hidden name="bc1cfgchanged" value="_cgiargbc1cfgchanged_">
 
@@ -477 +478 @@
 </textarea>
 <table><tr valign=top>
-<td><a href="javascript:reset_button();">_iconstop_</a></td>
-<td><a href="javascript:reset_button();">Reset</a></td>
+<td><a href="javascript:reset\_button();">_iconstop_</a></td>
+<td><a href="javascript:reset\_button();">Reset</a></td>
 </tr></table>
+
+<p><center>
+_collectorbar_
+</center>
+
+</td></tr>
+</table></center>
+
+</form>
+}
+
+
+#######################################################################
+# Build page
+
+_bildscriptextra_ {
+var changed = 0;
+
+function check\_submit (gotopage) \{
+  var form = document.collectorform;
+  form.bc1cfgchanged.value = changed;
+  form.cp.value = gotopage;
+  form.submit();
+\}
+}
+
+_bildcontent_ {
+<form name="collectorform" method=post action="_gwcgi_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
+<input type=hidden name="cp" value="_cgiargcp_">
+
+<center>
+<table width=_pagewidth_>
+<tr><td>
+_iconblankbar_
+<center>
+<h2>Build</h2>
+</center>
+<p>_iconblankbar_
 
 <p><center>

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+// note that the collectoraction relies on having direct access to a
+// collections configuration file. this breaks the separation between
+// receptionist and collection server and so is not suitable (at least
+// in its current form) for use when collection servers are separate 
+// from the receptionist (e.g. when using the CORBA protocol).
+
 #include "collectoraction.h"
 #include "OIDtools.h"
 #include "fileutil.h"
+#include "cfgread.h"
 
 #if !defined (__WIN32__)
@@ -55 +62 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "pcp";
-  arg_ainfo.longname = "previous collector page";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
+  arg_ainfo.shortname = "bc1fullname";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1dirname";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1contactemail";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1aboutdesc";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1clone";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1clonecol";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1inputdir1";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1inputdir2";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1inputdir3";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1inputdir4";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = true;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // only set when one of the fields was changed in
+  // the "collection info" page
+  arg_ainfo.shortname = "bc1infochanged";
+  arg_ainfo.longname = "collector specific";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "bc1fullname";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1dirname";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1contactemail";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1aboutdesc";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1clone";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = false;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "0";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1clonecol";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1inputdir1";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1inputdir2";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1inputdir3";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "bc1inputdir4";
-  arg_ainfo.longname = "collector specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
+  // only set when cfg file is altered from within
+  // "configure collection" page
   arg_ainfo.shortname = "bc1cfgchanged";
   arg_ainfo.longname = "collector specific";
@@ -186 +197 @@
 
 bool collectoraction::check_cgiargs (cgiargsinfoclass &/*argsinfo*/, cgiargsclass &args, 
-                     ostream &/*logout*/) {
+                     ostream &logout) {
 
   if (args["cp"] != "intro") {
@@ -194 +205 @@
   }
 
-  if ((args["pcp"] == "info") && args["bc1dirname"].empty()) {
-    // we've just come from the "collection information" page for the 
-    // first time so we'll need to create the collection with mkcol.pl
-    // and set up bc1dirname - we do this part here instead of in do_action
-    // because the bc1dirname argument must be set to its new value before
-    // the compressedoptions macros are set.
-    args["bc1dirname"] = get_directory_name (args["bc1fullname"]);
-    do_mkcol = true;
+  if (args["bc1infochanged"] == "1") {
+
+    if (args["bc1dirname"].empty()) {
+      // we've just come from the "collection information" page for the 
+      // first time so we'll need to create the collection with mkcol.pl
+      // and set up bc1dirname - we do this part here instead of in do_action
+      // because the bc1dirname argument must be set to its new value before
+      // the compressedoptions macros are set.
+      args["bc1dirname"] = get_directory_name (args["bc1fullname"]);
+      do_mkcol = true;
+
+    } else {
+      // "collection information" has been changed after collection was made
+      // so we'll need to update the cfg file.
+      update_cfgfile_partial (args, logout);
+    }
   }
 
@@ -208 +227 @@
     // page. we need to update the file on disk and catch bc1 arguments up
     // with changes.
-
-
-  }
-
+    update_cfgfile_complete (args, logout);
+  }
+  
   return true;
+}
+
+// update configuration file on disk to match bc1 arguments
+void collectoraction::update_cfgfile_partial (cgiargsclass &args, ostream &logout) {
+
+  text_t cfgfile = filename_cat(gsdlhome, "collect", args["bc1dirname"], "etc", "collect.cfg");
+  char *cfgfilec = cfgfile.getcstr();
+
+  vector<text_tarray> cfgarray;
+
+  // read in cfg file
+  ifstream cfg_in (cfgfilec);
+  if (cfg_in) {
+    text_tarray cfgline;
+    while (read_cfg_line(cfg_in, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+    if (cfgline[0] == "creator") {
+      cfgline[1] = args["bc1contactemail"];
+    } else if (cfgline[0] == "collectionmeta") {
+      if (cfgline[1] == "collectionname") {
+        cfgline[2] = args["bc1fullname"];
+      } else if (cfgline[1] == "collectionextra") {
+        cfgline[2] = carriage_replace (args["bc1aboutdesc"], 0);
+      }
+    }
+      }
+      cfgarray.push_back (cfgline);
+    }
+    cfg_in.close();
+
+    // now write cfg file back out
+    ofstream cfg_out (cfgfilec);
+    if (cfg_out) {
+      // lock the file
+      int fd = GSDL_GET_FILEDESC(cfg_out);
+      int lock_val = 1;
+      GSDL_LOCK_FILE (fd);
+      if (lock_val != 0) {
+    logout << "Error: Couldn't lock file " << cfgfilec << "\n";
+    cfg_out.close();
+    
+      } else {
+
+    vector<text_tarray>::const_iterator this_line = cfgarray.begin();
+    vector<text_tarray>::const_iterator end_line = cfgarray.end();
+    while (this_line != end_line) {
+      write_cfg_line (cfg_out, *this_line);
+      this_line ++;
+    }
+    GSDL_UNLOCK_FILE (fd);
+    cfg_out.close();
+      }
+
+    } else {
+      logout << "collectoraction::update_cfgfile_partial: unable to open " 
+         << cfgfilec << " for output\n";
+    }
+
+  } else {
+    logout << "collectoraction::update_cfgfile_partial: unable to open " 
+       << cfgfilec << " for input\n";
+  }
+  delete cfgfilec;
+}
+
+// replace configuration file on disk with that in the bc1cfgfile argument and 
+// catch other bc1 arguments up with those the new cfgfile contains
+void collectoraction::update_cfgfile_complete (cgiargsclass &args, ostream &logout) {
+
+  text_t cfgfile = filename_cat(gsdlhome, "collect", args["bc1dirname"], "etc", "collect.cfg");
+  char *cfgfilec = cfgfile.getcstr();
+  ofstream cfg_out (cfgfilec);
+  
+  if (cfg_out) {
+    // lock the file
+    int fd = GSDL_GET_FILEDESC(cfg_out);
+    int lock_val = 1;
+    GSDL_LOCK_FILE (fd);
+    if (lock_val != 0) {
+      logout << "Error: Couldn't lock file " << cfgfilec << "\n";
+      cfg_out.close();
+      
+    } else {
+      
+      outconvertclass text_t2ascii;
+      cfg_out << text_t2ascii << args["bc1cfgfile"];
+      GSDL_UNLOCK_FILE (fd);
+      cfg_out.close();
+      
+      // now that we've written the file we'll read it back again and
+      // update our bc1 arguments
+      ifstream cfg_in (cfgfilec);
+      if (cfg_in) {
+    text_tarray cfgline;
+    while (read_cfg_line(cfg_in, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+        if (cfgline[0] == "creator") {
+          args["bc1contactemail"] = cfgline[1];
+        } else if (cfgline[0] == "collectionmeta") {
+          if (cfgline[1] == "collectionname") {
+        args["bc1fullname"] = cfgline[2];
+          } else if (cfgline[1] == "collectionextra") {
+        args["bc1aboutdesc"] = carriage_replace (cfgline[2], 1);
+          }
+        }
+      }
+    }
+    cfg_in.close();
+      } else {
+    logout << "collectoraction::update_cfgfile_complete: unable to open " 
+           << cfgfilec << " for input\n";
+      }
+    }
+  } else {
+    logout << "collectoraction::update_cfgfile_complete: unable to open " 
+       << cfgfilec << " for output\n";
+  }
+  delete cfgfilec;
 }
 
@@ -330 +466 @@
 
 // set the _cfgfile_ macro
-void collectoraction::set_cfgfile (displayclass &disp, const text_t &dirname) {
+void collectoraction::set_cfgfile (displayclass &disp, const text_t &dirname, ostream &logout) {
 
   // read in collect.cfg      
@@ -342 +478 @@
 #endif
   
-  delete cfgfilec;
-
   if (cfg_ifs) {  
     // read in collect.cfg      
@@ -350 +484 @@
     cfg_ifs.get(c);
     while (!cfg_ifs.eof ()) {
+      if (c=='\\') cfgtext.push_back('\\');
       cfgtext.push_back(c);
       cfg_ifs.get(c);
@@ -357 +492 @@
     // define it as a macro
     disp.setmacro("cfgfile","collector",cfgtext);
-  } 
+
+  } else {
+    logout << "collectoraction::set_cfgfile: couldn't open configuration file (" 
+       << cfgfilec << ") for reading\n";
+  }    
+  delete cfgfilec;
 }
 
@@ -423 +563 @@
     collectorbar += get_button (collector_page, "grey", "view", false);
     collectorbar += "</tr><tr><td colspan=4></td><td align=center>_icongreyuparrow_</td><td colspan=4></td>\n";
+
+  } else if (collector_page == "bild") {
+
+
   }
 
@@ -429 +573 @@
 
   if (collector_page == "srce") set_fullnamemenu (disp, args, protos, logout);
-  if (collector_page == "conf") set_cfgfile (disp, args["bc1dirname"]);
+  if (collector_page == "conf") set_cfgfile (disp, args["bc1dirname"], logout);
 }
 
@@ -458 +602 @@
   }
 
+  if (collector_page == "bild") {
+    // do the work (download, import, build)
+    text_t build_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "build");
+    if (!args["bc1inputdir1"].empty()) {
+      build_cmd += " -download \"" + args["bc1inputdir1"] + "\"";
+    }
+    if (!args["bc1inputdir2"].empty()) {
+      build_cmd += " -download \"" + args["bc1inputdir2"] + "\"";
+    }
+    if (!args["bc1inputdir3"].empty()) {
+      build_cmd += " -download \"" + args["bc1inputdir3"] + "\"";
+    }
+    if (!args["bc1inputdir4"].empty()) {
+      build_cmd += " -download \"" + args["bc1inputdir4"] + "\"";
+    }
+    build_cmd.push_back (' ');
+    build_cmd += args["bc1dirname"];
+
+#if !defined (__WIN32__)
+    // run in background on unix systems
+    build_cmd += " &";
+#endif
+    char *build_cmdc = build_cmd.getcstr();
+#if defined (__WIN32__)
+    gsdl_system (build_cmdc, logout);
+#else
+    system (build_cmdc);
+#endif
+    delete build_cmdc;
+  }
 
   if (error.empty()) {

trunk/gsdl/src/recpt/collectoraction.h

@@ -47 +47 @@
              recptprotolistclass *protos, ostream &logout);
 
-  void set_cfgfile (displayclass &disp, const text_t &dirname);
+  void set_cfgfile (displayclass &disp, const text_t &dirname, ostream &logout);
+
+  void update_cfgfile_partial (cgiargsclass &args, ostream &logout);
+
+  void update_cfgfile_complete (cgiargsclass &args, ostream &logout);
 
   text_t carriage_replace (const text_t &intext, int sw);