Changeset 4707 for DASISH

Timestamp:

03/15/14 13:36:52 (10 years ago)

Author:

olof.olsson@snd.gu.se

Message:

updated for post

Location:

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

Files:

• annotation-service.js (modified) (3 diffs)
• annotations.wired.marker.js (modified) (4 diffs)

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

@@ -56 +56 @@
                 success: function(xml, textStatus, jqXHR) {
                     $xml = $.parseXML(jqXHR.responseText);
-                    annotationProxy.log('GOT annotation in getAnnotation ');    
-                    annotationProxy.log($xml);
+                    annotationProxy.log('GOT annotation in getAnnotation :'+xml);    
+                    annotationProxy.log(xml);
                     var om_object = annotation2om_object($xml);
-                    
+                    annotationProxy.log('converted to om_object');
+                    annotationProxy.log(om_object);
                     callback.call(undefined, om_object);
                 },
@@ -70 +71 @@
         deleteAnnotationByOid: function(oid) {
             annotationProxy.log('entering DELETE for oid: '+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
+            var aid = annotationProxy.getAidFromOid(oid);
             
-            aid = rtn[0].dasish_aid;
             annotationProxy.log('Resolved the AID for oid: '+oid+' for aid: '+aid);
             if (aid) { // ajax request only for annotations posted to and available in backend database
@@ -121 +119 @@
                     // Firebug.Console.log(bitsObjectMng.Database.getObject({oid: oid}));
 
-                    var aSql = 'update om_object set dasish_aid = "' + aid + '" where oid="' + oid + '"';
+                    var aSql = 'UPDATE om_object SET dasish_aid = "' + aid + '" WHERE oid="' + oid + '"';
                     annotationProxy.log(aSql);
                     // insert request to local sqlite database where aid gets inserted
-                    var rtn = bitsObjectMng.Database.cmd("", aSql); // aMode = "" defaults to predefined value; aSql contains sql statement
+                    var rtn = bitsObjectMng.Database.cmd('', aSql); // aMode = "" defaults to predefined value; aSql contains sql statement
                     annotationProxy.log('UPDATE of AID done');
                     annotationProxy.log(rtn);

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

@@ -7 +7 @@
         getLoggedInInfo: function(){
             var user_placeholder = {
-                URI: 'https://lux17.mpi.nl/ds/webannotator/api/users/00000000-0000-0000-0000-0000000009999',
+                URI : 'https://lux17.mpi.nl/ds/webannotator/api/users/00000000-0000-0000-0000-0000000009999',
                 uid : '00000000-0000-0000-0000-0000000009999',
-                dislayName: 'Test Testsson',
-                eMail: 'test@test.com'
+                dislayName : 'Test Testsson',
+                eMail : 'test@test.com'
             };
             
@@ -25 +25 @@
                     $.each(annotations, function(index, annotationURL){
                        annotationFramework.getAnnotation(annotationURL, function(result){
-                           annotationProxy.log('got Annotation ');
+                           annotationProxy.log('checking if annotation exist in DB:');
                            annotationProxy.log(result);
-                           
-                           if(bitsObjectMng.Database._dasish_aid_exists('_uncategorized', result.dasish_aid, true)){
-                               annotationProxy.log('AID already in database : ' + result.dasish_aid);
-                           }else{
-                                bitsObjectMng.Database.addObject(result, 'dasish.remote', undefined);  
-                           }
-                           
+                           if(bitsObjectMng.Database._dasish_aid_exists('', result.dasish_aid, true)){
+                                annotationProxy.log('AID already in database : ' + result.dasish_aid);
+                            }else{
+                                annotationProxy.log('Adding annotation to database : ' + result.dasish_aid);
+                                bitsObjectMng.Database.addObject(result, '', undefined);  
+                            }   
                        });
                     });
@@ -66 +65 @@
             var annotation = om_object2annotation(om_object);
             annotationFramework.postAnnotation(annotation, om_object.oid);
-            this.log('postAnnotation : ' + annotation);
         },
         updateAnnotation: function(om_object) {
@@ -80 +78 @@
         getAidFromOid: function(oid){
             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
+            var rtn = bitsObjectMng.Database.selectB('_uncategorized', aSql); // aMode = "" defaults to predefined value; aSql contains sql statement
             
             return rtn[0].dasish_aid;