better error message for wrong measurment model (order)

refs #20
modsim · Feb 23, 2022 · fa62e8d · fa62e8d
1 parent 54c7809
commit fa62e8d
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/fluxml/MMModel.cc b/fluxml/MMModel.cc
@@ -66,9 +66,30 @@
                     child = XMLElement::nextNode(child);
             }
 
+
             // es dürfen keine Elemente mehr folgen!
             if (child != 0)
-                    fTHROW(XMLException,child,"unexpected extra content in element \"model\"");
+            {
+            	// either wrong order of elements, or unknown element
+            	if (XMLElement::match(child,mm_labelingmeasurement,mm_xmlns_uri) ||
+            			XMLElement::match(child,mm_fluxmeasurement,mm_xmlns_uri) ||
+						XMLElement::match(child,mm_fluxratios,mm_xmlns_uri) ||
+						XMLElement::match(child,mm_poolsizeratios,mm_xmlns_uri) ||
+						XMLElement::match(child,mm_poolmeasurement,mm_xmlns_uri) ||
+						XMLElement::match(child,mm_poolsizemeasurement,mm_xmlns_uri))
+            	{
+            		fTHROW(XMLException, child, "wrong oder of elements inside "
+            				"\"model\". Correct order is \"labelingmeasurement\""
+            				", \"fluxmeasurement\", \"fluxratios\", "
+            				"\"poolsizeratios\", \"poolsizemeasurement\"");
+            	}
+            	else
+            	{
+                    fTHROW(XMLException, child, "unexpected extra content "
+                    		"\"%s\" in element \"model\"",
+							XMLElement::nodeToString(child));
+            	}
+            }
     }
 
     void MMModel::parseLabelingMeasurement(DOMNode * labelingmeasurement)