Changeset 1457 for trunk

Timestamp:

2000-08-27T23:09:14+12:00 (24 years ago)

Author:

stefan

Message:

Lots more changes to collectoraction. Nearly there now... hopefully

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (26 diffs)
• collectoraction.h (modified) (3 diffs)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -45 +45 @@
   recpt = NULL;
   do_mkcol = false;
-  clone_failed = false;
 
   cgiarginfo arg_ainfo;
@@ -61 +60 @@
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "intro";
+  arg_ainfo.savedarginfo = cgiarginfo::must;
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // temporary directory name for this collector
+  // session
+  arg_ainfo.shortname = "bc1tmp";
+  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);
@@ -245 +254 @@
     args["ug"] = "colbuilder";
   }
+  
+  if (current_page == "new" || current_page == "existing") {
+
+    // assign (and create) a temporary directory 
+    assign_tmpname (args, logout);
+
+    // clean up any old builds left laying about in the tmp directory
+    // (note that it's possible this could take some time if there's a huge
+    // partially built collection laying about -- may need to think about doing
+    // this in the background).
+    text_t cleantmp_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "cleantmp.pl");
+    char *cleantmp_cmdc = cleantmp_cmd.getcstr();
+    system (cleantmp_cmdc);
+    delete cleantmp_cmdc;
+  }
 
   if (args["bc1infochanged"] == "1") {
-
+    
     if (args["bc1dirname"].empty()) {
       // we've just come from the "collection information" page for the 
@@ -255 +279 @@
       // 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
+
+      text_t createfile = filename_cat (gsdlhome, "tmp", args["bc1tmp"], ".create");
+      if (!file_exists (createfile)) {
+    // we could do the mkcol.pl here but I guess it's nicer to do it in do_action()
+    do_mkcol = true; 
+      } else {
+    // .create file already exists but bc1dirname wasn't set ... this should only be
+    // able to occur when the "reload" (and possibly the "back" and "forward" buttons)
+    // have been used to get us here.
+    // we'll check that the bc1dirname directory exists (in case of the unlikely 
+    // possibility that get_directory_name returned a different value this time
+    // than it did originally).
+    text_t coldir = filename_cat (get_collectdir(args), args["bc1dirname"]);
+    if (!directory_exists (coldir)) {
+      message = "reloaderror";
+      return true;
+    }
+      }
+    } else {
+      // "collection information" has been changed after collection already exists
       // so we'll need to update the cfg file.
       update_cfgfile_partial (args, logout);
@@ -279 +320 @@
     update_cfgfile_clone (args, logout);
   }
-
+  
   if (current_page == "bildstatus") {
     // if .final file exists then build has finished
-    text_t fbld = filename_cat (gsdlhome, "tmp", args["bc1dirname"] + ".bld.final");
+    text_t fbld = filename_cat (gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld.final");
     if (file_exists (fbld)) {
       char *fbldc = fbld.getcstr();
@@ -290 +331 @@
     fbld_in.close();
     if (c == '0') current_page = "bilddone";
+    else if (c == '4' || c == '5') message = "installfail";
     else current_page = "bildfail";
       } else {
@@ -304 +346 @@
 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";
+  text_t tmpdir = filename_cat(gsdlhome, "tmp", args["bc1tmp"]);
+  text_t cfgfile = filename_cat(tmpdir, args["bc1dirname"], "etc", "collect.cfg");
+  if (!file_exists (cfgfile)) {
+    message = "tmpfail";
+    return;
+  }
+
+  text_t cfgfile_org = filename_cat (tmpdir, "collect.cfg.org");
 
   if (args["bc1clone"] == "1") {
@@ -314 +362 @@
       // if .org file doesn't exist already create it
       if (!file_exists (cfgfile_org)) {
-    file_copy (cfgfile, cfgfile_org);
+    if (!file_copy (cfgfile, cfgfile_org)) {
+      message = "tmpfail";
+      return;
+    }
       }
       // copy clone collections cfg file to new collection
-      file_copy (cfgfile_clone, cfgfile);
+      if (!file_copy (cfgfile_clone, cfgfile)) {
+    message = "tmpfail";
+    return;
+      }
       // update the new cfg file
       update_cfgfile_partial (args, logout);
       
     } else {
-      // can't clone non-existant collection
-      clone_failed = true;
+      // can't clone non-existant or read-protected collection
+      message = "clonefail";
     }
 
@@ -332 +386 @@
     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);
+      if (file_copy (cfgfile_org, cfgfile)) {
+    update_cfgfile_partial (args, logout);
+      } else {
+    message = "tmpfail";
+      }
     }
   }
@@ -341 +398 @@
 void collectoraction::update_cfgfile_partial (cgiargsclass &args, ostream &logout) {
 
-  text_t cfgfile = filename_cat(gsdlhome, "collect", args["bc1dirname"], "etc", "collect.cfg");
+  text_t cfgfile = filename_cat(get_collectdir(args), args["bc1dirname"], "etc", "collect.cfg");
   char *cfgfilec = cfgfile.getcstr();
 
@@ -365 +422 @@
     }
     cfg_in.close();
-
+    
     // now write cfg file back out
 #ifdef __WIN32__
@@ -380 +437 @@
     logout << "Error: Couldn't lock file " << cfgfilec << "\n";
     cfg_out.close();
+    message = "tmpfail";
     
       } else {
@@ -396 +454 @@
       logout << "collectoraction::update_cfgfile_partial: unable to open "
          << cfgfilec << " for output\n";
-    }
-
+      message = "tmpfail";
+    }
+    
   } else {
     logout << "collectoraction::update_cfgfile_partial: unable to open "
        << cfgfilec << " for input\n";
+    message = "tmpfail";
   }
   delete cfgfilec;
