Changeset 2769

Timestamp:

04/02/13 14:01:29 (11 years ago)

Author:

olof

Message:

added comments for insertion-points for update, delete and insert

Location:

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

Files:

• annotator-service/annotations.wired.marker.js (added)
• annotator-service/test/test-service.html (modified) (1 diff)
• markingcollection.js (modified) (3 diffs)
• objectmng.js (modified) (2 diffs)
• overlay.xul (modified) (2 diffs)

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

@@ -23 +23 @@
           
             //use remote backend via local proxy
-            var proxyURL = "http://localhost/annotation/annotator-service/test/proxy.php?url="+encodeURIComponent('http://pelle.ssd.gu.se:8080/exist/rest/db/annotation-framework/api/annotations.xql');
+            var proxyURL = "http://localhost/annotations/annotator-service/test/proxy.php?url="+encodeURIComponent('http://pelle.ssd.gu.se:8080/exist/rest/db/annotation-framework/api/annotations.xql');
             annotationFramework.setBackend(proxyURL);
             

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

@@ -327 +327 @@
                 },
                 onLocationChange : function(webProgress, aRequest, aURI){
+                        //alert('get all from this url: '+webProgress.DOMWindow.document.URL);
                         if(webProgress.isLoadingDocument) return;
                         bitsMarkingCollection.marking(webProgress.DOMWindow.document);
@@ -720 +721 @@
         marking : function(aDoc, aContentURLString){
                 var url;
+                
                 if(aContentURLString){
                         url = aContentURLString;
@@ -725 +727 @@
                         url = this.Common.getURLStringFromDocument(aDoc);
                 }
+                
                 if(url.indexOf("chrome:") >= 0 || url.indexOf("about:") >= 0) return;
                 if(bitsObjectMng.getBrowser().contentDocument.location == aDoc.location) bitsMarkingCollection._location = aDoc.location;
 //this._dump("marking():url=["+url+"]");
+                //alert('marking: '+url+' aDoc '+aDoc.location);
                 var rtnObj = bitsMarkingCollection.Database.getAllObjectFormContentURL(url);
                 if(rtnObj){

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

@@ -3625 +3625 @@
                                                 var aSql1 = "insert into om_link ("+ lcolumns.join(",") +") values ("+ lvalues.join(",") +")";
                                                 var aSql2 = "insert into om_object ("+ columns.join(",") +") values ("+ values.join(",") +")";
+                                                //alert("INSERT "+aObject.note);
                                                 sqlArr.push(aSql1);
                                                 sqlArr.push(aSql2);
@@ -4926 +4927 @@
                                 if(rtn && values.length>0){
                                         var aSql = 'update om_object set '+ values.join(",") +' where oid="'+ aObject.oid +'"';
+                                        //alert("UPDATE oid: "+aObject.oid);
                                         rtn = this.cmdB(aMode,aSql,para);
                                 }

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

@@ -43 +43 @@
     <script type="application/x-javascript" src="chrome://markingcollection/content/pubmedcentral.js"/>
     <script type="application/x-javascript" src="chrome://markingcollection/content/markerRemap.js"/>
+    
+    <!-- added for annotator-service -->
+    <script type="application/x-javascript" src="chrome://markingcollection/content/annotator-service/lib/jquery-1.9.1.js"/>
+    <script type="application/x-javascript" src="chrome://markingcollection/content/annotator-service/lib/jquery.xml2json.js"/>
+    <script type="application/x-javascript" src="chrome://markingcollection/content/annotator-service/annotation-service.js"/>
+    <!-- end -->    
     <script type="application/x-javascript">
         <![CDATA[
@@ -48 +54 @@
                         window.setTimeout(
                                 function(){
+                                        
                                         bitsObjectMng.init(aEvent);
                                         bitsMarkingCollection.init(aEvent);