Changes between Version 139 and Version 140 of DASISH/XSD and XML


Ignore:
Timestamp:
12/18/13 10:14:10 (10 years ago)
Author:
olhsha
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • DASISH/XSD and XML

    v139 v140  
    285285<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
    286286<cashedRepresentationInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    287 xmlns="http://www.dasish.eu/ns/addit"
    288 type="image"
    289 tool="apple-screen-shot"
    290 mimeType="image/png"
    291 URI="http://localhost:8080/annotator-backend/api/cached/00000000-0000-0000-0000-00000000005c"
    292 xsi:schemaLocation="http://www.dasish.eu/ns/addit https://svn.clarin.eu/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd"/>
     287    xmlns="http://www.dasish.eu/ns/addit"
     288    type="image"
     289   tool="apple-screen-shot"
     290   mimeType="image/png"
     291   URI="http://localhost:8080/annotator-backend/api/cached/00000000-0000-0000-0000-00000000005c"
     292   xsi:schemaLocation="http://www.dasish.eu/ns/addit https://svn.clarin.eu/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd"/>
    293293}}}
    294294
    … …  
    339339<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
    340340<responseBody xmlns="http://www.dasish.eu/ns/addit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dasish.eu/ns/addit https://svn.clarin.eu/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd">
    341 <annotation headline="Sagrada Famiglia Dutch 2" ownerRef="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113" lastModified="2013-12-18T09:50:43.803706Z" URI="http://localhost:8080/annotator-backend/api/annotations/7e7609d9-a04e-41bc-b773-337a11210336">
    342 <body>
    343 <xmlBody mimeType="application/xml+xhtml">
    344 <xhtml:span xmlns:xhtml="http://www.w3.org/1999/xhtml/" style="background-color:rgb(0,0,153);color:rgb(255,255,255);border: thick solid rgb(0, 0, 153);">Some background information on Sagrada Família.</xhtml:span>
    345 </xmlBody>
    346 </body>
    347 <targets>
    348 <targetInfo version="Version 1.0" link="http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia" ref="http://localhost:8080/annotator-backend/api/targets/1ad5928a-8957-42ea-be67-02eb9f334647"/>
    349 </targets>
    350 <permissions>
    351 <userWithPermission permission="owner" ref="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113"/>
    352 </permissions>
     341  <annotation headline="Sagrada Famiglia Dutch 2" ownerRef="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113" lastModified="2013-12-18T09:50:43.803706Z" URI="http://localhost:8080/annotator- backend/api/annotations/7e7609d9-a04e-41bc-b773-337a11210336">
     342     <body>
     343         <xmlBody mimeType="application/xml+xhtml">
     344            <xhtml:span xmlns:xhtml="http://www.w3.org/1999/xhtml/" style="background-color:rgb(0,0,153);color:rgb(255,255,255);border: thick solid rgb(0, 0, 153);">Some background information on Sagrada Família.</xhtml:span>
     345         </xmlBody>
     346    </body>
     347    <targets>
     348       <targetInfo version="Version 1.0" link="http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia" ref="http://localhost:8080/annotator-backend/api/targets/1ad5928a-8957-42ea-be67-02eb9f334647"/>
     349    </targets>
     350    <permissions>
     351       <userWithPermission permission="owner" ref="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113"/>
     352    </permissions>
     353   </annotation>
     354   <actionList>
     355      <action message="CREATE_CACHED_REPRESENTATION" object="http://localhost:8080/annotator-backend/api/targets/1ad5928a-8957-42ea-be67-02eb9f334647"/>
     356   </actionList>
     357</responseBody>
     358}}}
     359
     360The client sends metadata cached representation in the POST body, and a cached representation itself. An example of serialized metadata  for a cached representation has been considered above, so we do not give it here.
     361
     362
     363== Editing annotation  PUT api/annotations/6a01ba7b-2a15-47d4-bf1c-a14b46eb953f ==
     364
     365=== Request: an updated annotation ===
     366
     367{{{#!xml
     368<?xml version="1.0" encoding="UTF-8"?>
     369<annotation
     370    xmlns="http://www.dasish.eu/ns/addit"
     371    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     372    xsi:schemaLocation="http://www.dasish.eu/ns/addit file:/Users/olhsha/repositories/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd"
     373    timeStamp="2013-09-29T19:52:28.969+02:00"
     374    URI="http://localhost:8080/annotator-backend/api/annotations/6a01ba7b-2a15-47d4-bf1c-a14b46eb953f"
     375    ownerRef = "http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113"
     376    headline = "Sagrada Famiglia Dutch"
     377    >
     378    <body>
     379        <textBody mimeType="text/plain">
     380            Construction process of S.F.
     381        </textBody>
     382    </body>
     383    <targets>
     384        <targetInfo ref="http://localhost:8080/annotator-backend/api/sources/00000000-0000-0000-0000-0000000000cc"
     385            link ="http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Bouw"
     386            version="Version 1.0"/>
     387    </targets>
     388    <permissions>
     389        <userWithPermission permission="owner" ref="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113"/>
     390    </permissions>
    353391</annotation>
    354 <actionList>
    355 <action message="CREATE_CACHED_REPRESENTATION" object="http://localhost:8080/annotator-backend/api/targets/1ad5928a-8957-42ea-be67-02eb9f334647"/>
    356 </actionList>
     392}}}
     393
     394=== Enveloped respond: new (updated) annotation and a list of actions  ===
     395
     396
     397{{{#!xml
     398<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     399<responseBody xmlns="http://www.dasish.eu/ns/addit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dasish.eu/ns/addit https://svn.clarin.eu/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd">
     400  <annotation headline="Sagrada Famiglia Dutch" ownerRef="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113" lastModified="2013-12-18T10:09:43.952594Z" URI="http://localhost:8080/annotator- backend/api/annotations/6a01ba7b-2a15-47d4-bf1c-a14b46eb953f">
     401    <body>
     402      <textBody mimeType="text/plain">
     403          Construction process of S.F.
     404      </textBody>
     405      </body>
     406      <targets>
     407        <targetInfo version="Version 1.0" link="http://nl.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Bouw" ref="http://localhost:8080/annotator-backend/api/targets/7f09b2fe-0fce-4570-8071-1cc57fa26f3c"/>
     408      </targets>
     409      <permissions>
     410        <userWithPermission permission="owner" ref="http://localhost:8080/annotator-backend/api/users/00000000-0000-0000-0000-000000000113"/>
     411      </permissions>
     412  </annotation>
     413  <actionList>
     414    <action message="CREATE_CACHED_REPRESENTATION" object="http://localhost:8080/annotator-backend/api/targets/7f09b2fe-0fce-4570-8071-1cc57fa26f3c"/>
     415   </actionList>
    357416</responseBody>
    358 }}}
    359 
    360 The client sends metadata cached representation in the POST body, and a cached representation itself. An example of serialized metadata  for a cached representation has been considered above, so we do not give it here.
    361 
    362 
    363 == Editing annotation body ==
    364 
    365 === Request: an updated body ===
    366 
    367 {{{#!xml
    368 <?xml version="1.0" encoding="UTF-8"?>
    369 <newBody xmlns="http://www.dasish.eu/ns/addit"
    370     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    371     xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"   
    372     type="relation"    >
    373     <relation>History in English and Catalan</relation>
    374     <english ref="http://dasish.eu/sources/SIDaaabbb"/>
    375     <catalan ref="http://dasish.eu/sources/SIDcxcx"/>
    376 </newBody>
    377 }}}
    378 
    379 === Enveloped respond: new (updated) annotation and a list of actions  ===
    380 
    381 The list of actions is empty because there are cached representations for all the target sources.
    382 {{{#!xml
    383 <?xml version="1.0" encoding="UTF-8"?>
    384 <respondNewAnnotation xmlns="http://www.dasish.eu/ns/addit"
    385  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    386  xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd">
    387     <annotationResponse>
    388         <content>
    389             <annotation xmlns="http://www.dasish.eu/ns/addit"
    390                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    391                 xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"
    392                 URI="http://dasish.eu/annotations/AIDeegf"
    393                 timeStamp="2013-05-29T18:13:51.0Z">
    394                 <owner ref="http://dasish.eu/users/UIde1fe1f"/>
    395                 <headline>Comapring English and Catalan Wiki</headline>
    396                 <body type="relation">
    397                     <relation>History in English and Catalan</relation>
    398                     <english ref="http://dasish.eu/sources/SIDaaabbb"/>
    399                     <catalan ref="http://dasish.eu/sources/SIDcxcx"/> 
    400                 </body>
    401                 <targetSources>
    402                     <target>
    403                         <source ref="http://dasish.eu/sources/SIDaaabbb">
    404                             <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#History</link>
    405                             <version>20.04.2012</version>
    406                         </source>
    407                     </target>   
    408                     <target>
    409                         <source ref="http://dasish.eu/sources/SIDcxcx">
    410                             <link>http://ca.wikipedia.org/wiki/Temple_Expiatori_de_la_Sagrada_Fam%C3%ADlia#Hist.C3.B2tia</link>
    411                             <version>20.04.2013</version>
    412                         </source>
    413                     </target>
    414                 </targetSources>
    415                 <permissions ref="http://dasish.eu/permissions/PermissionsListIDxyz"/>
    416             </annotation>     
    417         </content>
    418     <actions />   
    419     </annotationResponse>
    420 </respondNewAnnotation>
    421417}}}
    422418
    … …  
    484480
    485481
    486 == Managing Notebooks ==
     482== Managing Notebooks  (obsolete section) ==
    487483
    488484=== GET api/notebooks ===