Merge pull request #734 from CrimeIsDown/better-csv-parsing

Improve CSV parsing to allow quoted and escaped fields
robotastic · Nov 25, 2022 · 7e9aefe · 7e9aefe
2 parents 49e655d + eb8f001
commit 7e9aefe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -61,7 +61,7 @@ COPY . .
 
 WORKDIR /src/build
 
-RUN cmake .. && make && make install
+RUN cmake .. && make -j$(nproc) && make install
 
 #USER nobody
 

diff --git a/trunk-recorder/talkgroups.cc b/trunk-recorder/talkgroups.cc
@@ -26,8 +26,8 @@ void Talkgroups::load_talkgroups(std::string filename) {
     return;
   }
 
-  boost::char_separator<char> sep(",\t");
-  typedef boost::tokenizer<boost::char_separator<char>> t_tokenizer;
+  boost::escaped_list_separator<char> sep("\\", ",\t", "\"");
+  typedef boost::tokenizer<boost::escaped_list_separator<char>> t_tokenizer;
 
   std::vector<std::string> vec;
   std::string line;
@@ -123,8 +123,8 @@ void Talkgroups::load_channels(std::string filename) {
     return;
   }
 
-  boost::char_separator<char> sep(",", "\t", boost::keep_empty_tokens);
-  typedef boost::tokenizer<boost::char_separator<char>> t_tokenizer;
+  boost::escaped_list_separator<char> sep("\\", ",\t", "\"");
+  typedef boost::tokenizer<boost::escaped_list_separator<char>> t_tokenizer;
 
   std::vector<std::string> vec;
   std::string line;

diff --git a/trunk-recorder/unit_tags.cc b/trunk-recorder/unit_tags.cc
@@ -26,8 +26,8 @@ void UnitTags::load_unit_tags(std::string filename) {
     return;
   }
 
-  boost::char_separator<char> sep(",\t");
-  typedef boost::tokenizer<boost::char_separator<char>> t_tokenizer;
+  boost::escaped_list_separator<char> sep("\\", ",\t", "\"");
+  typedef boost::tokenizer<boost::escaped_list_separator<char>> t_tokenizer;
 
   std::vector<std::string> vec;
   std::string line;