Changeset 2812

Timestamp:

04/12/13 15:21:24 (11 years ago)

Author:

olof

Message:

 

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

@@ -14 +14 @@
                     $xml.find('annotation').each(function(){              
                         var annotation = $.xml2json(this);
-                        annotation.type = $(this).find('body').attr('type');
-                        annotation.URI = unescape(annotation.URI);
+                        //annotation.type = $(this).find('body').attr('type');
+                        //annotation.URI = unescape(annotation.URI);
                         annotations.push(annotation);
                     });

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

@@ -3 +3 @@
         getAnnotations: function(url) {
            this.log('getAnnotations for: '+url);
-           annotationFramework.getAnnotations({url:url}, function(){});
+           annotationFramework.getAnnotations({url:url}, function(annotations){
+               this.log('annotations from backend: '+JSON.stringify(annotations));
+           });
            
         },

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

@@ -21 +21 @@
                     };
     
+    //start xpath in xpointer: (?<=start-point\(string-range\()(.*\n?)(?=\,'')
+    //end xpath in xpointer: (?<=range-to\(string-range\()(.*\n?)(?=\,'')
+    
+    
     om_object.oid = hashCode(annotation['xml:id']);
     console.log(annotation.targetSources.targetSource);
@@ -35 +39 @@
 }
 
+/**
+ * converts wired marker annotations to dassish annotations
+ * @param {object} om_object contains wired marker object for annotation
+ * @returns {String} annotation in xml
+ */
 function om_object2annotation(om_object){
     var note = om_object.oid_property.match(/<NOTE>(.+?)<\/NOTE>/)[1];
-    var d = new Date(om_object.oid_date);
+    var timestamp = new Date(om_object.oid_date);
     
     var path = {};
@@ -57 +66 @@
     
     var annotation = '<?xml version="1.0"?>\n\
-                      <annotation xmlns="http://dasish.eu/ns/addit" timeStamp="'+d.toISOString()+'">\n\
+                      <annotation xmlns="http://dasish.eu/ns/addit" timeStamp="'+timestamp.toISOString()+'">\n\
                         <targetSources>\n\
                             <targetSource xml:id="" source="'+om_object.doc_url+xpointer+'"/>\n\
@@ -75 +84 @@
       }
       return hash;
-}
-
-function createXpointer(url, bgn_dom, end_dom){
-    
 }