Changeset 12516

Timestamp:

2006-08-24T11:18:36+12:00 (18 years ago)

Author:

kjdon

Message:

Added Stefan's fileupload code to replace use of cgicc by depositor. Commented out some of the cgiargs that I don't think are being used

File:

• trunk/gsdl/src/recpt/depositoraction.cpp (modified) (23 diffs)

trunk/gsdl/src/recpt/depositoraction.cpp

@@ -65 +65 @@
 #include <iostream>
 //#include <cstdlib>
-#include "cgicc/CgiDefs.h"
-#include "cgicc/Cgicc.h"
-
-using namespace cgicc;
-
-extern Cgicc *formData;
 
 depositoraction::depositoraction () 
@@ -78 +72 @@
   lastpage = 0; 
 
-  do_udcol = false;
-
-  //remove these if removed from depositoraction.h
-  badsources = false;
-  failedsources.erase(failedsources.begin(), failedsources.end());
-
   cgiarginfo arg_ainfo;
   arg_ainfo.shortname = "a";
@@ -109 +97 @@
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
+  
+  // the fileupload info that cgiwrapper produces - we parse the fileupload_t
+  // and set di1userfile, di1userfilesize
+  arg_ainfo.shortname = "di1userfileinfo";
+  arg_ainfo.longname = "depositor specific"; 
+  arg_ainfo.fileupload = true;
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;  
+  argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // essential: reset fileupload to default as we are not setting 
+  // it for each arg
+  arg_ainfo.fileupload = false;
 
   //the name of the file to be added
@@ -147 +147 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "di1fullname";
-  arg_ainfo.longname = "depositor specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = g_EmptyText;
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
+//   arg_ainfo.shortname = "di1fullname";
+//   arg_ainfo.longname = "depositor specific";
+//   arg_ainfo.multiplechar = true;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = g_EmptyText;
+//   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
+//   argsinfo.addarginfo (NULL, arg_ainfo);
 
   arg_ainfo.shortname = "di1dirname";
@@ -171 +171 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "di1clone";
-  arg_ainfo.longname = "depositor specific";
-  arg_ainfo.multiplechar = false;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "0";
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "di1clonecol";
-  arg_ainfo.longname = "depositor specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = g_EmptyText;
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  arg_ainfo.shortname = "cfgfile";
-  arg_ainfo.longname = "configuration file contents";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = g_EmptyText;
-  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 = "di1econf";
-  arg_ainfo.longname = "depositor 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 = "di1clone";
+//   arg_ainfo.longname = "depositor specific";
+//   arg_ainfo.multiplechar = false;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = "0";
+//   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
+//   argsinfo.addarginfo (NULL, arg_ainfo);
+
+//   arg_ainfo.shortname = "di1clonecol";
+//   arg_ainfo.longname = "depositor specific";
+//   arg_ainfo.multiplechar = true;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = g_EmptyText;
+//   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
+//   argsinfo.addarginfo (NULL, arg_ainfo);
+
+//   arg_ainfo.shortname = "cfgfile";
+//   arg_ainfo.longname = "configuration file contents";
+//   arg_ainfo.multiplechar = true;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = g_EmptyText;
+//   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 = "di1econf";
+//   arg_ainfo.longname = "depositor specific";
+//   arg_ainfo.multiplechar = false;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = "0";
+//   arg_ainfo.savedarginfo = cgiarginfo::must;
+//   argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // wizard uses this to see if we are working with an existing collection:
+  // set the default to 1
   arg_ainfo.shortname = "di1esrce";
   arg_ainfo.longname = "depositor specific";
@@ -215 +215 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
 
-  arg_ainfo.shortname = "di1input";
-  arg_ainfo.longname = "depositor specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.multiplevalue = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = g_EmptyText;
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  //we don't need this in the depositor
-  arg_ainfo.shortname = "di1inputtype";
-  arg_ainfo.longname = "depositor specific";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.multiplevalue = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = g_EmptyText;
-  arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
-  argsinfo.addarginfo (NULL, arg_ainfo);
+//   arg_ainfo.shortname = "di1input";
+//   arg_ainfo.longname = "depositor specific";
+//   arg_ainfo.multiplechar = true;
+//   arg_ainfo.multiplevalue = true;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = g_EmptyText;
+//   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
+//   argsinfo.addarginfo (NULL, arg_ainfo);
+
+//   //we don't need this in the depositor
+//   arg_ainfo.shortname = "di1inputtype";
+//   arg_ainfo.longname = "depositor specific";
+//   arg_ainfo.multiplechar = true;
+//   arg_ainfo.multiplevalue = true;
+//   arg_ainfo.defaultstatus = cgiarginfo::weak;
+//   arg_ainfo.argdefault = g_EmptyText;
+//   arg_ainfo.savedarginfo = cgiarginfo::mustnot; // saved on disk
+//   argsinfo.addarginfo (NULL, arg_ainfo);
 
 }
