Changeset 31687 for main/trunk/greenstone2/runtime-src

Timestamp:

2017-05-18T13:46:43+12:00 (7 years ago)

Author:

kjdon

Message:

this wasn't looking lang args to the depositormetadata cfg line, and was therefore setting depositormetaata to [l=en]. Made it use lang params

File:

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

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

@@ -461 +461 @@
       text_t cfgfile_name = filename_cat (collecthome, args[macro_prefix + "dirname"], "etc", "collect.cfg");
       text_t key;
+      text_t params;
       text_tarray cfgline;
       char *cstr = cfgfile_name.getcstr();
@@ -467 +468 @@
 
       text_t metadata_str;
+      text_t default_metadata_str;
       if (confin) {
     while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
+      if (cfgline.size () >= 3) {
         key = cfgline[0];
         if (key == "collectionmeta") {
           if (cfgline[1] == "depositormetadata") {
-        metadata_str = cfgline[2];
-          
-        break;
+        if (cfgline.size() == 3) {
+          // no lang arg
+          default_metadata_str = cfgline[2];
+        } else {
+          params = cfgline[2];
+          text_t::const_iterator first=params.begin()+1;
+          text_t::const_iterator last=params.end()-1;
+          params=substr(first, last);
+          // get the lang out of params
+          paramhashtype params_hash;
+          splitparams(params, params_hash);
+      
+          text_t lang = params_hash["l"];
+          if (lang == args["l"]) {
+            metadata_str = cfgline[3];
+            break;
+          }
+          if (default_metadata_str.empty()) {
+            default_metadata_str = cfgline[3];
+          }
+        }
           }
         }
@@ -482 +502 @@
       }
       confin.close ();
-      
+      // use default value if there was one
+     if (metadata_str.empty()) {
+    metadata_str = default_metadata_str;
+      }
+     // if there still isn't one set, use this default setting
       if (metadata_str == "") {
     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\"}";