Changeset 4667

Timestamp:

03/11/14 15:31:21 (10 years ago)

Author:

olof

Message:

some cleanup of log-functions

Location:

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

Files:

• annotation-service.js (modified) (5 diffs)
• conversion.utils.js (modified) (5 diffs)

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

@@ -29 +29 @@
                 beforeSend: function(xhr){xhr.setRequestHeader('Content-Type', 'application/xml');},
                 success: function(xml, textStatus, jqXHR) {
-                                    
-                    
                     var annotations = Array();
                     
@@ -40 +38 @@
                         annotationProxy.log(this.getAttribute('ref'));
                         
-                        
                         annotations.push(this.getAttribute('ref'));
                     });
                     
-
                     callback.call(undefined, annotations);
                 },
                 error: function(result){
                     annotationProxy.log('ERROR calling the annotation backend '+result);
-                    Firebug.Console.log(result);
                 }
             });
@@ -74 +69 @@
         },
         deleteAnnotationByOid: function(oid) {
-            Firebug.Console.log('entering DELETE for oid: '+oid);
+            annotationProxy.log('entering DELETE for oid: '+oid);
             var aid;
             var aSql = 'select dasish_aid from om_object where oid="' + oid + '"';
@@ -87 +82 @@
                     error: function(jqXHR, status, thrownError) {
                         // Handle any errors
-                        if (typeof Firebug !== 'undefined' && Firebug.Console) {
-                            Firebug.Console.log("+ + + + + + + + + + + + + + + + + + + + + + + +");
-                            Firebug.Console.log("Status Code (DELETE request): " + jqXHR.status);
-                            Firebug.Console.log("Error DELETE request: " + thrownError);
-                        }
+
+                        annotationProxy.log("+ + + + + + + + + + + + + + + + + + + + + + + +");
+                        annotationProxy.log("Status Code (DELETE request): " + jqXHR.status);
+                        annotationProxy.log("Error DELETE request: " + thrownError);
                     },
                     success: function(result) {
-                        if (typeof Firebug !== 'undefined' && Firebug.Console) {
-                            Firebug.Console.log("DELETE request was successful.");
-                            Firebug.Console.log(result);
-                        }
+                        
+                            annotationProxy.log("DELETE request was successful.");
+                            annotationProxy.log(result);
                     }
                 });
@@ -135 +128 @@
                     // insert request to local sqlite database where aid gets inserted
                     var rtn = bitsObjectMng.Database.cmd("", aSql); // aMode = "" defaults to predefined value; aSql contains sql statement
-                    Firebug.Console.log('UPDATE of AID done');
-                    Firebug.Console.log(rtn);
+                    annotationProxy.log('UPDATE of AID done');
+                    annotationProxy.log(rtn);
                     // Database insert request is true if successful
                     // Firebug.Console.log(rtn);

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

@@ -1 +1 @@
 /***
- * 
+ * Convert an DWAN XML annotation to a WiredMarker annotation object
  * @param {object} annotation annotation object from webservice
  * @returns {annotationToOmObject.om_object} an object for Wired Marker
@@ -39 +39 @@
     om_object.dasish_aid = URI.split('/annotations/')[1];
 
+    //get xpointer from url
     var urlParts = link.split("#xpointer");
 
@@ -85 +86 @@
 
 /**
- * converts wired marker annotations to dassish annotations
+ * Converts WiredMarker annotation object to DWAN XML annotation
  * @param {object} om_object contains wired marker object for annotation
  * @returns {String} annotation in xml
@@ -113 +114 @@
     path.endType = RegExp.$3;
 
-    var xpointer = '';
-
-    xpointer += "#xpointer(start-point(string-range(" + path.start + "/text()[1],''," + path.startOffset + "))";
-    xpointer += "/range-to(string-range(" + path.end + "/text()[1],''," + path.endOffset + ")))";
+    var xpointer = "#xpointer(start-point(string-range(" + path.start + "/text()[1],''," + path.startOffset + "))";
+    xpointer    += "/range-to(string-range(" + path.end + "/text()[1],''," + path.endOffset + ")))";
 
     var annotation = '<?xml version="1.0" encoding="UTF-8"?>\n\
@@ -173 +172 @@
     };
 }
-
-/*
- From SQL-lite for wired-marker
- <PROPERTY>
- <HYPER_ANCHOR>http://localhost/annotation/test/test-service.html#hyperanchor1.3%3A%2Fhtml%5B1%5D%2Fbody%5B1%5D%2Fdiv%5B2%5D%2Fp%5B1%5D(0)(3)(Ane)%26%2Fhtml%5B1%5D%2Fbody%5B1%5D%2Fdiv%5B2%5D%2Fp%5B1%5D(45)(3)(ter)%26background-color%3A%20rgb(%2044%2C%20254%2C%20%2081)%3Bcolor%3Argb(0%2C0%2C0)%3B</HYPER_ANCHOR>
- <NOTE>text om en fï¿œrfattare</NOTE>
- </PROPERTY>
- unescaped: http://localhost/annotation/test/test-service.html#hyperanchor1.3:/html[1]/body[1]/div[2]/p[1](0)(3)(Ane)&/html[1]/body[1]/div[2]/p[1](45)(3)(ter)&background-color: rgb( 44, 254, 81);color:rgb(0,0,0);text om en fï¿œrfattare
- */