Changeset 2824 for TI01-discovery

Timestamp:

17/08/07 12:34:48 (13 years ago)

Author:

lawrence

Message:

Modified schema for NumSim to support xhtml

Location:

TI01-discovery/trunk/schema/numsim

Files:

• NumSim.xsd (modified) (6 diffs)
• badc.nerc.ac.uk__NumSim__Iwi500YrRun.xml (added)
• badc.nerc.ac.uk__NumSim__Iwi_CodeBase.xml (added)

TI01-discovery/trunk/schema/numsim/NumSim.xsd

@@ -2 +2 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd"
-    xmlns:moles="http://ndg.nerc.ac.uk/moles" version="009">
+    xmlns:moles="http://ndg.nerc.ac.uk/moles" xmlns:xhtml="http://www.w3.org/1999/xhtml">
     <xs:annotation>
-        <xs:documentation>Author: Bryan Lawrence; Version Date: Jun 28, 2007</xs:documentation>
+        <xs:documentation> V009b BNL, August 17, 2007: 
+           Adding xhtml support in some places.</xs:documentation>
+        <xs:documentation> V009 Author: Bryan Lawrence; Version Date: Jun 28, 2007</xs:documentation>
         <xs:documentation> Previous Version: Bryan Lawrence, Feb 20 2007, May 10th, 2006 </xs:documentation>
         <xs:documentation>The expectation is that this schema will be used initially by import into
@@ -52 +54 @@
         schemaLocation="../iso19139/gml3.1.1version/gmd/citation.xsd"/>
     <xs:import namespace="http://ndg.nerc.ac.uk/moles"
-        schemaLocation="http://ndg.nerc.ac.uk/schema/moles_1.2.5.xsd"/>
+        schemaLocation="http://ndg.nerc.ac.uk/schema/ndgmetadata1.3.3.xsd"/>
     <xs:attributeGroup name="NS_xlink">
         <xs:annotation>
@@ -64 +66 @@
     </xs:attributeGroup>
     <xs:complexType name="NS_Link">
-        <xs:all>
-            <xs:element name="NS_NumSimDoc" type="moles:dgMetadataIDType" minOccurs="0"/>
-        </xs:all>
         <xs:attributeGroup ref="NS_xlink"/>
     </xs:complexType>
@@ -75 +74 @@
         <xs:sequence>
             <xs:element name="NS_Relationship" minOccurs="1" maxOccurs="1" type="xs:string"/>
-            <xs:element name="NS_LinkTarget" type="NS_Link"/>
-        </xs:sequence>
+        </xs:sequence>
+        <xs:attributeGroup ref="NS_xlink"/>
     </xs:complexType>
     <xs:complexType name="NS_Description" mixed="true">
         <xs:sequence>
+            <xs:any namespace="xhtml" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
             <xs:element name="NS_RelatedURI" type="NS_RelatedTo" minOccurs="0" maxOccurs="unbounded"
             />
@@ -270 +270 @@
             <xs:element name="NS_Name" type="xs:string" minOccurs="1" maxOccurs="1"/>
             <xs:element name="NS_Category" type="NS_ModelCategories" minOccurs="0"
-                maxOccurs="unbounded"/>
+            maxOccurs="unbounded"/>
             <xs:element name="NS_ComponentType" type="NS_ModelComponents" minOccurs="0"
                 maxOccurs="unbounded"/>
@@ -316 +316 @@
     </xs:complexType>
     <xs:complexType name="NS_NumSim">
-        <xs:sequence>
+        <xs:all>
             <xs:element name="NS_CodeBase" type="NS_CodeBase"/>
             <xs:element name="NS_Experiment" type="NS_Experiment"/>
-        </xs:sequence><xs:attribute name="Version"></xs:attribute>
+        </xs:all>
+        <xs:attribute name="Version"/>
     </xs:complexType>
     <xs:element name="NS_Simulated" type="NS_NumSim"/>