Changeset 4706

Timestamp:

03/15/14 12:14:00 (11 years ago)

Author:

olof.olsson@snd.gu.se

Message:

fix for delete

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)

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

@@ -132 +132 @@
             });
         },
+        putAnnotation: function(aid, annotation) {
+            return $.ajax({
+                type: "PUT",
+                url: this.getBackend() + '/api/annotations/'+aid+'/body',
+                dataType: "xml",
+                data: annotation,
+                contentType: "application/xml",
+                error: function(jqXHR, status, thrownError) {
+                    // Handle any errors
+                    
+                    annotationProxy.log("+ + + + + + + + + + + + + + + + + + + + + + + +");
+                    annotationProxy.log("Faild to PUT updated annotation: " + aid);
+                    annotationProxy.log("Status Code: " + jqXHR.status);
+                    annotationProxy.log("Error : " + thrownError);
+                    
+                },
+                complete: function(jqXHR, status, responseText) {
+                    var response = jqXHR.responseText.match(/URI="(.+?)"/)[1].split('/');
+                    var aid = response[response.length - 1];
+
+                    annotationProxy.log("+ + + + + + + + + + + + + + + + + + + + + + + +");
+                    annotationProxy.log("Status Code PUT request: " + jqXHR.status);
+                    annotationProxy.log("Response Body: " + jqXHR.responseText);
+                    annotationProxy.log("+ + + + + + + + + + + + + + + + + + + + + + + +");
+
+                }
+            });
+        },
         setBackend: function(url) {
             this.backend = url;

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

@@ -68 +68 @@
             this.log('postAnnotation : ' + annotation);
         },
-        updateAnnotation: function(annotation) {
-            this.log('updateAnnotation : ' + JSON.stringify(annotation));
-            this.log('UPDATED ANNOTATION AS XML: ');
-            var xml = om_object2annotation(annotation);
+        updateAnnotation: function(om_object) {
+            var aid = this.getAidFromOid(om_object.oid);
+            this.log('updateAnnotation : ' + JSON.stringify(om_object));
+            this.log('UPDATED ANNOTATION AS XML (aid: '+aid+')');
+            var xml = om_object_annotation_body(om_object);
+            
             this.log(xml);
+            
+            annotationFramework.putAnnotation(aid, xml);
         },
         getAidFromOid: function(oid){
-            var aid;
             var aSql = 'SELECT dasish_aid FROM om_object WHERE oid="' + oid + '"';
             var rtn = bitsObjectMng.Database.selectB("", aSql); // aMode = "" defaults to predefined value; aSql contains sql statement
             
-            aid = rtn[0].dasish_aid;
-            return aid;
+            return rtn[0].dasish_aid;
         },
         log: function(message) {