Changeset 4547

Timestamp:

02/24/14 10:13:50 (10 years ago)

Author:

olof

Message:

adding dasish_aid for GET

Location:

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service

Files:

• annotation-service.js (modified) (1 diff)
• annotations.wired.marker.js (modified) (1 diff)
• conversion.utils.js (modified) (4 diffs)

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotation-service.js

@@ -80 +80 @@
             
             aid = rtn[0].dasish_aid;
-            Firebug.Console.log('Resolved the AID for DELETE for aid: '+aid);
+            Firebug.Console.log('Resolved the AID for oid: '+oid+' for aid: '+aid);
             if (aid) { // ajax request only for annotations posted to and available in backend database
                 return $.ajax({

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/annotations.wired.marker.js

@@ -14 +14 @@
                            annotationProxy.log('got Annotation ');
                            annotationProxy.log(result);
+                           bitsObjectMng.Database.addObject(result, 'dasish.remote', undefined);     
                        });
                     });

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/conversion.utils.js

@@ -29 +29 @@
 
     var title = $(annotation).find('headline').text().trim();
-    var body = $(annotation).find('body').text().trim();
+    var body = $(annotation).find('body').find('xhtml\\:span').text().trim();
     var style = $(annotation).find('body').find('xhtml\\:span').attr('style');
     var type = $(annotation).find('mimeType').text();
     var link = $(annotation).find('link').text();
     var time = $(annotation).find('lastModified').text();
+
+    var URI = $(annotation).find('annotation').attr('URI');
+    om_object.dasish_aid = URI.split('/annotations/')[1];
 
     var urlParts = link.split("#xpointer");
@@ -58 +61 @@
 
     om_object.doc_title = title;
+    om_object.oid_title = title;
 
     om_object.oid = hashCode($(annotation).attr('URI'));
@@ -67 +71 @@
 
     if (type === 'application/xml+xhtml') { //TODO: better handeling of the body
-        om_object.oid_txt = body;
+        om_object.oid_txt = $(annotation).find('body').find('xhtml\\:span').attr('title');
         om_object.oid_type = 'text';
     }
@@ -122 +126 @@
                             <xmlBody>\n\
                                 <mimeType>application/xml+xhtml</mimeType>\n\
-                                <xhtml:span style="' + style + '">' + note + '</xhtml:span>\n\
+                                <xhtml:span title="'+om_object.oid_txt+'" style="' + style + '">' + note + '</xhtml:span>\n\
                             </xmlBody>\n\
                         </body>\n\