Changeset 30327 for main

Timestamp:

2015-12-02T11:58:30+13:00 (8 years ago)

Author:

kjdon

Message:

changed the way we read in collect.cfg to find depositormetadata. New way copied from other places that read in collect.cfg. Keeps it in utf8

File:

• main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/depositoraction.cpp

@@ -454 +454 @@
     // 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 key;
+      text_tarray cfgline;
+      char *cstr = cfgfile_name.getcstr();
+      ifstream confin (cstr);
+      delete []cstr;
+
       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+");";      
+      if (confin) {
+    while (read_cfg_line(confin, cfgline) >= 0) {
+      if (cfgline.size () >= 2) {
+        key = cfgline[0];
+        if (key == "collectionmeta") {
+          if (cfgline[1] == "depositormetadata") {
+        metadata_str = cfgline[2];
+          
+        break;
+          }
+        }
       }
-      ++here;
     }
       }
-
+      confin.close ();
+      
       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\"});";
+    metadata_str = "{\"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\"}";
       }
+      args["metadataconf"] = "var DepositorMDFields = new Array("+metadata_str+");";
+ 
     }
 
@@ -806 +812 @@
             for (int i = 0; i < numvalues; ++i) {
               if (!mdvalues[i].empty()) {
-
                 decode_cgi_arg(mdvalues[i]);
-
                 metadata_file += "            <Metadata mode=\"accumulate\" name=\"";       
                 metadata_file += args_suffix;