CDPP / AMDA_Kernel

Commit 5b91d159937481fac15d3adf9d4796c52e029a9c

Authored by Benjamin Renard
1 parent db1508cd
Exists in master and in 100 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, SolarOrbiter, SpeasyGet, add_path, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, livraison-akka, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Fix catalog readers when an attribute of a parameter is not defined

Showing 2 changed files with 28 additions and 13 deletions   Show diff stats
Inline Side-by-side
src/TimeTableCatalog/InternalXMLReader.cc
  Diff comments   View file @5b91d15
... ... @@ -154,15 +154,24 @@ void InternalXMLReader::processNode(TimeTable& pTT, xmlTextReaderPtr reader, int
154 154 attrUcd = xmlTextReaderGetAttribute (reader, (const xmlChar*)InternalXMLData::ATTRIB_UCD);
155 155 attrUtype = xmlTextReaderGetAttribute (reader, (const xmlChar*)InternalXMLData::ATTRIB_UTYPE);
156 156  
  157 + std::string attrIdStr = (attrId != NULL) ? std::string((const char *)attrId) : "";
  158 + std::string attrNameStr = (attrName != NULL) ? std::string((const char *)attrName) : "";
  159 + std::string attrSizeStr = (attrSize != NULL) ? std::string((const char *)attrSize) : "";
  160 + std::string attrTypeStr = (attrType != NULL) ? std::string((const char *)attrType) : "";
  161 + std::string attrUnitStr = (attrUnit != NULL) ? std::string((const char *)attrUnit) : "";
  162 + std::string attrDescriptionStr = (attrDescription != NULL) ? std::string((const char *)attrDescription) : "";
  163 + std::string attrUcdStr = (attrUcd != NULL) ? std::string((const char *)attrUcd) : "";
  164 + std::string attrUtypeStr = (attrUtype != NULL) ? std::string((const char *)attrUtype) : "";
  165 +
157 166 ((Catalog *) &pTT)->addParameterDescription(ParameterDescription(
158   - std::string((const char *)attrId),
159   - std::string((const char *)attrName),
160   - std::string((const char *)attrSize),
161   - std::string((const char *)attrType),
162   - std::string((const char *)attrUnit),
163   - std::string((const char *)attrDescription),
164   - std::string((const char *)attrUcd),
165   - std::string((const char *)attrUtype)));
  167 + attrIdStr,
  168 + attrNameStr,
  169 + attrSizeStr,
  170 + attrTypeStr,
  171 + attrUnitStr,
  172 + attrDescriptionStr,
  173 + attrUcdStr,
  174 + attrUtypeStr));
166 175  
167 176 // Jump to next XML_PARAMETER_TAG
168 177 _step = READ_STEP::NO_TAG;
... ...
src/TimeTableCatalog/VOTableReader.cc
  Diff comments   View file @5b91d15
... ... @@ -152,15 +152,21 @@ void VOTableReader::readField(TimeTable& pTT, xmlTextReaderPtr reader) {
152 152 internalSize = std::string((const char *)attrSize);
153 153 }
154 154  
  155 + std::string attrIdStr = (attrId != NULL) ? std::string((const char *)attrId) : "";
  156 + std::string attrNameStr = (attrName != NULL) ? std::string((const char *)attrName) : "";
  157 + std::string attrUnitStr = (attrUnit != NULL) ? std::string((const char *)attrUnit) : "";
  158 + std::string attrUcdStr = (attrUcd != NULL) ? std::string((const char *)attrUcd) : "";
  159 + std::string attrUtypeStr = (attrUtype != NULL) ? std::string((const char *)attrUtype) : "";
  160 +
155 161 ((Catalog *) &pTT)->addParameterDescription(ParameterDescription(
156   - std::string((const char *)attrId),
157   - std::string((const char *)attrName),
  162 + attrIdStr,
  163 + attrNameStr,
158 164 internalSize,
159 165 internalType,
160   - std::string((const char *)attrUnit),
  166 + attrUnitStr,
161 167 "", // Read later
162   - std::string((const char *)attrUcd),
163   - std::string((const char *)attrUtype)));
  168 + attrUcdStr,
  169 + attrUtypeStr));
164 170  
165 171 }
166 172 }
... ...