Changeset 16680 for gsdl/trunk/runtime-src/src/recpt/depositoraction.cpp

Timestamp:

2008-08-08T12:17:50+12:00 (16 years ago)

Author:

anna

Message:

Improved customization of metadata sets/elements used in the Depositor. Two aspects involved: the front-end user interface (depositoraction.cpp) and back-end GLI format panel. Associated changes include the depositor's macro file, GLI dictionary and GLI help document

File:

• gsdl/trunk/runtime-src/src/recpt/depositoraction.cpp (modified) (7 diffs)

gsdl/trunk/runtime-src/src/recpt/depositoraction.cpp

@@ -362 +362 @@
       args["di1lastpage"] = lastpage_textt;      
     }
+
+    // create cached metadata values
+    text_t cached_metadata_values = "";
+    cgiargsclass::const_iterator args_here = args.begin();
+    cgiargsclass::const_iterator args_end = args.end();
+    while (args_here != args_end) {
+      text_t args_name = (*args_here).first;
+      int prefix_len = macro_prefix.size();
+      text_t args_prefix = substr(args_name.begin(),args_name.begin()+prefix_len+3);
+
+      if (args_prefix == (macro_prefix+"md.")) {     
+    text_t args_val = args[args_name];
+    text_t args_suffix = substr(args_name.begin()+prefix_len+3,args_name.end()); 
+
+    text_tarray mdvalues;
+    splitchar (args_val.begin(), args_val.end(), ',', mdvalues);
+    int numvalues = mdvalues.size();
+
+    for (int i = 0; i < numvalues; ++i) {
+      if (!mdvalues[i].empty()) {         
+        decode_cgi_arg(mdvalues[i]);
+
+        if (cached_metadata_values == "") {
+          cached_metadata_values = "var CachedMDValues = new Array(\\{";
+        } else {
+          cached_metadata_values += ",";
+        }
+
+        cached_metadata_values += "\"" + args_name + "\":\"" + args_val + "\"";
+      }
+    }   
+      }
+      ++args_here;
+    }
+
+    if (cached_metadata_values != "") {
+      cached_metadata_values += "\\});";
+      args["cachedMDValues"] = cached_metadata_values;
+    }
   }
   return true;
@@ -420 +459 @@
   text_t depositorbar = "<table class=wizardbar border=0 cellspacing=4 cellpadding=0><tr>\n";
 
-  if(stepstring == "step") {
+  if(stepstring == "step") {   
+    // check configured metadata elements
+    if (args["metadataconf"] == "var DepositorMDFields = new Array();" || args["metadataconf"] == "") {
+      text_t cfgfile_name = filename_cat (collecthome, args[macro_prefix + "dirname"], "etc", "collect.cfg");
+      text_t cfgfile_content;
+      text_t metadata_str;
+      
+      if (read_file (cfgfile_name, cfgfile_content)) {
+    text_t::const_iterator here = cfgfile_content.begin();
+    text_t::const_iterator end = cfgfile_content.end();
+    while (here != end) {
+      here = findchar (here, end, 'd');
+      if (here == end) break;
+      if ((here+17 < end) && (substr (here, here+17) == "depositormetadata")) {
+        here = findchar (here, end, '"');
+        if (here == end) break;  
+        text_t enddelimit = "\"\n";
+        getdelimitstr (here+1, end, enddelimit, metadata_str);
+        args["metadataconf"] = "var DepositorMDFields = new Array("+metadata_str+");";      
+      }
+      ++here;
+    }
+      }
+
+      if (metadata_str == "") {
+    args["metadataconf"] = "var DepositorMDFields = new Array({\"name\":\"dc.Title\",\"label\":\"Title\",\"tooltip\":\"dc.Title: A name given to the resource.\",\"type\":\"text\"}, {\"name\":\"dc.Creator\",\"label\":\"Creator\",\"tooltip\":\"dc.Creator: An entity primarily responsible for making the content of the resource.\",\"type\":\"text\"}, {\"name\":\"dc.Description\",\"label\":\"Description\",\"tooltip\":\"dc.Description: An account of the content of the resource.\",\"type\":\"textarea\"});";
+      }
+    }
 
     here = depositor_page.begin();
@@ -444 +510 @@
       depositorbar += "<td>_icongreyarrow_</td>\n";
 
-    }
+    }    
 
     //the build and preview pages are always last
@@ -467 +533 @@
 
     depositorbar += "</tr></table>\n";
-    
+
+    // set the javascript so that the metadata form can read the existing values
+    if (args["cachedMDValues"] != "") {
+      disp.setmacro("cachedmetadatavalues", "depositor", args["cachedMDValues"]);
+    }
+    if (args["metadataconf"] != "") {
+      disp.setmacro("metadataconf", "depositor", args["metadataconf"]);
+    }    
   }
   
@@ -710 +783 @@
     metadata_file += "        <Description>\n";
 
-
+    
     cgiargsclass::const_iterator args_here = args.begin();
     cgiargsclass::const_iterator args_end = args.end();
@@ -735 +808 @@
         decode_cgi_arg(mdvalues[i]);
 
-        metadata_file += "            <Metadata mode=\"accumulate\" name=\"";
+        metadata_file += "            <Metadata mode=\"accumulate\" name=\"";       
         metadata_file += args_suffix;
         metadata_file += "\">";
@@ -743 +816 @@
       }
     }
-
-      } 
-
+      }       
 
       ++args_here;