Changeset 37:34b9d044d0bf in AnnotationManagerN4J for src/main/webapp/annotationBrowser/js

Timestamp:

Sep 26, 2012, 12:48:41 PM (13 years ago)

Author:

dwinter

Branch:

default

Message:

authorisation added
js / css aufgeraeumt

Location:

src/main/webapp/annotationBrowser/js

Files:

• annotation-core.js (added)
• annotation.js (modified) (4 diffs)
• tag.js (moved) (moved from src/main/webapp/tags/js/tag.js) (3 diffs)

src/main/webapp/annotationBrowser/js/annotation.js

@@ -1 @@
-//var annotServer="http://localhost:8280/AnnotationManagerN4J/annotator/";
-var annotServer="http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager/annotator/";
-var viewerAddress="http://libcoll.mpiwg-berlin.mpg.de/libviewa?url=";
-var docNamespace="http://echo.mpiwg-berlin.mpg.de/documents/";
-
-//var dcDataPath="http://euler.mpiwg-berlin.mpg.de:58080/echo_nav/echo_pages/metadata/getDCDataFromPath?path=";
-var dcDataPath="http://libcoll.mpiwg-berlin.mpg.de/metadata/getDCDataFromPath?path=";
-var textPath="http://digilib.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=";
+function annotations(){
         
-
-function getDCdata(path,obj){
         
-        var splitted = path.split("?");
-        var docUri=splitted[0];
+        if (token==""){
+                setTimeout(function(){annotations();},500);
+                return;
+        }
         
-        docUri = docUri.replace(docNamespace,textPath);
-        var md = dcDataPath+docUri+"/index.meta";
+        var headers = {'x-annotator-auth-token':token};
         
-         $('<div/>', {
-                    'class': 'annotatonMetaData',
-                  }).load(md, function (){
-                         $(this).children().children().addClass('dcMetaData');
-                  }).appendTo(obj);
-        
-}
-
-function createLinkFromURI(uri){
-        var docUri = uri.replace(docNamespace,viewerAddress);
-        docUri = docUri.replace("?pn","&pn");
-        return docUri;
-}
-
-function annotations(){
-        $.getJSON(annotServer+'annotations?sortBy=uri', function(data) {
+        $.ajax({
+                  url: annotServer+'annotations?sortBy=uri',
+                  dataType: 'json',
+                  headers:headers,
+                  success: function(data) {
                 //var items = [];
                   var rows = data["rows"];
@@ -54 +35 @@
                   //$('#annotations').html(items.join(''));
                  
-                
+                  }
         });
 }
@@ -60 +41 @@
 
 $(document).ready(function(){
+        
+        getToken(tokenGenerator,username);
         $.getJSON(annotServer+'tags', function(data) {
                   var items = [];
@@ -78 +61 @@
         
  });
+
+
+

src/main/webapp/annotationBrowser/js/tag.js

@@ -1 @@
-//var annotServer="http://localhost:8280/AnnotationManagerN4J/annotator/";
-var annotServer="http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager/annotator/";
-var viewerAddress="http://libcoll.mpiwg-berlin.mpg.de/libviewa?url=";
-var docNamespace="http://echo.mpiwg-berlin.mpg.de/documents/";
 
-//var dcDataPath="http://euler.mpiwg-berlin.mpg.de:58080/echo_nav/echo_pages/metadata/getDCDataFromPath?path=";
-var dcDataPath="http://libcoll.mpiwg-berlin.mpg.de/metadata/getDCDataFromPath?path=";
-var textPath="http://digilib.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=";
-        
 
-function getDCdata(path,obj){
-        
-        var splitted = path.split("?");
-        var docUri=splitted[0];
-        
-        docUri = docUri.replace(docNamespace,textPath);
-        var md = dcDataPath+docUri+"/index.meta";
-        
-         $('<div/>', {
-                    'class': 'annotatonMetaData',
-                  }).load(md, function (){
-                         $(this).children().children().addClass('dcMetaData');
-                  }).appendTo(obj);
-        
-}
 
-function createLinkFromURI(uri){
-        var docUri = uri.replace(docNamespace,viewerAddress);
-        docUri = docUri.replace("?pn","&pn");
-        return docUri;
-}
 
 function annotations(tagId){
-        $.getJSON(annotServer+'tags/'+tagId+"/annotations?sortBy=uri", function(data) {
-                //var items = [];
-                  var rows = data["rows"];
-                  
-                  $('#annotations').html("");
-                  for (var i=0;i<rows.length;i++){
-                          var text=rows[i]['text'];
-                          var author=rows[i]['user']['name'];
-                          var docUri=createLinkFromURI(rows[i]['uri']);
+        var id = tagId;
+        if (token==""){
+                setTimeout(function(){annotations(id);},500);
+                return;
+        }
+        var headers = {'x-annotator-auth-token':token};
+        
+        $.ajax({
+                  url: annotServer+'tags/'+tagId+"/annotations?sortBy=uri",
+                  dataType: 'json',
+                  headers:headers,
+                  success: function(data) {
+                                //var items = [];
+                          var rows = data["rows"];
                           
-                          var ret = '<div id="an_'+i+'" class="annotationRow">';
-                          ret +='<div class="annotationCol">'+text+'</div>';
-                          ret +='<div class="annotationCol">'+author+'</div>';
-                          ret +='<div class="annotationCol"><a target="libcoll" href="'+docUri+'">'+docUri+'</a></div>';
-                          ret+="</div>";
-                                
-                          $('#annotations').append(ret);
-                          //items.push(ret);
-                          getDCdata(rows[i]['uri'],$('#an_'+i));
-                  }
-                  //$('#annotations').html(items.join(''));
-                 
-                
-        });
+                          $('#annotations').html("");
+                          for (var i=0;i<rows.length;i++){
+                                  var text=rows[i]['text'];
+                                  var author=rows[i]['user']['name'];
+                                  var docUri=createLinkFromURI(rows[i]['uri']);
+                                  
+                                  var ret = '<div id="an_'+i+'" class="annotationRow">';
+                                  ret +='<div class="annotationCol">'+text+'</div>';
+                                  ret +='<div class="annotationCol">'+author+'</div>';
+                                  ret +='<div class="annotationCol"><a target="libcoll" href="'+docUri+'">'+docUri+'</a></div>';
+                                  ret+="</div>";
+                                        
+                                  $('#annotations').append(ret);
+                                  //items.push(ret);
+                                  getDCdata(rows[i]['uri'],$('#an_'+i));
+                          }
+                  }});
 }
 
@@ -61 +41 @@
 $(document).ready(function(){
         $.getJSON(annotServer+'tags', function(data) {
+                getToken(tokenGenerator,username);
+                
                   var items = [];
                   var rows = data["rows"];
@@ -71 +53 @@
                   $('#tagList').html(items.join(''));
                  
-                });
-
-
+        });
         
- });
+        
+});