Changeset 5680 for DASISH

Timestamp:

09/26/14 09:21:36 (10 years ago)

Author:

stephanie.roth@snd.gu.se

Message:

Updated to xml:id and href attributes in annotation element. Added ownerHref element instead of owner attribute.

File:

• DASISH/t5.6/client/branches/webannotator-basic/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js (modified) (3 diffs)

DASISH/t5.6/client/branches/webannotator-basic/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js

@@ -120 +120 @@
     var backend_url = annotationFramework.getBackend();
     var backend_relpath = backend_url.substring(backend_url.indexOf(":")+3);
-    pos = backend_relpath.indexOf("/");
-    backend_relpath = backend_relpath.substring(pos)
+    var pos = backend_relpath.indexOf("/");
+    
+    /* Notes on var annotation:
+     * UUID is hardcoded starting with a letter (below), because value is used for attribute xml:id as well. */
     
     var annotation = '<?xml version="1.0" encoding="UTF-8"?>\n\
@@ -128 +130 @@
                             xsi:schemaLocation="http://www.dasish.eu/ns/addit http://dasish.eu/DASISH-schema.xsd"\n\
                             xmlns:xhtml="http://www.w3.org/1999/xhtml"\n\
-                            URI="' + annotationFramework.getBackend() + '/api/annotations/00000000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00"\n\
-                            ownerRef="' + annotationFramework.getBackend() + '/api/principals/00000000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00">\n\
+                            xml:id="aaa00000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00"\n\
+                            href="' + backend_relpath.substring(pos) + '/api/annotations/aaa00000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00"\n\
+                        <ownerHref>' + backend_relpath.substring(pos) + '/api/principals/aaa00000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00</ownerHref>\n\
                         <headline>' + om_object.oid_title + '</headline>\n\
                         <lastModified>' + timestamp.toISOString() + '</lastModified>\n\
@@ -139 +142 @@
                         </body>\n\
                         <targets>\n\
-                            <targetInfo ref="' + annotationFramework.getBackend() + '/api/targets/00000000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00">\n\
+                            <targetInfo ref="' + annotationFramework.getBackend() + '/api/targets/aaa00000-0000-0000-' + om_object.oid.substring(0, 4) + '-' + om_object.oid.substring(4, 14) + '00">\n\
                                 <link>' + om_object.doc_url + xpointer + '</link>\n\
                                 <version>' + timestamp.toISOString() + '</version>\n\