Changeset 1432

Timestamp:

2000-08-20T20:44:06+12:00 (24 years ago)

Author:

sjboddie

Message:

Lots of changes - mostly to get collectoraction working

Location:

trunk/gsdl

Files:

• lib/cfgread.cpp (modified) (1 diff)
• src/recpt/authenaction.cpp (modified) (1 diff)
• src/recpt/collectoraction.cpp (modified) (27 diffs)
• src/recpt/collectoraction.h (modified) (3 diffs)

trunk/gsdl/lib/cfgread.cpp

@@ -69 +69 @@
   }
   fileout << "\n";
+  return 0;
 }
 

trunk/gsdl/src/recpt/authenaction.cpp

@@ -242 +242 @@
       arg_er.clear();
     
+    // needs to be decoded for use within forms
+    decode_cgi_arg (arg_er);    
+
     // redirect to this action
     args_a = "a";

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -34 +34 @@
 #include "fileutil.h"
 #include "cfgread.h"
+#include "gsdltools.h"
 
 #if !defined (__WIN32__)
@@ -44 +45 @@
   recpt = NULL;
   do_mkcol = false;
+  clone_failed = false;
 
   cgiarginfo arg_ainfo;
@@ -110 +112 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
+  // set when cloning option has changed
+  arg_ainfo.shortname = "bc1clonechanged";
+  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 = "bc1inputdir1";
   arg_ainfo.longname = "collector specific";
@@ -160 +171 @@
   arg_ainfo.argdefault = "0";
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  arg_ainfo.shortname = "bc1dodelete";
+  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);
+
+  // will be set if we arrived at the "configure collection" page
+  // via the "changing an existing collection" page
+  arg_ainfo.shortname = "bc1econf";
+  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);
+
+  // will be set if we arrived at the "source data" page
+  // via the "changing an existing collection" page
+  arg_ainfo.shortname = "bc1esrce";
+  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);
 }
@@ -200 +239 @@
 
   if (args["cp"] != "intro") {
-    // authenticate the user if authentication is avaiable
+    // authenticate the user if authentication is available
     args["uan"] = 1;
     args["ug"] = "colbuilder";
@@ -215 +254 @@
       args["bc1dirname"] = get_directory_name (args["bc1fullname"]);
       do_mkcol = true;
-
     } else {
       // "collection information" has been changed after collection was made
@@ -230 +268 @@
   }
   
+  if (args["bc1clonechanged"] == "1") {
+    // cloning option has been changed on "source data" page. if it was turned 
+    // on we want to create a new collect.cfg file using the bc1clonecol cfg file
+    // as a model (we'll save the old file as collect.cfg.org). if cloning was
+    // turned off we'll revert to using the collect.cfg.org file (which will need
+    // updating in case the bc1 arguments have been altered since cloning was 
+    // turned on).
+    update_cfgfile_clone (args, logout);
+  }
+
   return true;
+}
+
+void collectoraction::update_cfgfile_clone (cgiargsclass &args, ostream &logout) {
+
+  text_t cfgfile = filename_cat(gsdlhome, "collect", args["bc1dirname"], "etc", "collect.cfg");
+  text_t cfgfile_org = cfgfile + ".org";
+
+  if (args["bc1clone"] == "1") {
+    // cloning was turned on
+
+    text_t cfgfile_clone = filename_cat(gsdlhome, "collect", args["bc1clonecol"], "etc", "collect.cfg");
+    if (file_exists (cfgfile_clone)) {
+      // if .org file doesn't exist already create it
+      if (!file_exists (cfgfile_org)) {
+    file_copy (cfgfile, cfgfile_org);
+      }
+      // copy clone collections cfg file to new collection
+      file_copy (cfgfile_clone, cfgfile);
+      // update the new cfg file
+      update_cfgfile_partial (args, logout);
+      
+    } else {
+      // can't clone non-existant collection
+      clone_failed = true;
+    }
+
+  } else {
+    // cloning has been turned off having been on at some point. the .org file
+    // should exist, if it doesn't we'll bail out and leave the user with the 
+    // cloned copy
+    if (file_exists (cfgfile_org)) {
+      // copy original back again and update it with any recent changes
+      file_copy (cfgfile_org, cfgfile);
+      update_cfgfile_partial (args, logout);
+    }
+  }
 }
 
