Changeset 3340

Timestamp:

08/09/13 09:57:57 (11 years ago)

Author:

sroth

Message:

Updated mock functionality and file contents.

Location:

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

Files:

• mockjax-xml.html (modified) (1 diff)
• mockjax-xml.js (modified) (4 diffs)
• mocks/annotations-sagrada-GET.xml (modified) (2 diffs)

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

@@ -16 +16 @@
         <!-- Libraries -->
         <!-- <script src="../lib/jquery-1.10.2.min.js"></script> -->
+        
+        <!-- Observe: jquery 1.8.3 version required in order to have proxy approach work with mockjax! -->
         <script src="../../lib/jquery-1.8.3.min.js"></script>
         

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/test/mockjax/mockjax-xml.js

@@ -7 +7 @@
 var url = '/api/annotations?link="http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia"';
 
+// Mock for Responding GET api/annotations?link="URI"
 $.mockjax({
     /* url: A string or regular expression specifying the url of the request that the data should be mocked for. */
     // url: '/api/annotations?link="http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia"&access=read',
     url: url,
+    // url: '/api/annotations?link="http://en.wikipedia.org/wiki/Sagrada_Fam%C3%ADlia"',
     /* type: Specify what HTTP method to match, usually GET or POST. Case-insensitive, so get and post also work. */
     type: 'GET',
@@ -18 +20 @@
     responseTime: 750,
     /* proxy: A string specifying a path to a file, from which the contents will be returned for the request. */
-    proxy: 'mocks/annotations-sagrada-GET.xml'
+    proxy: 'mocks/annotations-sagrada-GET.xml',
+});
+
+// Mock for Responding GET api/annotations/AID20130808114716 (annot-0001-GET.xml)
+$.mockjax({
+    url: '/api/annotations/AID20130808114716',
+    type: 'GET',
+    dataType: 'xml',
+    responseTime: 750,
+    proxy: 'mocks/annot-0001-GET.xml',
+});
+
+// Mock for Responding GET api/annotations/AID20130808124131 (annot-0002-GET.xml)
+$.mockjax({
+    url: '/api/annotations/AID20130808124131',
+    type: 'GET',
+    dataType: 'xml',
+    responseTime: 750,
+    proxy: 'mocks/annot-0002-GET.xml',
 });
 
@@ -29 +49 @@
                 type: 'GET',
                 success: function(xml, textStatus, jqXHR) {
-                // success: function(xml) {    
-                // can be used if parameters textStatus and jqXHR are not required within the following code block
-                    
+                    // success: function(xml) {    
+                    // can be used if parameters textStatus and jqXHR are not required within the following code block
+
                     $xml = $(xml);
                     
@@ -45 +65 @@
                         aidArr.push($(this).attr('ref').substr(29)); // http://dasish.eu/annotations/ is erased
                     });
-  
+
                     console.log(aidArr);
-                    
-                    for(var i in aidArr) {
+
+                    for (var i in aidArr) {
                         aid_string += '<br />' + aidArr[i];
                         $('#xmlContents').html('<h4 style="margin-bottom: 0;">List of AIDs returned from REST service address<br />GET api/annotations?link="URI":</h4>' + aid_string);
+                        url = "";
+                        url = '/api/annotations/' + aidArr[i];
+                        
+                        $.ajax({
+                            url: url,
+                            dataType: 'xml',
+                            type: 'GET',
+                            success: function(xml) {
+                                
+                                $xml = $(xml);
+   
+                                var body = "";
+                                $xml.find('annotation').each(function() {
+                                    body = $(this).find('body').text();
+  
+                                    $('#xmlContents').append("<br /><br /><strong>Body content of " + aidArr[i] + ":</strong><br /><em>" + body + "</em>");
+                                    
+                                });   
+                                
+                            }
+                        });
+
                     }
-                    
+
                 }
+
             });
         }

DASISH/t5.6/client/trunk/chrome/markingcollection/content/markingcollection/annotator-service/test/mockjax/mocks/annotations-sagrada-GET.xml

@@ -18 +18 @@
         </targetSources>
     </annotation>
+    <!--
     <annotation ref="http://dasish.eu/annotations/AIDzyy">
         <owner ref="http://dasish.eu/users/UIDefef"/>
@@ -25 +26 @@
         </targetSources>
     </annotation>
+    -->
 </annotations>