Changeset 275

Timestamp:

03/23/10 12:55:56 (14 years ago)

Author:

dietuyt

Message:

Small fixes to gernal components.

Location:

metadata/trunk/toolkit/components

Files:

• clarin-nl/collection/cmdi-corpusmodality.xml (deleted)
• clarin-nl/common/cmdi-modality.xml (added)
• clarin-nl/common/cmdi-source.xml (moved) (moved from metadata/trunk/toolkit/components/clarin-nl/session-text/cmdi-source.xml)
• clarin/cmdi-annotationformat.xml (modified) (2 diffs)
• clarin/cmdi-language.xml (modified) (2 diffs)
• clarin/cmdi-location.xml (modified) (2 diffs)
• clarin/cmdi-mimetype.xml (modified) (1 diff)

metadata/trunk/toolkit/components/clarin/cmdi-annotationformat.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CMD_ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd"
-    isProfile="false">
+                   xsi:schemaLocation="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd"
+                   isProfile="false">
     <Header>
         <ID/>
@@ -9 +9 @@
     </Header>
 
-    <CMD_Component name="annotationformat">
+    <CMD_Component name="AnnotationFormat">
         <!-- selection of most common mime types -->
-        <CMD_Element name="AnnotationFormat" ConceptLink="http://www.isocat.org/datcat/DC-2562">
+        <CMD_Element name="AnnotationFormat" ConceptLink="http://www.isocat.org/datcat/DC-2562"
+                   CardinalityMin="1"
+                   CardinalityMax="unbounded">
             <ValueScheme>
                 <enumeration>

metadata/trunk/toolkit/components/clarin/cmdi-language.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CMD_ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="file:/home/dietuyt/svn/clarin/metadata/trunk/toolkit/general-component-schema.xsd" isProfile="false">
+<CMD_ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" isProfile="false"
+                   xsi:schemaLocation="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd">
     <Header>
         <ID>eu.clarin.cmdi.language</ID>
@@ -8 +8 @@
     </Header>
 
-    <CMD_Component name="language">
+    <CMD_Component name="Language">
         
-        <CMD_Element name="languageName" CardinalityMin="0" ValueScheme="string" ConceptLink="http://www.isocat.org/datcat/DC-2484"/>
-        
-        <!-- include language codes -->
-        <CMD_Component filename="iso-639-3.xml" CardinalityMin="0"/>
+        <CMD_Element name="languageName" CardinalityMin="1" CardinalityMax="1" ValueScheme="string"
+                   ConceptLink="http://www.isocat.org/datcat/DC-2484"/>
+        <CMD_Component filename="iso-639-3.xml" CardinalityMin="1" CardinalityMax="1"/>
         
     </CMD_Component>

metadata/trunk/toolkit/components/clarin/cmdi-location.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CMD_ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="file:/home/dietuyt/svn/clarin/metadata/trunk/toolkit/general-component-schema.xsd" isProfile="false">
+<CMD_ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" isProfile="false"
+                   xsi:schemaLocation="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd">
     <Header>
         <ID>eu.clarin.cmdi.location</ID>
@@ -10 +10 @@
     <CMD_Component name="location">
         
-        <CMD_Element name="Address" CardinalityMin="0" ValueScheme="string" ConceptLink="http://www.isocat.org/datcat/DC-2528"/>
-        <CMD_Element name="Region" CardinalityMin="0" ValueScheme="string" ConceptLink="http://www.isocat.org/datcat/DC-2533"/>
-        
-        <!-- include country codes -->
-        <CMD_Component filename="iso-3166-1-alpha2.xml" CardinalityMin="0"/>
-        
-        <!-- include continent codes -->
-        <CMD_Component filename="iso-continent.xml" CardinalityMin="0"/>
+        <CMD_Element name="Address" CardinalityMin="0" CardinalityMax="1" ValueScheme="string"
+                   ConceptLink="http://www.isocat.org/datcat/DC-2528"/>
+        <CMD_Element name="Region" CardinalityMin="0" CardinalityMax="1" ValueScheme="string"
+                   ConceptLink="http://www.isocat.org/datcat/DC-2533"/>
+ 
+        <CMD_Component filename="iso-3166-1-alpha2.xml" CardinalityMin="0" CardinalityMax="1"/>
+        <CMD_Component filename="iso-continent.xml" CardinalityMin="0" CardinalityMax="1"/>
         
     </CMD_Component>

metadata/trunk/toolkit/components/clarin/cmdi-mimetype.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CMD_ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd" isProfile="false">
+                   xsi:schemaLocation="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd"
+                   isProfile="false">
     <Header>
-        <ID></ID>
+        <ID/>
         <Name>Mime type</Name>
         <Description>List of frequently used mime types</Description>
     </Header>
 
-            <CMD_Component name="mimetype">
+            <CMD_Component name="MimeType">
                 <!-- selection of most common mime types -->
-                <CMD_Element name="MimeType" ConceptLink="http://www.isocat.org/datcat/DC-2571">
+                <CMD_Element name="MimeType" ConceptLink="http://www.isocat.org/datcat/DC-2571"
+                   CardinalityMin="1"
+                   CardinalityMax="unbounded">
                     <ValueScheme>
                         <enumeration>