Fixed support of integer enumeration attributes. JIRA: CXX-13988

gouriano · gouriano · commit c7e7e707b2d8 · 2025-04-07T09:18:02.000-04:00
git-svn-id: https://anonsvn.ncbi.nlm.nih.gov/repos/v1/trunk/c++@104310 78c7ea69-d796-4a43-9a09-de51944f1b03
diff --git a/src/serial/datatool/xsdparser.cpp b/src/serial/datatool/xsdparser.cpp
@@ -1288,12 +1288,14 @@ void XSDParser::ParseEnumeration(DTDAttribute& att)
         att.SetType(DTDAttribute::eEnum);
     }
     int id = 0;
+    bool hasint = false;
     if (GetAttribute("intvalue")) {
         id = NStr::StringToInt(m_Value);
         att.SetType(DTDAttribute::eIntEnum);
+        hasint = true;
     }
     if (GetAttribute("value")) {
-        if (att.GetType() == DTDAttribute::eIntEnum) {
+        if (!hasint && att.GetType() == DTDAttribute::eIntEnum) {
             id = NStr::StringToInt(m_Value);
         }
         string v(m_ValuePrefix);

Original file line number	Diff line number	Diff line change
`@@ -1288,12 +1288,14 @@ void XSDParser::ParseEnumeration(DTDAttribute& att)`
`1288`	`1288`	`att.SetType(DTDAttribute::eEnum);`
`1289`	`1289`	`}`
`1290`	`1290`	`int id = 0;`
	`1291`	`+ bool hasint = false;`
`1291`	`1292`	`if (GetAttribute("intvalue")) {`
`1292`	`1293`	`id = NStr::StringToInt(m_Value);`
`1293`	`1294`	`att.SetType(DTDAttribute::eIntEnum);`
	`1295`	`+ hasint = true;`
`1294`	`1296`	`}`
`1295`	`1297`	`if (GetAttribute("value")) {`
`1296`		`- if (att.GetType() == DTDAttribute::eIntEnum) {`
	`1298`	`+ if (!hasint && att.GetType() == DTDAttribute::eIntEnum) {`
`1297`	`1299`	`id = NStr::StringToInt(m_Value);`
`1298`	`1300`	`}`
`1299`	`1301`	`string v(m_ValuePrefix);`