Changes between Version 36 and Version 37 of DASISH/XSD and XML


Ignore:
Timestamp:
04/29/13 09:41:36 (11 years ago)
Author:
olhsha
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • DASISH/XSD and XML

    v36 v37  
    8888
    8989{{{#!xml
    90 <?xml version="1.0" encoding="UTF-8"?>
     90?xml version="1.0" encoding="UTF-8"?>
    9191<annotation xmlns="http://www.dasish.eu/ns/addit"
    92  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    93  xsi:schemaLocation="http://www.dasish.eu/ns/addit file:/Users/olhsha/repositories/DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd"
    94  URI="http://dasish/annotations/AIDzzz"
    95  timeStamp="2013-05-04T18:13:51.0Z">
     92    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     93    xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"
     94    URI="http://dasish/annotations/AIDzzz" timeStamp="2013-05-04T18:13:51.0Z">
    9695    <owner ref="http://dasish.eu/users/UIde1fe1f"/>
    9796    <headline>Nativity Facade</headline>
    … …  
    9998        <relation>different</relation>
    10099        <this ref="http://dasish.eu/sources/SIDaacc"/>
    101         <that ref="http://dasish.eu/sources/SIDaaaa"/> 
     100        <that ref="http://dasish.eu/sources/SIDaaaa"/>
    102101    </body>
    103102    <targetSources>
    104         <targetSource ref="http://dasish.eu/sources/SIDaacc">
    105             <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Nativity_Fa.C3.A7ade</link>
    106             <version>20.04.2013</version>
    107         </targetSource>
    108         <targetSource ref="http://dasish.eu/sources/SIDaaaa">
    109             <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Passion_Fa.C3.A7ade</link>
    110             <version>20.04.2013</version>
    111         </targetSource>
     103        <target>
     104            <source ref="http://dasish.eu/sources/SIDaacc">
     105                <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Nativity_Fa.C3.A7ade</link>
     106                <version>20.04.2013</version>
     107            </source>
     108        </target>
     109        <target>
     110            <source ref="http://dasish.eu/sources/SIDaaaa">
     111                <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Passion_Fa.C3.A7ade</link>
     112                <version>20.04.2013</version>
     113            </source>
     114        </target>
    112115    </targetSources>
    113116    <readers>
    … …  
    132135<?xml version="1.0" encoding="UTF-8"?>
    133136<annotation xmlns="http://www.dasish.eu/ns/addit"
    134  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    135  xsi:schemaLocation="http://www.dasish.eu/ns/addit file:/Users/olhsha/repositories/DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd"
    136  URI="http://dasish/annotations/AIDzyy"
    137  timeStamp="2013-05-04T18:13:51.0Z">
     137    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     138    xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"
     139    URI="http://dasish/annotations/AIDzyy" timeStamp="2013-05-04T18:13:51.0Z">
    138140    <owner ref="http://dasish.eu/users/UIde1fe1f"/>
    139141    <headline>Nativity Facade (old page)</headline>
    … …  
    141143        <relation>different</relation>
    142144        <this ref="http://dasish.eu/sources/SIDbbbb"/>
    143         <that ref="http://dasish.eu/sources/SIDrrrr"/> 
     145        <that ref="http://dasish.eu/sources/SIDrrrr"/>
    144146    </body>
    145147    <targetSources>
    146         <targetSource ref="http://dasish.eu/sources/SIDbbb">
    147             <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Nativity_Fa.C3.A7ade</link>
    148             <version>29.01.2010</version>
    149         </targetSource>
    150         <targetSource ref="http://dasish.eu/sources/SIDrrrr">
    151             <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Passion_Fa.C3.A7ade</link>
    152             <version>29.01.2010</version>
    153         </targetSource>
     148        <target>
     149            <source ref="http://dasish.eu/sources/SIDbbb">
     150                <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Nativity_Fa.C3.A7ade</link>
     151                <version>29.01.2010</version>
     152            </source>
     153        </target>
     154        <target>
     155            <source ref="http://dasish.eu/sources/SIDrrrr">
     156                <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Passion_Fa.C3.A7ade</link>
     157                <version>29.01.2010</version>
     158            </source>
     159        </target>
    154160    </targetSources>
    155161    <readers>
    … …  
    169175
    170176{{{#!xml
     177<?xml version="1.0" encoding="UTF-8"?>
    171178<source xmlns="http://www.dasish.eu/ns/addit"
    172179 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    173  xsi:schemaLocation="http://www.dasish.eu/ns/addit file:/Users/olhsha/repositories/DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd"
     180 xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"
    174181 URI="http://dasish.eu/sources/SIDbbbb"
    175182 timeSatmp="2011-05-04T18:13:51.0Z"
    … …  
    201208<cashedRepresentation xmlns="http://www.dasish.eu/ns/addit"
    202209 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    203  xsi:schemaLocation="http://www.dasish.eu/ns/addit file:/Users/olhsha/repositories/DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd"
     210 xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"
    204211 URI="http://dasish.eu/cached/CIDtttt"
    205212 mimeType="image/png"
    … …  
    214221The version of the POST with an unknown target source, signalling the client to provide a cached representation for it: 
    215222
    216 '''TODO''': Remove action request, instead note that we have to think about a solution, probably using an envelope with annotation result and set of action requests
    217 
    218 '''TODO''': Allow for temporary xml:id and xml:idref for referencing sources from body
     223'''TODO''': Action element is removed, instead note that we have to think about a solution, probably using an envelope with annotation result and set of action requests
    219224
    220225{{{#!xml
    … …  
    222227<annotation xmlns="http://www.dasish.eu/ns/addit"
    223228 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    224  xsi:schemaLocation="http://www.dasish.eu/ns/addit file:/Users/olhsha/repositories/DASISH/t5.6/docs/XMLandXSD/DASISH-schema.xsd"
     229 xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"
    225230 URI="tempAIDgfgf"
    226231 timeStamp="2013-05-29T18:13:51.0Z">
    227232    <owner ref="http://dasish.eu/users/UIde1fe1f"/>
    228     <headline>Organ</headline>
    229     <body>
    230         <note>installed in 2010</note>
     233    <headline>Comapring English and Catalan Wiki</headline>
     234    <body type="relation">
     235        <relation>History</relation>
     236        <english ref="http://dasish.eu/sources/SIDaaabbb"/>
     237        <catalan ref="tmpSIDefef"/> 
    231238    </body>
    232239    <targetSources>
    233         <targetSource>
    234             <action>CREATE_CACHED_REPRESENTATION</action>
    235             <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#Organ</link>
    236             <version>20.04.2013</version>
    237         </targetSource>
     240        <target>
     241            <source ref="http://dasish.eu/sources/SIDaaabbb">
     242            <link>http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia#History</link>
     243            <version>20.04.2012</version>
     244            </source>
     245        </target>   
     246        <target>
     247            <newSource xml:id="tmpSIDefef">
     248                <link>http://ca.wikipedia.org/wiki/Temple_Expiatori_de_la_Sagrada_Fam%C3%ADlia#Hist.C3.B2tia</link>
     249                <version>20.04.2013</version>
     250            </newSource>
     251        </target>
    238252    </targetSources>
    239253    <readers>