CDPP / AMDA_Kernel

Commit de7354f6485854a643276879fcc2b9703c92a5f8

Authored by Benjamin Renard
1 parent d321080e
Exists in master and in 89 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 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, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5776, rm_6015, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, test-merge, tickplot, ubuntu

Fix arraysize in VOTable for time fields

Showing 1 changed file with 9 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/TimeTableCatalog/VOTableWriter.cc
  Diff comments   View file @de7354f
... ... @@ -112,7 +112,13 @@ void VOTableWriter::writeField(const TimeTable& pTT,
112 112 if (unit.size() != 0)
113 113 addAttribute(pTT, pWriter, VOTableData::FIELD_UNIT_ATTRIB, unit);
114 114 if (arraysize != 1) {
115   - std::string arraySizeString = std::to_string(arraysize);
  115 + std::string arraySizeString;
  116 + if (arraysize == -1) {
  117 + arraySizeString = "*";
  118 + }
  119 + else {
  120 + arraySizeString = std::to_string(arraysize);
  121 + }
116 122 addAttribute(pTT, pWriter, VOTableData::FIELD_ARRAYSIZE_ATTRIB, arraySizeString);
117 123 }
118 124  
... ... @@ -142,8 +148,8 @@ void VOTableWriter::writeVOTable(const TimeTable& pTT,
142 148 openTag(pTT, pWriter, VOTableData::TABLE_TAG);
143 149  
144 150 // --------------- FIELD(S) -----------------------------
145   - writeField (pTT, pWriter, "startTime", "startTime", "time.epoch", "char", "dateTime", "", "", "", 1);
146   - writeField (pTT, pWriter, "stopTime", "stopTime", "time.epoch", "char", "dateTime", "", "", "", 1);
  151 + writeField (pTT, pWriter, "startTime", "startTime", "time.epoch", "char", "dateTime", "", "", "", -1);
  152 + writeField (pTT, pWriter, "stopTime", "stopTime", "time.epoch", "char", "dateTime", "", "", "", -1);
147 153  
148 154 // Write parameter description if defined (Catalog ONLY)
149 155 ParameterDescriptionList pdl = pTT.getParameterDescritptions();
... ...