Changeset 12019

Timestamp:

2006-07-05T16:32:09+12:00 (18 years ago)

Author:

davidb

Message:

Minor improvements to depositor action.

Location:

trunk/gsdl/src/recpt

Files:

• depositoraction.cpp (modified) (8 diffs)
• wizardaction.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/depositoraction.cpp

@@ -318 +318 @@
 
    
-   /*  TO BE DELETED WHEN I'M SURE ITS NOT NEEDED
+   /* ***** TO BE DELETED WHEN I'M SURE ITS NOT NEEDED
    //obtain fields from form
    // Iterate through the vector, and store in args     
@@ -336 +336 @@
     args["di1lastpage"] = "0";
 
-    // assign (and create) a temporary directory 
-    // This will create a new tbuild directory every time
-    // the user goes back to select a new collection.
-    // It causes no problems except wasted space. 
-    // Should be addressed in the future
+    // assign (and create) a temporary directory This will create a new
+    // tbuild directory every time the user goes back to select a new
+    // collection.  It causes no problems except wasted space.  Should be
+    // addressed in the future
     if (assign_tmpname (args, logout)==false) {
       // there was an error creating the tmp dir
@@ -506 +505 @@
   }
 
-  if(depositor_page == "bildcancel"){
+  if ((depositor_page == "bildcancel") || (depositor_page == "bildfail")) {
 
 
@@ -558 +557 @@
   }
   disp.setmacro ("depositorbar", "depositor", depositorbar);
+
+  if (depositor_page == "bildfail") {
+    text_t textfailmsg = "_textfailmsg";
+    textfailmsg.push_back(failcode);
+    textfailmsg.push_back('_');
+    disp.setmacro("textfailmsg", "depositor", textfailmsg);
+
+    text_t bldlog = filename_cat(gsdlhome, "tmp", args["di1tmp"], args["di1dirname"] + ".bld");
+    text_t rawlog = file_tail (bldlog, 6, 0);
+    // 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", "depositor", dm_safe(faillog));
+  }
+
+
+
 }
 
@@ -610 +632 @@
   text_t stepstring = substr(here,here+4);
 
-  if (depositor_page == "select" || stepstring == "step") {
+  if ((depositor_page == "select") || (stepstring == "step")) {
           textout << outconvert << disp << ("_depositor:header_\n")
           << ("_depositor:" + depositor_page + "content_\n")
@@ -655 +677 @@
 
 
+      cerr << "*** filename = " << filename_textt << endl;
+
       //write the metadata file
       write_metadata_file(args, filename_textt, timestamp_str); 
@@ -674 +698 @@
   }
 
-
   if (message.empty()) {
+
     if (depositor_page != "bild" && stepstring != "step" && depositor_page != "select") {
       // output page ("bild" page was already output above)
@@ -708 +732 @@
     metadata_file += "        <FileName>";
 
-    //split the filename
-    char* filename_front = strtok(filename_str.getcstr(),".");
-    char* filename_end = strtok(NULL, ".");
-
-    metadata_file += filename_front;
-    metadata_file += "\\."; 
-    metadata_file += filename_end; 
+    // Generate 'regular expression' save version of filename
+    // for now that means escaping any '.' characters
+    // consider generalising as function in gsdltools.h/cpp?
+
+    text_t filename_re;
+    text_t::const_iterator here = filename_str.begin();
+    text_t::const_iterator end = filename_str.end();
+    while (here != end) {
+      if (*here == '.') {
+    filename_re.push_back('\\');
+      }
+
+      filename_re.push_back(*here);
+      ++here;
+    }
+
+    metadata_file += filename_re;
+
     metadata_file += "</FileName>\n"; 
     metadata_file += "        <Description>\n";

trunk/gsdl/src/recpt/wizardaction.cpp

@@ -342 +342 @@
   if (!mk_dir (fulltmpdir)) {
     outconvertclass text_t2ascii;
-    logout << text_t2ascii << "collectoraction::assign_tmpname unable to create directory ("
+    logout << text_t2ascii << "wizardaction::assign_tmpname unable to create directory ("
        << fulltmpdir << ")\n";
     return false;