Changeset 5274 for DASISH

Timestamp:

05/23/14 13:40:46 (10 years ago)

Author:

olof.olsson@snd.gu.se

Message:

added open remote cache menu action

Location:

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

Files:

• annotator-service/annotation-service.js (modified) (4 diffs)
• annotator-service/annotations.wired.marker.js (modified) (1 diff)
• autocacheSidebarOverlay.xul (modified) (1 diff)

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

@@ -163 +163 @@
                     // Database insert request is true if successful
                     // Firebug.Console.log(rtn);
+                    annotationProxy.log('called cache stuff');
                     callback.call(undefined, aid);  
-                    annotationProxy.log('called cache stuff');
+                    
                 }
             });
@@ -227 +228 @@
             var xhr = new XMLHttpRequest();
             xhr.onload = function() {
-                annotationProxy.log("Cache POST status: "+xhr.status);
+                annotationProxy.log("Cache POST status for "+targetURL+": "+xhr.status);
+                annotationProxy.log(xhr.statusText);
             };
             xhr.open("POST", targetURL, true);
@@ -242 +244 @@
                            cache+'\n\n' +
                            '--'+boundary+'--';
+            annotationProxy.log(postBody);       
             xhr.send(postBody);
         },
@@ -264 +267 @@
             });         
         },
+        getCacheURL: function (targetURL, callback){
+            $.ajax({
+                type: "GET",
+                url: targetURL,
+                dataType: "xml",
+                success: function(xml, textStatus, jqXHR) {
+                    $xml = $.parseXML(jqXHR.responseText);
+                    
+                    jQuery($xml).find('cached').each(function() {
+                        var cacheURL = this.getAttribute('ref');
+                        callback.call(undefined, cacheURL);
+                    });
+                    
+                                 
+                }
+            });               
+        },
         setBackend: function(url) {
             this.backend = url;

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

@@ -118 +118 @@
             });
         },
-        getCacheURL: function(om_object){
+        openRemoteCache: function(event){
+            this.log(event);
+            var oid = bitsAutocacheService.bitsItemView.object.oid;
+            var cacheUrl = this.getCacheURL(oid);
+            
+            
+        },
+        getCacheURL: function(oid, tabbed){
+            var aid = this.getAidFromOid(oid);
+            annotationFramework.getTargets(aid, function(targets){
+                var targetURL = targets[0];
+                annotationProxy.log('targets');
+                annotationProxy.log(targets[0]);
+                annotationFramework.getCacheURL(targetURL, function(cacheURL){
+                    cacheURL += '/stream';
+                    annotationProxy.log('cacheURL');
+                    annotationProxy.log(cacheURL);
+                    
+                    bitsAutocacheService.Common.loadURL(cacheURL,tabbed);
+                });
+            });
             
         },

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

@@ -122 +122 @@
                         id="bitsItemTreePopupCacheOpenRemote"
                         label="&markingcollection.autocache.open.remote;"
-                        oncommand="alert('TODO remote cache')"/>
+                        oncommand="window.top.annotationProxy.openRemoteCache(event, false);"/>
                     <menuitem
                         id="bitsItemTreePopupCacheOpenRemoteNewTab"
                         label="&markingcollection.autocache.open.remotenewtab;"
-                        oncommand="alert('TODO remote cache in new tab')"/>
+                        oncommand="window.top.annotationProxy.openRemoteCache(event, true);"/>
                     <menuitem
                         id="bitsItemTreePopupCacheOpen"