Changeset 4548

Timestamp:

02/24/14 10:30:00 (10 years ago)

Author:

olof

Message:

added helper-function for checking existing aid

Location:

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection

Files:

• annotator-service/annotations.wired.marker.js (modified) (1 diff)
• objectmng.js (modified) (1 diff)

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);     
+                           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);  
+                           }
                        });
                     });

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/objectmng.js

@@ -3506 +3506 @@
                         return (fRtn>0);
                 },
+                /////////////////////////////////////////////////////////////////////
+                _dasish_aid_exists : function(aMode,dasish_aid,aTransaction){
+                        if(aMode == undefined || aMode == "") aMode = this._defaultMode;
+                        if(aTransaction == undefined) aTransaction = true;
+                        var oSql = 'select count(dasish_aid) from om_object where dasish_aid="'+dasish_aid+'"';
+                        var oRtn = this.selectCount(aMode,oSql,aTransaction);
+                        if(oRtn>0){ 
+                            return true;
+                        }else{
+                            return false;
+                        }
+                        
+                },
 
 /////////////////////////////////////////////////////////////////////