CDPP / AMDA_Kernel

Commit cea3f975d8b1029b12823f744a7fae6b9ca8f76a

Authored by Benjamin Renard
1 parent 36b94578
Exists in master and in 66 other branches 10038, 10098, 5390, 5770, 7616, 7875, 8459, 8528, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, feature/9259, pickle, test-merge, ubuntu

Fix TT & catalog download when historic have some 'end of lines'

Showing 2 changed files with 12 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/TimeTableCatalog/AsciiWriter.cc
  Diff comments   View file @cea3f97
... ... @@ -12,6 +12,8 @@
12 12 #include <fstream>
13 13 #include "TimeTableCatalogUtil.hh"
14 14  
  15 +#include <boost/algorithm/string.hpp>
  16 +
15 17 namespace TimeTableCatalog {
16 18  
17 19 const std::string AsciiWriter::FORMAT = "ASCII";
... ... @@ -94,7 +96,9 @@ void AsciiWriter::writeMetaData(const TimeTable&amp; pTT,
94 96 pOut << "# " << AsciiData::CONTACT_KEYWORD << " " << pTT._contact << std::endl;
95 97  
96 98 // -- write historic
97   - pOut << "# " << AsciiData::HISTORIC_KEYWORD << " " << pTT._history << ";" << std::endl;
  99 + std::string history = pTT._history;
  100 + boost::replace_all(history, "\n", "\n# ");
  101 + pOut << "# " << AsciiData::HISTORIC_KEYWORD << " " << history << ";" << std::endl;
98 102  
99 103 // -- write creation date
100 104 pOut << "# " << AsciiData::CREATION_DATE_KEYWORD << " ";
... ...
src/TimeTableCatalog/SpaceWriter.cc
  Diff comments   View file @cea3f97
... ... @@ -12,6 +12,8 @@
12 12 #include <fstream>
13 13 #include "TimeTableCatalogUtil.hh"
14 14  
  15 +#include <boost/algorithm/string.hpp>
  16 +
15 17 namespace TimeTableCatalog {
16 18  
17 19 const std::string SpaceWriter::FORMAT = "SPACE";
... ... @@ -145,8 +147,11 @@ void SpaceWriter::writeMetaData(const TimeTable&amp; pTT,
145 147 for (auto line : pTT._description) {
146 148 pOut << "# " << line << std::endl;
147 149 }
148   - if(! pTT._history.empty())
149   - pOut << "# " << pTT._history << std::endl;
  150 + if(! pTT._history.empty()) {
  151 + std::string history = pTT._history;
  152 + boost::replace_all(history, "\n", "\n# ");
  153 + pOut << "# " << history << std::endl;
  154 + }
150 155  
151 156 // repeat variable names
152 157 pOut << "# " << "t_begin" <<" "<< "t_end"<<" ";
... ...