@@ -409 +469 @@
 void collectoraction::update_cfgfile_complete (cgiargsclass &args, ostream &logout) {
 
-  text_t cfgfile = filename_cat(gsdlhome, "collect", args["bc1dirname"], "etc", "collect.cfg");
+  text_t cfgfile = filename_cat(get_collectdir(args), args["bc1dirname"], "etc", "collect.cfg");
   char *cfgfilec = cfgfile.getcstr();
 #ifdef __WIN32__
@@ -425 +485 @@
       logout << "Error: Couldn't lock file " << cfgfilec << "\n";
       cfg_out.close();
+      message = "tmpfail";
       
     } else {
@@ -455 +516 @@
     logout << "collectoraction::update_cfgfile_complete: unable to open " 
            << cfgfilec << " for input\n";
+    message = "tmpfail";
       }
     }
@@ -460 +522 @@
     logout << "collectoraction::update_cfgfile_complete: unable to open " 
        << cfgfilec << " for output\n";
+    message = "tmpfail";
   }
   delete cfgfilec;
@@ -598 +661 @@
 
 // set the _cfgfile_ macro
-void collectoraction::set_cfgfile (displayclass &disp, const text_t &dirname, ostream &logout) {
+void collectoraction::set_cfgfile (displayclass &disp, cgiargsclass &args, ostream &logout) {
+
+  text_t &collection = args["bc1dirname"];
+  if (collection.empty()) {
+    message = "nocollection";
+    return;
+  }
 
   // read in collect.cfg      
-  text_t cfgfile = filename_cat(gsdlhome, "collect", dirname, "etc", "collect.cfg");
+  text_t cfgfile = filename_cat(get_collectdir(args), collection, "etc", "collect.cfg");  
   char *cfgfilec = cfgfile.getcstr();
 
@@ -628 +697 @@
     logout << "collectoraction::set_cfgfile: couldn't open configuration file (" 
        << cfgfilec << ") for reading\n";
+    message = "tmpfail";
   }    
   delete cfgfilec;
@@ -633 +703 @@
 
 // set the _statusline_ macro
-void collectoraction::set_statusline (displayclass &disp, const text_t &collection, ostream &logout) {
+void collectoraction::set_statusline (displayclass &disp, cgiargsclass &args, 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 bld_file = filename_cat (gsdlhome, "tmp", args["bc1tmp"], args["bc1dirname"] + ".bld");
   text_t statusline;
 
   if (file_exists (bld_file + ".download")) {
-    statusline = "Downloading files ...<br>";
+    statusline = "Downloading files ...<br>\n";
     statusline += file_tail (bld_file + ".download");
   } else if (file_exists (bld_file + ".import")) {
-    statusline = "Importing collection ...<br>";
+    statusline = "Importing collection ...<br>\n";
     statusline += file_tail (bld_file + ".import");
   } else if (file_exists (bld_file + ".build")) {
-    statusline = "Building collection ...<br>";
+    statusline = "Building collection ...<br>\n";
     statusline += file_tail (bld_file + ".build");
   } else {
+    statusline += "creating collection ...<br>\n";
     statusline += file_tail (bld_file);
   }
@@ -677 +748 @@
   disp.setmacro ("pagescriptextra", "collector", "_" + collector_page + "scriptextra_");
 
-  if (collector_page == "bildstatus" || collector_page == "bilddone" || collector_page == "bildfail") {
+  if (collector_page == "bildstatus" || collector_page == "bilddone" || 
+      collector_page == "bildfail" || collector_page == "bildframe1") {
     disp.setmacro ("header", "collector", "_" + collector_page + "header_");
   }
@@ -759 +831 @@
     collectorbar += get_button (collector_page, "green", "view", true);
     collectorbar += "</tr><tr><td colspan=6></td><td align=center>_icongreyuparrow_</td><td colspan=2></td>\n";
+
+  } else if (collector_page == "bildcancel") {
+    // 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", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (collector_page, "yellow", "bild", true);
+    collectorbar += "<td>_icongreyarrow_</td>\n";
+    collectorbar += get_button (collector_page, "grey", "view", false);
   }
 
@@ -767 +860 @@
     set_fullnamemenu (disp, args, protos, logout);
   if (collector_page == "conf") 
-    set_cfgfile (disp, args["bc1dirname"], logout);
+    set_cfgfile (disp, args, logout);
   if (collector_page == "bildstatus")
-    set_statusline (disp, args["bc1dirname"], logout);
+    set_statusline (disp, args, logout);
 }
 
@@ -781 +874 @@
 
   if (collector_page == "bild") {
-
-    // don't want header and stuff for build page as it uses frames
-    textout << outconvert << disp << ("_collector:bildcontent_\n");
-
     // 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"] + "\"";
-    }
-    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 += collection;
-
-#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;
-
-  } 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";
+    gsdl_build (args, logout);
+
+    if (message.empty()) {
+      // bild page is a frameset so we don't want headers and stuff
+      textout << outconvert << disp << ("_collector:bildcontent_\n");
+    }
+  }
+
+  if (do_mkcol == true) {
+    // execute mkcol.pl (do_mkcol is set from within check_cgiargs)
+    gsdl_mkcol (args, logout);
+    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 {
-    
-    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()) {
+    message = "delsuccess";
+      }
+    }
+  }
+  
+  if (collector_page == "bildcancel") {
+    // cancel the build
+    gsdl_cancel_build (args, logout);
+  }
+
+  if (message.empty()) {
+    if (collector_page != "bild") {
+      // output page ("bild" page was already output above)
       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");
-    }
+    }
+  } else {
+    // message was set somewhere (probably an error), output message page
+    textout << outconvert << disp << ("_collector:header_\n")
+        << ("_collector:" + message + "content_\n")
+        << ("_collector:footer_\n");
+    message.clear();
   }
   return true;
