Changeset 4738

Timestamp:

03/18/14 10:45:07 (10 years ago)

Author:

olof.olsson@snd.gu.se

Message:

send cache as multipart/mixed fixed

Location:

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

Files:

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

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

@@ -180 +180 @@
             });
         },
-        postCache: function(targetURL, cacheMetadata, cache){
-            var data = new FormData();
-            data.append('metadata', cacheMetadata);
-            data.append('cache', cache);
-            annotationProxy.log('POST cache to '+targetURL);
-            annotationProxy.log(data);
-            
-            $.ajax({
-                type: "POST",
-                url: targetURL,
-                data: data,
-                async: false,
-                cache: false,
-                contentType: "application/xml",
-                processData: false,              
-                success: function(xml, textStatus, jqXHR) {
-                    annotationProxy.log('RESULT FROM CACHE STUFF');
-                    annotationProxy.log("Status Code POST request: " + jqXHR.status);
-                    annotationProxy.log("Response Body: " + jqXHR.responseText);
-                },
-                error: function(jqXHR, status, thrownError) {
-                    // Handle any errors
-                    
-                    annotationProxy.log("+ + + + + + + + + + + + + + + + + + + + + + + +");
-                    annotationProxy.log("Faild to POST cache for : " + targetURL);
-                    annotationProxy.log("Status Code: " + jqXHR.status);
-                    annotationProxy.log("Error : " + thrownError);
-                    
-                }
-            });
+        postCache: function(targetURL, cacheMetadata, cache, cacheMimeType){
+            var xhr = new XMLHttpRequest();
+            xhr.onload = function() {
+                annotationProxy.log("Cache POST status: "+xhr.status);
+            };
+            xhr.open("POST", targetURL, true);
+            
+            xhr.setRequestHeader("Content-Type","multipart/mixed; boundary="+boundary);
+            
+            //build the multipart body
+            var boundary = '---------------------------'+Date.now();
+            var postBody = '--'+boundary+'\n' +
+                           'Content-Type:application/xml\n\n' +
+                           cacheMetadata+'\n\n' +
+                           '--'+boundary+'\n' +
+                           'Content-Type:'+cacheMimeType+'\n\n' +
+                           cache+'\n\n' +
+                           '--'+boundary+'--';
+            xhr.send(postBody);
         },
         getTargets : function(aid, callback){

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

@@ -20 +20 @@
                     callback.call(undefined, jqXHR.status);
                 }
-                
             });
             
@@ -36 +35 @@
 
             annotationFramework.getAnnotations(url,
-                    function(annotations) {
-                        annotationProxy.log('got annotations ');
-                        annotationProxy.log(annotations);
+                function(annotations) {
+                    annotationProxy.log('got annotations ');
+                    annotationProxy.log(annotations);
 
-                        $.each(annotations, function(index, annotationURL) {
-                            annotationFramework.getAnnotation(annotationURL, function(result) {
-                                annotationProxy.log('checking if annotation exist in DB:');
-                                annotationProxy.log(result);
-                                
-                                //check if this annotation is already in the one of the local databases
-                                if (bitsObjectMng.Database._dasish_aid_exists(annotationProxy.defaltDatabase, result.dasish_aid, true)) {
-                                    annotationProxy.log('AID already in database '+annotationProxy.defaltDatabase+': ' + result.dasish_aid);
-                                }else if(bitsObjectMng.Database._dasish_aid_exists('_uncategorized', result.dasish_aid, true)){
-                                    annotationProxy.log('AID already in database _uncategorized: ' + result.dasish_aid);
-                                } else {
-                                    annotationProxy.log('Adding annotation to database : ' + result.dasish_aid);
-                                    bitsObjectMng.Database.addObject(result, annotationProxy.defaltDatabase, undefined);
-                                }
-                            });
+                    $.each(annotations, function(index, annotationURL) {
+                        annotationFramework.getAnnotation(annotationURL, function(result) {
+                            annotationProxy.log('checking if annotation exist in DB:');
+                            annotationProxy.log(result);
+
+                            //check if this annotation is already in the one of the local databases
+                            if (bitsObjectMng.Database._dasish_aid_exists(annotationProxy.defaltDatabase, result.dasish_aid, true)) {
+                                annotationProxy.log('AID already in database '+annotationProxy.defaltDatabase+': ' + result.dasish_aid);
+                            }else if(bitsObjectMng.Database._dasish_aid_exists('_uncategorized', result.dasish_aid, true)){
+                                annotationProxy.log('AID already in database _uncategorized: ' + result.dasish_aid);
+                            } else {
+                                annotationProxy.log('Adding annotation to database : ' + result.dasish_aid);
+                                bitsObjectMng.Database.addObject(result, annotationProxy.defaltDatabase, undefined);
+                            }
                         });
-                    }
+                    });
+                }
             );
         },
@@ -67 +66 @@
                     annotationFramework.getTargets(aid, 
                         function(targets){
+                            //POST cache representation for HTML
                             var htmlDump = annotationProxy.getCurrentHtmlDocument();
-                            var cacheMetadata = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n\
-                                                 <cashedRepresentationInfo xmlns="http://www.dasish.eu/ns/addit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" URI="https://lux17.mpi.nl/ds/webannotator/api/cached/00000000-0000-0000-0000-000000000051" xsi:schemaLocation="http://www.dasish.eu/ns/addit https://svn.clarin.eu/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd">\n\
-                                                    <mimeType>text/plain</mimeType>\n\
-                                                    <tool>DWAN</tool>\n\
-                                                    <type>html</type>\n\
-                                                 </cashedRepresentationInfo>';
-                            annotationProxy.log(cacheMetadata);
+                            var cacheMetadata = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n'+
+                                                '<cashedRepresentationInfo xmlns="http://www.dasish.eu/ns/addit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \n'+
+                                                '    URI="tmpNewCacheURI" xsi:schemaLocation="http://www.dasish.eu/ns/addit https://svn.clarin.eu/DASISH/t5.6/schema/trunk/annotator-schema/src/main/resources/DASISH-schema.xsd">\n'+
+                                                '    <mimeType>text/html</mimeType>\n'+
+                                                '    <tool>DWAN</tool>\n'+
+                                                '    <type>html</type>\n'+
+                                                '</cashedRepresentationInfo>';
+                            var cacheMimeType = 'text/html';
                             $.each(targets, function(index, targetURL){
                                 var xpointer = encodeURIComponent(om_object_xpointer(om_object));
-                                targetURL += '/fragment/placeholderForFragment/cached';
                                 
-                                annotationFramework.postCache(targetURL, htmlDump, cacheMetadata);
+                                var xpointer = xpointer.replace(/%/g,'--');
+                                annotationProxy.log(xpointer);
+                                targetURL += '/fragment/'+xpointer+'/cached';
+                                
+                                annotationFramework.postCache(targetURL, cacheMetadata, htmlDump, cacheMimeType);
                             });
                     });
@@ -110 +114 @@
             var temp = xmlS.serializeToString(document);
             return temp;
-            
         },
         log: function(message) {