Changeset 3405

Timestamp:

08/16/13 14:56:52 (11 years ago)

Author:

olof

Message:

added logging to local console

Location:

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

Files:

• annotations.wired.marker.js (modified) (2 diffs)
• conversion.utils.js (modified) (1 diff)

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(annotations){
-               this.log('annotations from backend: '+JSON.stringify(annotations));
+           annotationFramework.getAnnotations({link:url,access:read}, function(result){
+               this.log('annotations from backend: '+annotations);
+               
+               var annotations = $(result);
+               
+               var aids = [];
+               
+               annotations.find('annotations annotation').each(function() {
+                        aids.push($(this).attr('ref').substr($(this).attr('ref').lastIndexOf('/') + 1));
+               });
+               //bitsObjectMng.Database.addObject
+               
+                //loop trough annnotations and get each annotation
+               
            });
         },
         putAnnotation: function(om_object) {
             var annotation = om_object2annotation(om_object);
+            annotationFramework.putAnnotation(annotation);
             this.log('putAnnotation : '+annotation);
         },
@@ -15 +28 @@
         },
         log: function(message){
+            //log to console
+            Firebug.Console.log(message);
             //log this to the local proxy
             $.ajax({

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

@@ -49 +49 @@
     om_object.end_dom = parts[0]+'('+parts[2]+')(3)';
     
-    //start xpath in xpointer: (?<=start-point\(string-range\()(.*\n?)(?=\,'')
-    //end xpath in xpointer: (?<=range-to\(string-range\()(.*\n?)(?=\,'')
-    
     //build hyperanchor
     var hyperanchor = '#hyperanchor1.3:'+om_object.bgn_dom+'&'+om_object.end_dom+'&'+style;
-    
-    
     
     om_object.doc_title = title;