Changeset 2889

Timestamp:

05/14/13 17:24:02 (11 years ago)

Author:

olhsha

Message:

adjusting the schema

File:

• DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd (modified) (13 diffs)

DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd

@@ -36 +36 @@
         </xs:sequence>
     </xs:complexType>
+    
+    <!-- //////////////////////// -->
+    <!-- Version lists -->
+   
+    <xs:complexType name="Versions">
+        <xs:sequence>
+            <xs:element name="version" type="Version" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>        
+        <xs:attribute name="URI" type="xs:anyURI" use="required"/>
+    </xs:complexType>
+
+
+    <xs:complexType name="Version">
+        <xs:sequence>
+            <xs:element name="version" type="xs:string"/>
+            <xs:element name="cachedRepresentations" type="CachedRepresentations"/>
+        </xs:sequence>
+    </xs:complexType>
+    
 
     <!--////////////////////////////-->
@@ -43 +62 @@
     <xs:complexType name="Source">
         <xs:sequence>
-            <xs:element name="cachedRepresentations" type="CachedRepresentations" minOccurs="1"/>
-            <xs:element name="versions-siblings" type="Versions" minOccurs="1"/>
+            <xs:element name="versions-siblings" type="ResourceREF" minOccurs="1"/>
         </xs:sequence>
         <xs:attribute name="URI" type="xs:anyURI" use="required"/>
@@ -78 +96 @@
 
 
-    <xs:complexType name="Versions">
-        <xs:sequence>
-            <xs:element name="version" type="ResourceREF" minOccurs="1" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
 
     <!-- News sources, new/old sources  -->
@@ -175 +188 @@
         <xs:complexContent>
             <xs:extension base="ResourceREF">
-                <xs:attribute name="permission" type="Permission"/>
+                <xs:attribute name="permission" type="Permission" use="required"/>
             </xs:extension>
         </xs:complexContent>
@@ -182 +195 @@
     <xs:complexType name="PermissionList">
         <xs:sequence>
-            <xs:element name="user" type="UserWithPermission" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="eMail" type="xs:string" use="required"/>
+            <xs:element name="user" type="UserWithPermission" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
     </xs:complexType>
 
@@ -263 +275 @@
             <xs:extension base="ResourceREF">
                 <xs:sequence>
-                    <xs:element name="notebook" type="ResourceREF"/>
                     <xs:element name="title" type="xs:string"/>
                 </xs:sequence>
@@ -286 +297 @@
     <xs:simpleType name="PermissionActionName">
         <xs:restriction base="xs:string">
-            <xs:enumeration value="ASK_USER_INFO"/>
+            <xs:enumeration value="PROVIDE_USER_INFO"/>
         </xs:restriction>
     </xs:simpleType>
@@ -338 +349 @@
         <xs:sequence>                
             <xs:element name="content" type="AnnotationResponseContent" minOccurs="1" maxOccurs="1"/>
-            <xs:element name="actions" type="AnnotationActionList" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="actions" type="AnnotationActionList" minOccurs="1" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
@@ -350 +361 @@
         <xs:sequence>                
             <xs:element name="content" type="PermissionResponseContent" minOccurs="1" maxOccurs="1"/>
-            <xs:element name="actions" type="PermissionActionList" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="actions" type="PermissionActionList" minOccurs="1" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
@@ -357 +368 @@
     <xs:complexType name="AnnotationResponseContent">
         <xs:choice>
-            <xs:element name="resolvedAnnotation" type="Annotation"/>
-            <xs:element name="unresolvedAnnotation" type="Annotation"/>
+            <xs:element name="annotation" type="Annotation"/>
         </xs:choice>
     </xs:complexType>
 
-    <!-- above: consistency check is left to "schematron":
-        it has to check if the element with the name resolvedAnnotation indeed contains ALL target resolved; AND
-        if the element with the name unResolvedAnnotation has at least one unresolved target;
-        below: similar consistence check for permissions
-    -->
-
+   
     <xs:complexType name="PermissionResponseContent">
         <xs:choice>