@@ -239 +239 @@
 }
 
-//I think we need this too
+
 bool depositoraction::check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, recptprotolistclass * protos, ostream &logout) {
 
-
   wizardaction::check_cgiargs(argsinfo,args,protos,logout);
-
 
   text_t &current_page = args["p"];
@@ -254 +252 @@
   // to read from the key.db database at the same time.
 
-  //right now, anyone can do anything until it's tile to build
+  //right now, anyone can do anything until it's time to build
   if (current_page == "select") {
     //authenticate the user if authentication is available
@@ -271 +269 @@
   // Consider recoding at some point in the future.
 
-  const_file_iterator file = formData->getFile("di1userfile");
-
-  if(file != formData->getFiles().end()) {
-
-    time_t timestamp = time(NULL);
-    text_t timestamp_str(timestamp); 
-    args["di1timestamp"] = timestamp_str;
-
-    const char* filename_str = (*file).getFilename().c_str();
-    // Although cgicc documentation says this will be the tail filename,
-    // upload from IE provides evidence to the contrary (although file upload
-    // from Mozilla under Windows is OK).
-    
-    // Explicitly look for IE case, and remove prefix
-    char* file_str;
-    char* tstart = rindex(filename_str,'\\'); 
-    if (tstart != NULL) {
-      file_str = strdup(tstart);
-    }
-    else {
-      file_str = strdup(filename_str);
-    }
-
-
-    text_t filename_textt(file_str);
-    args["di1userfile"] = filename_textt;  
-
-    int filesize = (*file).getDataLength();
-    text_t filesize_textt(filesize);
-    args["di1userfilesize"] = filesize_textt;
-
-
-     text_t tmpdir = filename_cat(gsdlhome,"tmp",args["di1tmp"],timestamp_str);
-     bool tflag = mk_dir(tmpdir);
-     text_t tmpfile = filename_cat(tmpdir,file_str);
-     ofstream tout(tmpfile.getcstr());
-     if(!tout.is_open()) {
-       cerr << " Cannot write file " << tmpfile << endl; 
-     }
-     else {
-       (*file).writeToStream(tout);
-     }
-
-     free(file_str);
-   }
-
-   
-   /* ***** TO BE DELETED WHEN I'M SURE ITS NOT NEEDED
-   //obtain fields from form
-   // Iterate through the vector, and store in args     
-   for(const_form_iterator iter = formData->getElements().begin();
-    iter != formData->getElements().end();
-    ++iter) {  
-    const char* name_cstr = iter->getName().c_str();
-    const char* value_cstr = iter->getValue().c_str();
-    args.setarg (name_cstr, value_cstr, cgiarg_t::cgi_arg);
-   }
-   */
-
+  fileupload_t *fileupload = args.getargfile("di1userfileinfo");
+  if (fileupload != NULL) {
+    if (!(*fileupload).tmp_name.empty() && file_exists((*fileupload).tmp_name)) {
+      // create the timestamp
+      time_t timestamp = time(NULL);
+      text_t timestamp_str(timestamp); 
+      args["di1timestamp"] = timestamp_str;
+
+      // set filename and size from the fileupload struct
+      args["di1userfilesize"] = (*fileupload).size;
+      args["di1userfile"] = (*fileupload).name;
+      // copy the file into its temporary location
+      text_t tmpdir = filename_cat(gsdlhome,"tmp",args["di1tmp"],timestamp_str);
+      bool tflag = mk_dir(tmpdir);
+      text_t tmpfile = filename_cat(tmpdir,(*fileupload).name);
+      if (!file_copy((*fileupload).tmp_name, tmpfile)) {
+    cerr << "Depositor error: cannot save uploaded fileto  "<<tmpfile<<endl;
+      } else {
+    cerr << "Depositor: saved uploaded file to "<<tmpfile<<endl;
+      }
+    } 
+  }
+  
   if (current_page == "select") {  
  
@@ -393 +355 @@
     text_t lastpage_textt = args["di1lastpage"]; 
     int lastpage = lastpage_textt.getint(); 
-    
     if (currpage > lastpage) {
- 
       lastpage++; 
       text_t lastpage_textt(lastpage); 
@@ -401 +361 @@
     }
   }
-
   return true;
 }  
@@ -409 +368 @@
                           recptprotolistclass *protos, ostream &logout) {
 
-  // define_internal_macros sets the following macros:
+  // define_internal_macros sets some/all of the following macros (depending
+  // on cgiargs):
   //
-  // list the macros when I have a chance
-
+  // _pagescriptextra_
+  // _header_
+  // _depositorbar_
+  // _textfailmsg_
+  // _di1userfile_
+  // _di1userfilesize_
 
   text_t &depositor_page = args["p"];
@@ -429 +393 @@
 
   if (depositor_page == "select") {
-        set_fullnamemenu (disp, args, protos, logout);
+    set_fullnamemenu (disp, args, protos, logout);
   }
 
@@ -446 +410 @@
 
   if((stepstring) == "step" || (depositor_page == "depositonly") ) {
-      disp.setmacro("di1userfilesize","depositor",args["di1userfilesize"]);
-      disp.setmacro("di1userfile","depositor",args["di1userfile"]);
-  }
-
-  //setup the depositor bar
+    disp.setmacro("di1userfile","depositor",args["di1userfile"]);
+    disp.setmacro("di1userfilesize","depositor",args["di1userfilesize"]);
+  }
+
+  //set up the depositor bar
   text_t depositorbar = "<table class=wizardbar border=0 cellspacing=4 cellpadding=0><tr>\n";
 
   if(stepstring == "step") {
- 
+
     here = depositor_page.begin();
     text_t stepnums = substr(here+4,here+5); 
@@ -464 +428 @@
     // again, begin with the select bar...
     //the first button - selecting a collection
-
     for(int i = 1; i <= numsteps; i++) {
-
       text_t numstr(i); 
       if(i <= lastpage && i == stepnum) {
@@ -502 +464 @@
 
     depositorbar += "</tr></table>\n";
-
-  }
-
+    
+  }
+  
   if ((depositor_page == "bildcancel") || (depositor_page == "bildfail")) {
-
-
+  
     for(int i = 1; i <= numsteps; i++) {
 
@@ -533 +494 @@
 
   if(depositor_page == "bilddone"){
-      
+    
     for(int i = 1; i <= numsteps; i++) {
 
@@ -559 +520 @@
 
   if (depositor_page == "bildfail") {
+ 
     text_t textfailmsg = "_textfailmsg";
     textfailmsg.push_back(failcode);
@@ -577 +539 @@
     disp.setmacro ("faillog", "depositor", dm_safe(faillog));
   }
-
-
-
 }
+
 
 //basic framework
@@ -638 +598 @@
       
   }
+
   if ((depositor_page == "bild") || (depositor_page == "depositoronly")) {
 
     text_t filename_textt = args["di1userfile"];
     text_t timestamp_str = args["di1timestamp"];
-
     //check to make sure a file was uploaded
     //if more than one upload occurred, the last one is taken
@@ -649 +609 @@
     } else {
     
-
       text_t col_dirname = filename_cat(gsdlhome,"collect",args[macro_prefix+"dirname"]);
       text_t import_dirname = filename_cat(col_dirname,"import");
@@ -670 +629 @@
       text_t tmpdir = filename_cat(gsdlhome,"tmp",args["di1tmp"],timestamp_str);
       text_t tmpfile = filename_cat(tmpdir,filename_textt);
-
       text_t filename = filename_cat(dirname, filename_textt);  
       if(!file_copy(tmpfile, filename)) {
     cerr << "Unable to copy " << tmpfile << " to " << filename << endl; 
       }
-
-
       cerr << "*** filename = " << filename_textt << endl;
-
+      
       //write the metadata file
       write_metadata_file(args, filename_textt, timestamp_str); 
@@ -714 +670 @@
   }
  
-
   return true;