[tdwg-tapir] Schema modification: r533 - in trunk/protocol: . examples

[tdwg-tapir at lists.tdwg.org]

Author: markus
Date: 2006-05-17 16:22:41 +0200 (Wed, 17 May 2006)
New Revision: 533

Modified:
   trunk/protocol/examples/metadata_response.xml
   trunk/protocol/tapir.xsd
Log:
custom metadata extensions are optional. updated exmaple to validate

Modified: trunk/protocol/examples/metadata_response.xml
===================================================================
--- trunk/protocol/examples/metadata_response.xml	2006-05-17 14:04:27 UTC (rev 532)
+++ trunk/protocol/examples/metadata_response.xml	2006-05-17 14:22:41 UTC (rev 533)
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-TAPIR Metadata Response example. This example only includes mandatory concepts.
-The metadata part in TAPIR is likely to be changed after comunity discussion.
+TAPIR Metadata Response example.
 -->
 <response xmlns="http://res.tdwg.org/tapir/1.0"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:dct="http://purl.org/dc/terms/"
+    xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+    xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://res.tdwg.org/tapir/1.0    http://ww2.biocase.org/svn/tapir/trunk/protocol/tapir.xsd">
-    <header>
+   <header xmlns="">
         <source accesspoint="http://accesspoint_url" sendtime="2005-11-11T12:23:56.023+01:00">
             <software name="TAPIR_Implementation" version="1.0"/>
         </source>
     </header>
         <metadata>
             <dc:title>Australian Fruit Flies</dc:title>
-            <dc:type>http://purl.org/dc/dcmitype/Service<dc:type>
-                <accesspoint>http://www.flies.au/pywrapper/flies</accesspoint>
+            <dc:type>http://purl.org/dc/dcmitype/Service</dc:type>
+            <accesspoint xmlns="">http://www.flies.au/pywrapper/flies</accesspoint>
                 <dc:description>Australian fruit flies collection of georeferenced records observations</dc:description>
                 <dc:language>EN</dc:language>
                 <dc:subject>fuit flies observation australia diptera Tephritidae</dc:subject>
                 <dct:bibliographicCitation>Australian Fruit Flies TAPIR provider</dct:bibliographicCitation>
                 <dc:rights>free</dc:rights>
                 <dct:modified>2006-01-01T00:00:00</dct:modified>
-                <indexingPreferences startTime="09:30:00Z" maxDuration="PT1H" frequency="P1M" />
-                <relatedEntity>
+                <indexingPreferences xmlns="" startTime="09:30:00Z" maxDuration="PT1H" frequency="P1M" />
+                <relatedEntity xmlns="">
                     <role>technical host</role>
                     <entity>
                         <identifier>someGUID</identifier>
@@ -31,19 +34,19 @@
                         <logoURL>http://somehost/entitylogo.png</logoURL>
                         <description>Description about the TAPIR working group</description>
                         <relatedInformation>http://somehost/moreinfo</relatedInformation>
-                        <geo:Point>
-                            <geo:lat>45.256</geo:lat>
-                            <geo:long>-71.92</geo:long>
-                        </geo:Point>
                         <hasContact>
                             <role>system administrator</role>
                             <vcard:VCARD>
                                 <vcard:FN>Frank Sinatra</vcard:FN>
                                 <vcard:TITLE>Main singer</vcard:TITLE>
+                                <vcard:TEL>some phone number</vcard:TEL>
                                 <vcard:EMAIL>f.sinatra at tapir.com</vcard:EMAIL>
-                                <vcard:TEL>some phone number</vcard:TEL>
                             </vcard:VCARD>
                         </hasContact>
+                        <geo:Point>
+                            <geo:lat>45.256</geo:lat>
+                            <geo:long>-71.92</geo:long>
+                        </geo:Point>
                     </entity>
                 </relatedEntity>
         </metadata>

Modified: trunk/protocol/tapir.xsd
===================================================================
--- trunk/protocol/tapir.xsd	2006-05-17 14:04:27 UTC (rev 532)
+++ trunk/protocol/tapir.xsd	2006-05-17 14:22:41 UTC (rev 533)
@@ -1478,7 +1478,7 @@
 					supplier</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="custom"/>
+			<xsd:element ref="custom" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="relatedEntityInformationType">
@@ -1574,7 +1574,7 @@
 					<xsd:documentation>Location of the entity in decimal WGS84 latitude and longitude (and optional altitude) as defined by the W3C Basic Geo Vocabulary</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="custom"/>
+			<xsd:element ref="custom" minOccurs="0"/>
 		</xsd:sequence>
 		<xsd:attribute ref="lang"/>
 	</xsd:complexType>