-            <xs:element name="resolvedPermissionList" type="PermissionList"/>
-            <xs:element name="unresolvedPermissionList" type="PermissionList"/>
+            <xs:element name="permissions" type="PermissionList"/>
         </xs:choice>
     </xs:complexType>
@@ -385 +389 @@
 
     <!--/////////////////////////////////////-->
-    <!-- GET api/annotations/AIDxyz  respond -->
+    <!-- GET api/annotations/AIDzzz  resolvable  -->
+    <!--  GET api/annotations/AID0xyy unresolvable target sources, step 1-->
     <xs:element name="annotation" type="Annotation"/>
 
-
-    <!--/////////////////////////////////////-->
-    <!--  GET api/annotations/AID0xyz/sources   respond (non-resolvable)-->
-    <xs:element name="sources" type="SourceInfos"/>
-
-    <!--/////////////////////////////////////-->
-    <!--  GET api/sources/SID0xyz/  respond  -->
-    <xs:element name="source" type="Source  "/>
-
-    <!--/////////////////////////////////////-->
-    <!-- GET api/sources/SID05/cached/CID0efef/metadata (example usage for unresolvable target sources)   -->
+    <!--/////////////////////////////////////-->
+    <!--  GET api/sources/SID0xyz/  unresolvable target sources, step 2  -->
+    <xs:element name="source" type="Source"/>
+    
+    <!--/////////////////////////////////////-->
+    <!--  GET api/versions/VIDaacc  unresolvable target sources, step 3  -->
+    <xs:element name="versions" type="Versions"/>
+    
+
+    <!--/////////////////////////////////////-->
+    <!-- GET api/sources/SID05/cached/CID0efef/metadata (unresolvable target sources step, 4)   -->
     <xs:element name="cashedRepresentation" type="CachedRepresentation"/>
 
     <!--/////////////////////////////////////-->
-    <!-- POST api/annotation, annotation body  -->
+    <!-- POST api/annotation   -->
     <!-- request body -->
     <xs:element name="newAnnotation" type="Annotation"/>
     
-    <!-- NEW: add examples !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-    
     <!-- respond -->
     <xs:element name="respondNewAnnotation" type="ResponseBody"/>
-    <!-- add two examples: resolved and unresolved targets -->
-
-   
-    <!-- GET api/annotations/<aid>/permissions -->
-
-    <xs:element name="listOfPermissions" type="PermissionList"/>
 
     <!--///////////////////////////////////-->
     <!-- PUT api/annotations/<aid> -->
-
+    
     <!-- Body of the request -->
     <xs:element name="newBody" type="AnnotationBody"/>
-
+    <!-- Body of the respond -->
     <xs:element name="respondNewAnnotationBody" type="ResponseBody"/>
-    <!-- example all targets are known, since it is just a body correction, empty list of actions -->
+   
+   
+    <!-- GET api/annotations/<aid>/permissions -->
+
+    <xs:element name="permissions" type="PermissionList"/>
+
+   
     
     <!--///////////////////////////////////-->
@@ -433 +436 @@
     <!-- PUT api/annotations/<aid>/permissions -->
     <!-- request body -->
-    <xs:element name="newPermission"  type="PermissionList"/>
-    
-    <!-- request response -->
-    <xs:element name="respondNewPermissionList" type="ResponseBody"/>
-    <!-- two examples: resolved and unresolved, with the action add user info -->
+    <!--  permissions element-->
     
     <!--///////////////////////////////////-->
@@ -465 +464 @@
     <!--/////////////////////////////////// -->
     <!--  GET api/notebooks/<nid>/annotations -->
-    <xs:element name="notebookAnnotations" type="AnnotationInfos"/>
+    <!-- annotations element -->
     
     <!--/////////////////////////////////// -->