quote CSV strings containing separators, and double quote quotes within. For #1743.

Author: highperformancecoder

engine/variableValue.cc

@@ -428,7 +428,7 @@ namespace minsky
       }
     of<<quoted("RavelHypercube=["+os.str()+"]")<<endl;
     for (const auto& i: hypercube().xvectors)
-      of<<"\""<<i.name<<"\",";
+      of<<CSVQuote(i.name,',')<<",";
     of<<"value$\n";
 
     auto idxv=index();

model/minsky.cc

@@ -90,14 +90,14 @@ namespace minsky
     redrawAllGodleyTables();
     return m_multipleEquities;
   }
-  
+
   void Minsky::openLogFile(const string& name)
   {
     outputDataFile.reset(new ofstream(name));
     *outputDataFile<< "#time";
     for (auto& v: variableValues)
       if (logVarList.contains(v.first))
-        *outputDataFile<<" "<<v.second->name;
+        *outputDataFile<<" "<<CSVQuote(v.second->name,' ');
     *outputDataFile<<endl;
   }
 

str.h

@@ -152,6 +152,20 @@ namespace minsky
     s.seekg(0); //rewind input stream
   }
 
+  /// quotes a string if it contains a separator character, and double quotes quotes
+  inline std::string CSVQuote(const std::string& x, char sep)
+  {
+    std::string r;
+    bool needsQuoting=false;
+    for (auto c: x)
+      {
+        r+=c;
+        if (c=='"') {r+='"'; needsQuoting=true;}
+        if (c==sep) needsQuoting=true;
+      }
+    if (needsQuoting) return "\""+r+"\"";
+    return r;
+  }
 
 }
 #endif