COMMON: add a new KeyValue parsing function which can deal e.g. with seperators in the 'path=' key - fixes EOS-6119

Author: apeters1971

common/StringConversion.cc

@@ -558,6 +558,76 @@ StringConversion::GetKeyValueMap(const char* mapstring,
   return true;
 }
 
+
+//------------------------------------------------------------------------------
+// Split a comma separated key:val list and fill it into a map with special path treatment
+//------------------------------------------------------------------------------
+bool
+StringConversion::GetSpecialKeyValueMap(const char* mapstring,
+					std::map<std::string, std::string>& map,
+					const char* split,
+					const char* sdelimiter,
+					std::vector<std::string>* keyvector,
+					const char* pathKey,
+					const char* stopKey)
+{
+  if (!mapstring || !split || !sdelimiter || !pathKey || !stopKey)
+    return false;
+  std::string input(mapstring);
+  std::string delimiter(sdelimiter);
+  std::string splitter(split);
+  std::string pathPrefix = std::string(pathKey) + splitter;
+  std::string stopPrefix = std::string(stopKey) + splitter;
+  size_t pos = 0;
+  size_t start = 0;
+  while (start < input.length()) {
+    pos = input.find(delimiter, start);
+    std::string token;
+    if (pos == std::string::npos) {
+      token = input.substr(start);
+      start = input.length();
+    } else {
+      token = input.substr(start, pos - start);
+      start = pos + delimiter.length();
+    }
+    if (token.find(pathPrefix) == 0) {
+      std::string key = pathKey;
+      std::string value = token.substr(pathPrefix.length());
+      while (start < input.length()) {
+	pos = input.find(delimiter, start);
+	std::string next_token;
+	if (pos == std::string::npos) {
+	  next_token = input.substr(start);
+	  start = input.length();
+	} else {
+	  next_token = input.substr(start, pos - start);
+	  start = pos + delimiter.length();
+	}
+	if (next_token.find(stopPrefix) == 0) {
+	  start -= (next_token.length() + delimiter.length());
+	  break;
+	} else {
+	  value += delimiter + next_token;
+	}
+      }
+      map[key] = value;
+      if (keyvector)
+	keyvector->push_back(key);
+    } else {
+      size_t split_pos = token.find(splitter);
+      if (split_pos == std::string::npos)
+	continue;
+      std::string key = token.substr(0, split_pos);
+      std::string value = token.substr(split_pos + splitter.length());
+      map[key] = value;
+      if (keyvector)
+	keyvector->push_back(key);
+    }
+  }
+  return true;
+}
+
+
 //------------------------------------------------------------------------------
 // Specialized splitting function returning the host part out of a queue name
 //------------------------------------------------------------------------------

common/StringConversion.hh

@@ -386,6 +386,28 @@ public:
                  std::vector<std::string>* keyvector = 0);
 
 
+  // ---------------------------------------------------------------------------
+  /**
+   * Split a comma separated key:val list and fill it into a map
+   *
+   * @param mapstring map string to parse
+   * @param map return map after parsing if ok
+   * @param split separator used to separate key from value default ":"
+   * @param delimiter separator used to separate individual key value pairs
+   * @param keyvector returns optional the order of the keys in a vector
+   * @param pathkey returns the name which indicates the beginning of a path, after which everything is read a s part of the path until stopKey
+   * @param stopKey marks the end of the previous pathkey
+   * @return true if format ok, otherwise false
+   */
+  // ---------------------------------------------------------------------------
+  static bool GetSpecialKeyValueMap(const char* mapstring,
+				    std::map<std::string, std::string>& map,
+				    const char* split,
+				    const char* sdelimiter,
+				    std::vector<std::string>* keyvector,
+				    const char* pathKey = "path",
+				    const char* stopKey = "fstpath");
+
   // ---------------------------------------------------------------------------
   /**
    * Replace a key in a string,string map

console/commands/com_report.cc

@@ -216,7 +216,7 @@ com_report(char* arg1)
 
         std::map<std::string, std::string> map;
 
-        if (eos::common::StringConversion::GetKeyValueMap(line.c_str(),
+        if (eos::common::StringConversion::GetSpecialKeyValueMap(line.c_str(),
             map,
             "=",
             "&",