@@ -887 +935 @@
 // else replace all occurances of "\n" with a carriage return
 text_t collectoraction::carriage_replace (const text_t &intext, int sw) {
-
+   
   text_t outtext;
   text_t::const_iterator here = intext.begin();
@@ -984 +1032 @@
   return true;
 }
+
+// assigns a temporary directory name for this collector session
+// and creates temporary directory
+void collectoraction::assign_tmpname (cgiargsclass &args, ostream &logout) {
+
+  int i = 0;
+  text_t tmpname = "tbuild";
+  while (directory_exists (filename_cat (gsdlhome, "tmp", tmpname + text_t(i)))) {
+    i++;
+  }
+  tmpname.appendint (i);
+
+  text_t fulltmpdir = filename_cat (gsdlhome, "tmp", tmpname);
+  if (!mk_dir (fulltmpdir)) {
+    outconvertclass text_t2ascii;
+    logout << text_t2ascii << "collectoraction::assign_tmpname unable to create directory ("
+       << fulltmpdir << ")\n";
+  }
+
+  args["bc1tmp"] = tmpname;
+}
+
+void collectoraction::gsdl_mkcol (cgiargsclass &args, ostream &logout) {
+
+  text_t tmpdir = filename_cat (gsdlhome, "tmp", args["bc1tmp"]);
+  if (!directory_exists (tmpdir)) {
+    message = "tmpfail";
+    return;
+  }
+
+  text_t &collection = args["bc1dirname"];
+  if (collection.empty()) {
+    message = "nocollection";
+    return;
+  }
+
+  // check for a .create file - if it exists then we've already created the collection
+  text_t createfile = filename_cat (tmpdir, ".create");
+  if (file_exists (createfile)) {
+    return;
+  } else {
+    // create the .create file (this file is just a place holder to let any future
+    // pages know that the collection already exists).
+    char *createfilec = createfile.getcstr();
+    ofstream cfile_out (createfilec);
+    delete createfilec;
+    if (cfile_out) {
+      cfile_out << "collection created\n";
+      cfile_out.close();
+    } else {
+      message = "tmpfail";
+      return;
+    }
+  }
+
+  // set up options
+  text_t options = "-creator \"" + args["bc1contactemail"] + "\"";
+  options += " -title \"" + args["bc1fullname"] + "\"";
+  options += " -about \"" + carriage_replace (args["bc1aboutdesc"], 0) + "\"";
+  options += " -collectdir \"" + tmpdir + "\" ";
+  text_t optionfile = filename_cat (tmpdir, "mkcol.opt");
+  char *optionfilet = optionfile.getcstr();
+  ofstream ofile_out (optionfilet);
+  delete optionfilet;
+  if (!ofile_out) {
+    message = "tmpfail";
+    return;
+  }
+  outconvertclass text_t2ascii;
+  ofile_out << text_t2ascii << options << "\n";
+  ofile_out.close();
+  
+  // set up the mkcol.pl command
+  text_t mkcol_cmd = "perl ";
+  mkcol_cmd += filename_cat (gsdlhome, "bin", "script", "mkcol.pl");
+  mkcol_cmd += " -optionfile \"" + optionfile + "\" " + collection;
+  char *mkcol_cmdc = mkcol_cmd.getcstr();
+  
+  // just an ordinary system call running in the foreground. we're assuming (hoping??)
+  // that mkcol.pl will run through fast enough that nothing more elaborate is required.
+  system (mkcol_cmdc);
+  delete mkcol_cmdc;
+  
+  // make sure it went ok
+  text_t cfgfile = filename_cat (tmpdir, collection, "etc", "collect.cfg");
+  if (!file_writable (cfgfile)) {
+    message = "mkcolfail";
+  }
+}
+
+void collectoraction::gsdl_build (cgiargsclass &args, ostream &logout) {
+
+  text_t tmpdir = filename_cat (gsdlhome, "tmp", args["bc1tmp"]);
+  if (!directory_exists (tmpdir)) {
+    message = "tmpfail";
+    return;
+  }
+  
+  text_t &collection = args["bc1dirname"];
+  if (collection.empty()) {
+    message = "nocollection";
+    return;
+  }
+
+  // check for a .build file - if it exists then we've already built
+  // the collection (or are in the process of building it)
+  text_t buildfile = filename_cat (tmpdir, ".build");
+  if (file_exists (buildfile)) {
+    return;
+  } else {
+    // create the .build file (this file is just a place holder to let any future
+    // pages know that we've already been here)
+    char *buildfilec = buildfile.getcstr();
+    ofstream bfile_out (buildfilec);
+    delete buildfilec;
+    if (bfile_out) {
+      bfile_out << "collection building\n";
+      bfile_out.close();
+    } else {
+      message = "tmpfail";
+      return;
+    }
+  }
+
+  // set up build options
+  text_t options = "-remove_import -out \"";
+  options += filename_cat (tmpdir, collection + ".bld");
+  if (args["bc1esrce"] == 1) {
+    // we're adding data to an existing collection
+    options += "\" -save_archives -append";
+  } else {
+    options += "\" -collectdir \"" + tmpdir + "\"";
+  }
+  if (!args["bc1inputdir1"].empty())
+    options += " -download \"" + args["bc1inputdir1"] + "\"";
+  if (!args["bc1inputdir2"].empty())
+    options += " -download \"" + args["bc1inputdir2"] + "\"";
+  if (!args["bc1inputdir3"].empty())
+    options += " -download \"" + args["bc1inputdir3"] + "\"";
+  if (!args["bc1inputdir4"].empty())
+    options += " -download \"" + args["bc1inputdir4"] + "\"";
+  text_t optionfile = filename_cat (tmpdir, "build.opt");
+  char *optionfilet = optionfile.getcstr();
+  ofstream ofile_out (optionfilet);
+  delete optionfilet;
+  if (!ofile_out) {
+    message = "tmpfail";
+    return;
+  }
+  outconvertclass text_t2ascii;
+  ofile_out << text_t2ascii << options << "\n";
+  ofile_out.close();
+
+  // set up the build command
+  text_t build_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "build");
+  build_cmd += " -optionfile \"" + optionfile + "\" " + collection;
+#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;
+}
+
+void collectoraction::gsdl_cancel_build (cgiargsclass &args, ostream &logout) {
+  // I really wanted to do what this perl script does from within the library
+  // c++ code. I ran into some problems though (like how do you write a portable
+  // "rm -r" in c++?). One day I'll spend some time sorting it out ... maybe.
+  text_t cancel_cmd = "perl " + filename_cat (gsdlhome, "bin", "script", "cancel_build.pl");
+  cancel_cmd += " -collectdir \"" + get_collectdir(args) + "\" " + args["bc1dirname"];
+  char *cancel_cmdc = cancel_cmd.getcstr();
+  system (cancel_cmdc);
+  delete (cancel_cmdc);
+}
+
+text_t collectoraction::get_collectdir (cgiargsclass &args) {
+
+  if ((args["bc1econf"] == 1) || (args["bc1esrce"] == 1)) {
+    // we're adding to a collection in place
+    return filename_cat(gsdlhome, "collect");  
+
+  } else {
+    return filename_cat (gsdlhome, "tmp", args["bc1tmp"]);
+  }
+}

trunk/gsdl/src/recpt/collectoraction.h

@@ -39 +39 @@
   char *gsdlhomec;
 
+  text_t message;
+
   bool do_mkcol;
-  bool clone_failed;
 
   text_t get_button (const text_t &thispage, const text_t &color, 
@@ -48 +49 @@
              recptprotolistclass *protos, ostream &logout);
 
-  void set_cfgfile (displayclass &disp, const text_t &dirname, ostream &logout);
+  void set_cfgfile (displayclass &disp, cgiargsclass &args, ostream &logout);
 
-  void set_statusline (displayclass &disp, const text_t &collection, ostream &logout);
+  void set_statusline (displayclass &disp, cgiargsclass &args, ostream &logout);
 
   void update_cfgfile_clone (cgiargsclass &args, ostream &logout);
@@ -63 +64 @@
 
   bool collection_protected (const text_t &collection);
+
+  void assign_tmpname (cgiargsclass &args, ostream &logout);
+
+  void gsdl_mkcol (cgiargsclass &args, ostream &logout);
+
+  void gsdl_build (cgiargsclass &args, ostream &logout);
+
+  void gsdl_cancel_build (cgiargsclass &args, ostream &logout);
+
+  text_t get_collectdir (cgiargsclass &args);
 
 public: