[Cardiacatlas-svn-updates] SF.net SVN: cardiacatlas:[64] trunk/CAPXMLModel

[<sol...@us...>]

Revision: 64
          http://cardiacatlas.svn.sourceforge.net/cardiacatlas/?rev=64&view=rev
Author:   solidether
Date:     2010-08-25 01:42:29 +0000 (Wed, 25 Aug 2010)

Log Message:
-----------
incorporated LONI provenance details

Modified Paths:
--------------
    trunk/CAPXMLModel/Analysis.xsd
    trunk/CAPXMLModel/SampleAnalysis.xml

Modified: trunk/CAPXMLModel/Analysis.xsd
===================================================================
--- trunk/CAPXMLModel/Analysis.xsd	2010-08-11 00:55:18 UTC (rev 63)
+++ trunk/CAPXMLModel/Analysis.xsd	2010-08-25 01:42:29 UTC (rev 64)
@@ -39,8 +39,7 @@
 
     <xsd:complexType name="Documentation">
     	<xsd:sequence>
-    		<xsd:element name="Version" minOccurs="1" maxOccurs="1" type="cap:Version" />
-    		<xsd:element name="History" minOccurs="0" maxOccurs="unbounded" type="cap:History" />
+    		<xsd:element name="provenanceDetail" minOccurs="1" maxOccurs="unbounded" type="cap:ProvenanceDetail"/>
     	</xsd:sequence>
     </xsd:complexType>
 
@@ -81,29 +80,20 @@
     	</xsd:simpleContent>
     </xsd:complexType>
     
-    <xsd:complexType name="Version">
-        <xsd:simpleContent>
-    		<xsd:extension base="xsd:int">
-    			<xsd:attribute name="date" type="xsd:dateTime" use="required" />
-    		</xsd:extension>
-    	</xsd:simpleContent>
-    </xsd:complexType>
+	<xsd:complexType name="ProvenanceDetail">
+		<xsd:sequence>
+			<xsd:element name="operatingSystem" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="package" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="platform" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="process" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="program" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="programParams" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="programVersion" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="step" type="xsd:integer" minOccurs="1" maxOccurs="1"/>
+		</xsd:sequence>
+		<xsd:attribute name="date" type="xsd:dateTime" use="required" />
+	</xsd:complexType>
     
-    <xsd:complexType name="History">
-    	<xsd:sequence>
-    		<xsd:element name="Comment" type="cap:Comment" minOccurs="1" maxOccurs="unbounded"/>
-    	</xsd:sequence>
-    	<xsd:attribute name="created" type="xsd:dateTime" use="required" />
-    </xsd:complexType>
-    
-    <xsd:complexType name="Comment">
-        <xsd:simpleContent>
-    		<xsd:extension base="xsd:string">
-    			<xsd:attribute name="date" type="xsd:dateTime" use="required" />
-    		</xsd:extension>
-    	</xsd:simpleContent>    
-    </xsd:complexType>
-    
     <xsd:complexType name="ImagePosition">
     	<xsd:sequence>
     		<xsd:element name="x" type="xsd:float" minOccurs="1" maxOccurs="1"/>

Modified: trunk/CAPXMLModel/SampleAnalysis.xml
===================================================================
--- trunk/CAPXMLModel/SampleAnalysis.xml	2010-08-11 00:55:18 UTC (rev 63)
+++ trunk/CAPXMLModel/SampleAnalysis.xml	2010-08-25 01:42:29 UTC (rev 64)
@@ -28,9 +28,15 @@
     <cap:Exelem>cap:Exelem</cap:Exelem>
   </cap:Output>
   <cap:Documentation>
-    <cap:Version date="2001-12-31T12:00:00">0</cap:Version>
-    <cap:History created="2001-12-31T12:00:00">
-      <cap:Comment date="2001-12-31T12:00:00">cap:Comment</cap:Comment>
-    </cap:History>
+    <cap:provenanceDetail date="2001-12-31T12:00:00">
+      <cap:operatingSystem>cap:operatingSystem</cap:operatingSystem>
+      <cap:package>cap:package</cap:package>
+      <cap:platform>cap:platform</cap:platform>
+      <cap:process>cap:process</cap:process>
+      <cap:program>cap:program</cap:program>
+      <cap:programParams>cap:programParams</cap:programParams>
+      <cap:programVersion>cap:programVersion</cap:programVersion>
+      <cap:step>0</cap:step>
+    </cap:provenanceDetail>
   </cap:Documentation>
 </cap:Analysis>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.