Menu
▾
▴
[sbml-svn] SF.net SVN: sbml:[21164] trunk/libsbml/src/sbml
|
From: <sar...@us...> - 2014-09-29 09:36:53
|
Revision: 21164
http://sourceforge.net/p/sbml/code/21164
Author: sarahkeating
Date: 2014-09-29 09:36:42 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
we were not reporting an error when there was more than one model element present
we now report a schema error
see PT https://www.pivotaltracker.com/story/show/75586048
Modified Paths:
--------------
trunk/libsbml/src/sbml/SBMLDocument.cpp
Added Paths:
-----------
trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-26.xml
trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-27.xml
trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-28.xml
trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-29.xml
trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-30.xml
trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-31.xml
Modified: trunk/libsbml/src/sbml/SBMLDocument.cpp
===================================================================
--- trunk/libsbml/src/sbml/SBMLDocument.cpp 2014-09-27 12:23:47 UTC (rev 21163)
+++ trunk/libsbml/src/sbml/SBMLDocument.cpp 2014-09-29 09:36:42 UTC (rev 21164)
@@ -1049,6 +1049,13 @@
if (name == "model")
{
+ // check that we do not already have a model
+ if (isSetModel() == true)
+ {
+ logError(NotSchemaConformant, getLevel(), getVersion(),
+ "Only one <model> element is allowed within an SBMLDocument.");
+ }
+
delete mModel;
try
Added: trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-26.xml
===================================================================
--- trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-26.xml (rev 0)
+++ trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-26.xml 2014-09-29 09:36:42 UTC (rev 21164)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level3/version1/core" level="3" version="1">
+ <model metaid="_case00173" id="case00173" name="case00173" timeUnits="second">
+
+
+ <listOfParameters>
+ <parameter id="s" name="S1" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model id="case00174" name="case00173" timeUnits="second">
+
+
+ <listOfParameters>
+ <parameter id="S1" name="S2" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model/>
+</sbml>
\ No newline at end of file
Added: trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-27.xml
===================================================================
--- trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-27.xml (rev 0)
+++ trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-27.xml 2014-09-29 09:36:42 UTC (rev 21164)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level2/version4" level="2" version="4">
+ <model metaid="_case00173" id="case00173" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="s" name="S1" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model id="case00174" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="S1" name="S2" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model/>
+</sbml>
\ No newline at end of file
Added: trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-28.xml
===================================================================
--- trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-28.xml (rev 0)
+++ trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-28.xml 2014-09-29 09:36:42 UTC (rev 21164)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level2/version3" level="2" version="3">
+ <model metaid="_case00173" id="case00173" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="s" name="S1" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model id="case00174" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="S1" name="S2" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model/>
+</sbml>
\ No newline at end of file
Added: trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-29.xml
===================================================================
--- trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-29.xml (rev 0)
+++ trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-29.xml 2014-09-29 09:36:42 UTC (rev 21164)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level2/version2" level="2" version="2">
+ <model metaid="_case00173" id="case00173" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="s" name="S1" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model id="case00174" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="S1" name="S2" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model/>
+</sbml>
\ No newline at end of file
Added: trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-30.xml
===================================================================
--- trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-30.xml (rev 0)
+++ trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-30.xml 2014-09-29 09:36:42 UTC (rev 21164)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level2" level="2" version="1">
+ <model metaid="_case00173" id="case00173" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="s" name="S1" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model id="case00174" name="case00173">
+
+
+ <listOfParameters>
+ <parameter id="S1" name="S2" value="1" constant="false" units="dimensionless"/>
+
+
+
+ </listOfParameters>
+
+ </model>
+ <model/>
+</sbml>
\ No newline at end of file
Added: trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-31.xml
===================================================================
--- trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-31.xml (rev 0)
+++ trunk/libsbml/src/sbml/validator/test/test-data/sbml-xml-constraints/10103-fail-02-31.xml 2014-09-29 09:36:42 UTC (rev 21164)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sbml xmlns="http://www.sbml.org/sbml/level1" level="1" version="2">
+ <model>
+
+
+ <listOfCompartments>
+ <compartment name="S1" units="litre"/>
+
+
+
+ </listOfCompartments>
+
+ </model>
+ <model>
+
+
+ <listOfCompartments>
+ <compartment name="S1" units="litre"/>
+
+
+
+ </listOfCompartments>
+
+ </model>
+ <model>
+ <listOfCompartments>
+ <compartment name="S1" units="litre"/>
+
+
+
+ </listOfCompartments>
+
+ </model>
+</sbml>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
