Changeset 2818


Ignore:
Timestamp:
16/08/07 12:34:05 (12 years ago)
Author:
lawrence
Message:

See comments in ticket:621. dgModel simplified further.

Location:
TI07-MOLES/trunk/v1Schema/Schemae
Files:
2 moved

Legend:

Unmodified
Added
Removed
  • TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.3.3.xsd

    r2816 r2818  
    33<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"> 
    44        <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.isotc211.org/2005/xlink/xlinks.xsd"/> 
     5        <!-- 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 ... --> 
    56        <!-- Version  1.3.2 modified to support a distinction between URL and URI in dgSimpleLink --> 
    67        <!--  Version 1.3.1 modified to support  dgDataProductionTool/dgDataProductionToolType/dgModel pointing to an online reference, BNL, 16/08/07 --> 
     
    11031104                                        <xs:documentation>Relations other than Input...</xs:documentation> 
    11041105                                </xs:annotation> 
    1105                                 <xs:complexType> 
    11061106                                        <xs:sequence> 
    11071107                                                <xs:element name="RelatedDataEntityID" type="moles:dgMetadataIDType"/> 
     1108                                <xs:complexType> 
    11081109                                                <xs:element name="RelationID" type="moles:dgStructuredKeywordType"/> 
    11091110                                        </xs:sequence> 
     
    11161117                        <xs:element name="contactDetails" type="moles:dgContactDetailType"/> 
    11171118                        <xs:choice> 
    1118                                 <xs:element name="dgModel" type="moles:dgOnlineReferenceType" minOccurs="0" maxOccurs="1"/> 
     1119                                <xs:element name="dgModel" type="xs:anySimpleType"/>  
    11191120                                <xs:element name="dgInstrument"> 
    11201121                                        <xs:annotation> 
  • TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.4.3.xsd

    r2816 r2818  
    44        <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.isotc211.org/2005/xlink/xlinks.xsd"/> 
    55        <xs:import namespace="http://ndg.nerc.ac.uk/moles/security" schemaLocation="./moles_security1.01.xsd"/> 
     6        <!-- Version 1.4.3 moving dgModel to a simpletype as it should only be a flag, use the online reference type in the description --> 
    67        <!-- Version  1.4.2 modified to support a distinction between URL and URI in dgSimpleLink, BNL 16/08/07 --> 
    78        <!--  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 --> 
     
    11131114                        <xs:element name="contactDetails" type="moles:dgContactDetailType"/> 
    11141115                        <xs:choice> 
    1115                                 <xs:element name="dgModel" type="moles:dgOnlineReferenceType" minOccurs="0" maxOccurs="1"/> 
     1116                                <xs:element name="dgModel" type="xs:anySimpleType"/> 
    11161117                                <xs:element name="dgInstrument"> 
    11171118                                        <xs:annotation> 
Note: See TracChangeset for help on using the changeset viewer.