@@ -247 +331 @@
     while (read_cfg_line(cfg_in, cfgline) >= 0) {
       if (cfgline.size () >= 2) {
-    if (cfgline[0] == "creator") {
+    if (cfgline[0] == "creator" || cfgline[0] == "maintainer") {
       cfgline[1] = args["bc1contactemail"];
     } else if (cfgline[0] == "collectionmeta") {
@@ -262 +346 @@
 
     // now write cfg file back out
+#ifdef __WIN32__
+    ofstream cfg_out (cfgfilec, ios::binary);
+#else
     ofstream cfg_out (cfgfilec);
+#endif
     if (cfg_out) {
       // lock the file
@@ -285 +373 @@
 
     } else {
-      logout << "collectoraction::update_cfgfile_partial: unable to open " 
+      logout << "collectoraction::update_cfgfile_partial: unable to open "
          << cfgfilec << " for output\n";
     }
 
   } else {
-    logout << "collectoraction::update_cfgfile_partial: unable to open " 
+    logout << "collectoraction::update_cfgfile_partial: unable to open "
        << cfgfilec << " for input\n";
   }
@@ -302 +390 @@
   text_t cfgfile = filename_cat(gsdlhome, "collect", args["bc1dirname"], "etc", "collect.cfg");
   char *cfgfilec = cfgfile.getcstr();
+#ifdef __WIN32__
+  ofstream cfg_out (cfgfilec, ios::binary);
+#else
   ofstream cfg_out (cfgfilec);
+#endif
   
   if (cfg_out) {
@@ -405 +497 @@
   }
 
-  text_t &currentname = args["bc1clonecol"];
-  text_t fullnamemenu;
-  bool first = true;
+  text_t &current_page = args["cp"];
+  text_t currentname = args["bc1dirname"];
+  if (current_page == "srce") currentname = args["bc1clonecol"];
+
+  text_tarray dirnames;
+  text_tarray fullnames;
+  vector<bool> write_protected;
+  int selected_index = 0;
+  int index = 0;
 
   recptprotolistclass::iterator rprotolist_here = protos->begin();
@@ -422 +520 @@
     text_tset metadata;
     metadata.insert ("collectionname");
-
     while (collist_here != collist_end) {
-
       ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       if (cinfo != NULL) {
@@ -431 +527 @@
           // get collection name from the collection cfg file
           collectionname = cinfo->collectionmeta["collectionname"];
-
         } else if (get_info ("collection", *collist_here, metadata, false, 
                  (*rprotolist_here).p, response, logout)) {
@@ -437 +532 @@
           collectionname = response.docInfo[0].metadata["collectionname"].values[0];
         }
-      
-        if (first) fullnamemenu = "<select name=\"bc1clonecol\">\n";
-        fullnamemenu += "<option value=\"" + *collist_here;
-        fullnamemenu.push_back ('"');
-        if (*collist_here == currentname) fullnamemenu += " selected"; 
-        fullnamemenu.push_back ('>');
-        fullnamemenu += collectionname;
-
+        dirnames.push_back(*collist_here);
+        fullnames.push_back(collectionname);
         // check to see if the "collection" is writable
-        text_t cfg_fname = filename_cat(gsdlhome, "collect", *collist_here, "etc", "collect.cfg");
-        if (!file_writable(cfg_fname)) fullnamemenu += " <b>(write protected)</b>";
-
-        fullnamemenu += "\n";
+        if (collection_protected (*collist_here)) write_protected.push_back(true);
+        else write_protected.push_back(false);
+        if (*collist_here == currentname) selected_index = index;       
         
-        first = false;
+        index ++;
       }
       collist_here ++;
@@ -459 +547 @@
     rprotolist_here ++;
   }
-  if (!first) {
-    fullnamemenu += "</select>\n";
-    disp.setmacro ("fullnamemenu", "collector", fullnamemenu);
-  }
+
+  bool have_one = false;
+  text_t fullnamemenu = "<select name=\"bc1dirname\">\n";
+  if (current_page == "srce") fullnamemenu = "<select name=\"bc1clonecol\">\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";
+    fullnamemenu.push_back ('>');
+    fullnamemenu += fullnames[i];
+    if (write_protected[i]) fullnamemenu += " <b>(write protected)</b>";
+  }
+  fullnamemenu += "</select>\n";
+  if (have_one) disp.setmacro ("fullnamemenu", "collector", fullnamemenu);
 }
 
@@ -506 +607 @@
   // _collectorbar_
   // _pagescriptextra_
-  // _fullnamemenu_ -- if displaying the "source data" page
+  // _fullnamemenu_ -- if displaying the "source data" page or the "changing existing 
+  //                   collection" page
   // _cfgfile_ -- if displaying the "configure collection" page
 
   text_t &collector_page = args["cp"];
+  int esrce = args["bc1esrce"].getint();
+  int econf = args["bc1econf"].getint();
 
   // set _pagescriptextra_ macro to _cpagescriptextra_
