Merge branch 'FER_11651' into amdadev

Benjamin Renard
2 parents 061ac3dd 1bcc7b53
Showing 2 changed files with 31 additions and 2 deletions Show diff stats
src/TimeTableCatalog/AsciiReader.cc
src/TimeTableCatalog/AsciiReader.hh
@@ -10,6 +10,7 @@
 #include "AsciiReader.hh"
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/tokenizer.hpp>
 #include <boost/lexical_cast.hpp>
 #include <fstream>
 #include "TimeTableCatalogUtil.hh"
@@ -102,9 +103,9 @@ std::unique_ptr&lt;TimeInterval&gt; AsciiReader::readInterval(
 	// -- create time interval
 	std::unique_ptr <TimeInterval> ti (new TimeInterval(startTime, stopTime, pcrtIndex));
  
-	std::vector<std::string> params;
-	split(line, AsciiData::SEPARATOR.c_str()[0], params);
  
+	std::vector<std::string> params = splitLine(line);
+	
 	// If parameters value found, set them for the interval
 	if (!params.empty()) {
 		// Starts setting parameter values with the third field of the
@@ -129,6 +130,32 @@ std::unique_ptr&lt;TimeInterval&gt; AsciiReader::readInterval(
 	return ti;
 }
  
+
+std::vector<std::string> AsciiReader::splitLine(const std::string& line) {
+    std::vector<std::string> result;
+    std::string token;
+    bool inQuotes = false;
+
+    for (char c : line) {
+        if (c == '"') {
+            inQuotes = !inQuotes;
+        } else if (c == ' ' && !inQuotes) {
+            if (!token.empty()) {
+                result.push_back(token);
+                token.clear();
+            }
+        } else {
+            token += c;
+        }
+    }
+
+    // Add the last token
+    if (!token.empty()) 
+        result.push_back(token);
+    return result;
+}
+
+
 void AsciiReader::readMetadata(const std::string& pline,
 		TimeTable& ptimeTable) {
 	// try to find string like "Prop:xxxx" and set _prop attribute to "xxxx"
@@ -52,6 +52,8 @@ public:
  
 	ParameterDescription::ParameterType getTypeFromString(std::string type);
  
+	std::vector<std::string> splitLine(const std::string& line) ;
+
 private:
  
 	/**