Changeset 2818

Timestamp:

16/08/07 12:34:05 (14 years ago)

Author:

lawrence

Message:

See comments in ticket:621. dgModel simplified further.

Location:

TI07-MOLES/trunk/v1Schema/Schemae

Files:

• ndgmetadata1.3.3.xsd (moved) (moved from TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.3.2.xsd) (3 diffs)
• ndgmetadata1.4.3.xsd (moved) (moved from TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.4.2.xsd) (2 diffs)

TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.3.3.xsd

@@ -3 +3 @@
 <xs:schema targetNamespace="http://ndg.nerc.ac.uk/moles" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:moles="http://ndg.nerc.ac.uk/moles" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.03">
         <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.isotc211.org/2005/xlink/xlinks.xsd"/>
+        <!-- Version  1.3.3 Sue thinks it's better to use the onlinereference type within a description for a model description, and she's right ... so simply moving dgModel back to being a flag ... -->
         <!-- Version  1.3.2 modified to support a distinction between URL and URI in dgSimpleLink -->
         <!--  Version 1.3.1 modified to support  dgDataProductionTool/dgDataProductionToolType/dgModel pointing to an online reference, BNL, 16/08/07 -->
@@ -1103 +1104 @@
                                         <xs:documentation>Relations other than Input...</xs:documentation>
                                 </xs:annotation>
-                                <xs:complexType>
                                         <xs:sequence>
                                                 <xs:element name="RelatedDataEntityID" type="moles:dgMetadataIDType"/>
+                                <xs:complexType>
                                                 <xs:element name="RelationID" type="moles:dgStructuredKeywordType"/>
                                         </xs:sequence>
@@ -1116 +1117 @@
                         <xs:element name="contactDetails" type="moles:dgContactDetailType"/>
                         <xs:choice>
-                                <xs:element name="dgModel" type="moles:dgOnlineReferenceType" minOccurs="0" maxOccurs="1"/>
+                                <xs:element name="dgModel" type="xs:anySimpleType"/> 
                                 <xs:element name="dgInstrument">
                                         <xs:annotation>

TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.4.3.xsd

@@ -4 +4 @@
         <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.isotc211.org/2005/xlink/xlinks.xsd"/>
         <xs:import namespace="http://ndg.nerc.ac.uk/moles/security" schemaLocation="./moles_security1.01.xsd"/>
+        <!-- Version 1.4.3 moving dgModel to a simpletype as it should only be a flag, use the online reference type in the description -->
         <!-- Version  1.4.2 modified to support a distinction between URL and URI in dgSimpleLink, BNL 16/08/07 -->
         <!--  Version 1.4.1 modified (from the 1.4 security split) to support  dgDataProductionTool/dgDataProductionToolType/dgModel pointing to an online reference, BNL, 16/08/07 -->
@@ -1113 +1114 @@
                         <xs:element name="contactDetails" type="moles:dgContactDetailType"/>
                         <xs:choice>
-                                <xs:element name="dgModel" type="moles:dgOnlineReferenceType" minOccurs="0" maxOccurs="1"/>
+                                <xs:element name="dgModel" type="xs:anySimpleType"/>
                                 <xs:element name="dgInstrument">
                                         <xs:annotation>