@@ -541 +645 @@
 
   } else if (collector_page == "srce") {
-    collectorbar += get_button (collector_page, "yellow", "info", true);
+    if (esrce == 1) {
+      // if we came from the "change an existing collection" page previous button(s)
+      // are disabled
+      collectorbar += get_button (collector_page, "grey", "info", false);
+    } else {
+      collectorbar += get_button (collector_page, "yellow", "info", true);
+    }
     collectorbar += "<td>_icongreyarrow_</td>\n";
     collectorbar += get_button (collector_page, "yellow", "srce", false);
@@ -553 +663 @@
 
   } else if (collector_page == "conf") {
-    collectorbar += get_button (collector_page, "yellow", "info", true);
-    collectorbar += "<td>_icongreyarrow_</td>\n";
-    collectorbar += get_button (collector_page, "yellow", "srce", true);
+    // disable appropriate buttons if we came from "change an existing collection"
+    // page
+    if (esrce == 1 || econf == 1) {
+      collectorbar += get_button (collector_page, "grey", "info", false);
+    } else {
+      collectorbar += get_button (collector_page, "yellow", "info", true);
+    }
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    if (econf == 1) {
+      collectorbar += get_button (collector_page, "grey", "srce", false);
+    } else {
+      collectorbar += get_button (collector_page, "yellow", "srce", true);
+    }
     collectorbar += "<td>_icongreyarrow_</td>\n";
     collectorbar += get_button (collector_page, "yellow", "conf", false);
@@ -572 +692 @@
   disp.setmacro ("collectorbar", "collector", collectorbar);
 
-  if (collector_page == "srce") set_fullnamemenu (disp, args, protos, logout);
-  if (collector_page == "conf") set_cfgfile (disp, args["bc1dirname"], logout);
+  if (collector_page == "srce" || collector_page == "existing") 
+    set_fullnamemenu (disp, args, protos, logout);
+  if (collector_page == "conf") 
+    set_cfgfile (disp, args["bc1dirname"], logout);
 }
 
@@ -579 +701 @@
                  browsermapclass * /*browsers*/, displayclass &disp, 
                  outconvertclass &outconvert, ostream &textout, 
-                 ostream &/*logout*/) {
+                 ostream &logout) {
 
   text_t &collector_page = args["cp"];
-  text_t error;
+  text_t &collection = args["bc1dirname"];
+  text_t message;
 
   if (do_mkcol) {
@@ -591 +714 @@
     mkcol_cmd += " -title \"" + args["bc1fullname"] + "\"";
     mkcol_cmd += " -about \"" + carriage_replace (args["bc1aboutdesc"], 0) + "\" ";
-    mkcol_cmd += args["bc1dirname"];
+    mkcol_cmd += collection;
     char *mkcol_cmdc = mkcol_cmd.getcstr();
     system (mkcol_cmdc);
@@ -597 +720 @@
     
     // make sure it went ok
-    text_t cfgfile = filename_cat (gsdlhome, "collect", args["bc1dirname"], 
+    text_t cfgfile = filename_cat (gsdlhome, "collect", collection, 
                    "etc", "collect.cfg");
-    if (!file_writable (cfgfile)) error = "mkcolfail";
+    if (!file_writable (cfgfile)) message = "mkcolfail";
+    do_mkcol = false; // reset for fast-cgi
   }
 
   if (collector_page == "bild") {
     // do the work (download, import, build)
+    text_t tmpdir = filename_cat (gsdlhome, "tmp", collection + ".bld");
+
     text_t build_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "build");
+    build_cmd += " -append -remove_import";
+    build_cmd += " -out \"" + tmpdir + "\"";
     if (!args["bc1inputdir1"].empty()) {
       build_cmd += " -download \"" + args["bc1inputdir1"] + "\"";
@@ -618 +746 @@
     }
     build_cmd.push_back (' ');
-    build_cmd += args["bc1dirname"];
+    build_cmd += collection;
 
 #if !defined (__WIN32__)
@@ -633 +761 @@
   }
 
-  if (error.empty()) {
+  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")
@@ -639 +795 @@
   } else {
     textout << outconvert << disp << ("_collector:header_\n")
-        << ("_collector:" + error + "content_\n")
+        << ("_collector:" + message + "content_\n")
         << ("_collector:footer_\n");
   }
@@ -738 +894 @@
   return shortname;
 }
+
+// tests if collection is write protected (currently just checks if
+// collect.cfg file is writable
+bool collectoraction::collection_protected (const text_t &collection) {
+  text_t cfgfile = filename_cat(gsdlhome, "collect", collection, "etc", "collect.cfg");
+  if (file_writable(cfgfile)) return false;
+  return true;
+}

trunk/gsdl/src/recpt/collectoraction.h

@@ -40 +40 @@
 
   bool do_mkcol;
+  bool clone_failed;
 
   text_t get_button (const text_t &thispage, const text_t &color, 
@@ -49 +50 @@
   void set_cfgfile (displayclass &disp, const text_t &dirname, ostream &logout);
 
+  void update_cfgfile_clone (cgiargsclass &args, ostream &logout);
+
   void update_cfgfile_partial (cgiargsclass &args, ostream &logout);
 
@@ -56 +59 @@
 
   text_t get_directory_name (const text_t &fullname);
+
+  bool collection_protected (const text_t &collection);
 
 public: