Changeset 5:bbf0cc5bee29 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet

Timestamp:

Jul 3, 2012, 7:23:17 PM (12 years ago)

Author:

casties

Branch:

default

Message:

version 0.2 really works now

Location:

src/main/java/de/mpiwg/itgroup/annotations/restlet

Files:

• AnnotatorResourceImpl.java (modified) (12 diffs)
• RestServer.java (modified) (8 diffs)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -9 +9 @@
 import java.security.InvalidKeyException;
 import java.security.SignatureException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -178 +180 @@
      */
     public JSONObject createAnnotatorJson(Annotation annot) {
+        // return user as a JSON object (otherwise just as string)
         boolean makeUserObject = true;
         JSONObject jo = new JSONObject();
@@ -198 +201 @@
                 userObject.put("id", userId);
                 // get full name
-                RestServer restServer = (RestServer) getApplication();
-                String userName = restServer.getUserNameFromLdap(userId);
+                String userName = annot.getCreatorName();
+                if (userName == null) {
+                    RestServer restServer = (RestServer) getApplication();
+                    userName = restServer.getFullNameFromLdap(userId);
+                }
                 userObject.put("name", userName);
                 // save user object
@@ -241 +247 @@
         try {
             for (String xpointer : xpointers) {
-                String decoded = URLDecoder.decode(xpointer, "utf-8");
+                //String decoded = URLDecoder.decode(xpointer, "utf-8");
+                String decoded = xpointer;
                 Matcher m = rg.matcher(decoded);
 
@@ -266 +273 @@
             // TODO Auto-generated catch block
             e.printStackTrace();
-        } catch (UnsupportedEncodingException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
+        }
         return ja;
     }
@@ -282 +285 @@
         try {
             for (String xpointer : xpointers) {
-                String decoded = URLDecoder.decode(xpointer, "utf-8");
+                //String decoded = URLDecoder.decode(xpointer, "utf-8");
+                String decoded = xpointer;
                 Matcher m = rg.matcher(decoded);
 
@@ -300 +304 @@
             // TODO Auto-generated catch block
             e.printStackTrace();
-        } catch (UnsupportedEncodingException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-
+        }
         return ja;
     }
 
-    protected String parseArea(JSONObject area) throws JSONException, UnsupportedEncodingException {
+    protected String parseArea(JSONObject area) throws JSONException {
         String x = area.getString("x");
         String y = area.getString("y");
@@ -317 +317 @@
             height = area.getString("height");
         }
-        String fragment = URLEncoder.encode(String.format("xywh=fraction:%s,%s,%s,%s", x, y, width, height), "utf-8");
+        String fragment = String.format("xywh=fraction:%s,%s,%s,%s", x, y, width, height);
         return fragment;
     }
 
-    protected String parseRange(JSONObject range) throws JSONException, UnsupportedEncodingException {
+    protected String parseRange(JSONObject range) throws JSONException {
         String start = range.getString("start");
         String end = range.getString("end");
@@ -327 +327 @@
         String endOffset = range.getString("endOffset");
 
-        String fragment = URLEncoder.encode(String.format(
+        String fragment = String.format(
                 "xpointer(start-point(string-range(\"%s\",%s,1))/range-to(end-point(string-range(\"%s\",%s,1))))", start,
-                startOffset, end, endOffset), "utf-8");
+                startOffset, end, endOffset);
         return fragment;
     }
 
     /**
-     * creates an Annotation object with data from JSON.
+     * Creates an Annotation object with data from JSON.
      * 
      * uses the specification from the annotator project: {@link https
@@ -352 +352 @@
     }
 
+    /**
+     * Updates an Annotation object with data from JSON.
+     * 
+     * uses the specification from the annotator project: {@link https
+     * ://github.com/okfn/annotator/wiki/Annotation-format}
+     * 
+     * The username will be transformed to an URI if not given already as URI,
+     * if not it will set to the MPIWG namespace defined in
+     * de.mpiwg.itgroup.annotationManager.Constants.NS
+     * 
+     * @param annot
+     * @param jo
+     * @return
+     * @throws JSONException
+     * @throws UnsupportedEncodingException
+     */
     public Annotation updateAnnotation(Annotation annot, JSONObject jo, Representation entity) throws JSONException,
             UnsupportedEncodingException {
-        // annotated uri
+        // target uri
         if (jo.has("uri")) {
             annot.setTargetBaseUri(jo.getString("uri"));
@@ -397 +413 @@
             username = authUser;
         }
-        // username should be a URI, if not it will set to the MPIWG namespace
-        // defined in
-        // de.mpiwg.itgroup.annotationManager.Constants.NS
+        // try to get full name
+        if (username != null) {
+            RestServer restServer = (RestServer) getApplication();
+            String fullName = restServer.getFullNameFromLdap(username);
+            annot.setCreatorName(fullName);
+        }
+        // userUri should be a URI, if not it will set to the MPIWG namespace
         if (userUri == null) {
             if (username.startsWith("http")) {
@@ -408 +428 @@
         }
         // TODO: should we overwrite the creator?
+        if (annot.getCreatorUri() == null) {
+            annot.setCreatorUri(userUri);
+        }
+        
+        if (annot.getCreated() == null) {
+            // set creation date
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+            String ct = format.format(Calendar.getInstance().getTime());
+            annot.setCreated(ct);
+        }
 
         // create xpointer from the first range/area

src/main/java/de/mpiwg/itgroup/annotations/restlet/RestServer.java

@@ -41 +41 @@
     public String CONSUMER_KEYS_PATH = "WEB-INF/consumerkeys.property";
 
+    private Properties serverConfig;
+    public String CONFIG_PROPS_PATH = "WEB-INF/serverconfig.property";
+
     private GraphDatabaseService graphDb;
     public static final String GRAPHDB_KEY = "annotationmanager.graphdb";
-    public String DB_PATH = "WEB-INF/neo4j-annotation-db";
+    public static final String GRAPHDB_PATH_KEY = "annotationmanager.graphdb.path";
+    public String graphdbPath = "WEB-INF/neo4j-annotation-db";
 
     private WrappingNeoServerBootstrapper srv;
@@ -64 +68 @@
                 .get("org.restlet.ext.servlet.ServletContext");
         if (sc != null) {
+            /*
+             * read config from webapp
+             */
+            serverConfig = new Properties();
+            InputStream ps1 = getResourceAsStream(sc, CONFIG_PROPS_PATH);
+            if (ps1 != null) {
+                logger.debug("loading config from " + CONFIG_PROPS_PATH);
+                try {
+                    serverConfig.load(ps1);
+                    /*
+                     * read serverconfig options
+                     */
+                    graphdbPath = serverConfig.getProperty(GRAPHDB_PATH_KEY, graphdbPath);
+                } catch (IOException e) {
+                    logger.warn("Error loading server config: ", e);
+                }
+                logger.debug("config: " + serverConfig);
+            } else {
+                logger.error("Unable to get resource " + CONFIG_PROPS_PATH);
+            }
             // look for database service in context
             graphDb = (GraphDatabaseService) sc.getAttribute(GRAPHDB_KEY);
@@ -70 +94 @@
                  * open database
                  */
-                String dbFn = getResourcePath(sc, DB_PATH);
+                String dbFn = getResourcePath(sc, graphdbPath);
                 if (dbFn != null) {
                     logger.debug("opening DB " + dbFn);
@@ -87 +111 @@
                     srv.start();
                 } else {
-                    logger.error("Unable to get resource " + DB_PATH);
+                    logger.error("Unable to get resource " + dbFn);
                 }
             }
@@ -94 +118 @@
              */
             consumerKeys = new Properties();
-            InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
-            if (ps != null) {
+            InputStream ps2 = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
+            if (ps2 != null) {
                 logger.debug("loading consumer keys from " + CONSUMER_KEYS_PATH);
                 try {
-                    consumerKeys.load(ps);
+                    consumerKeys.load(ps2);
                 } catch (IOException e) {
                     // TODO Auto-generated catch block
@@ -155 +179 @@
      * @return
      */
-    public String getUserNameFromLdap(String creator) {
+    public String getFullNameFromLdap(String creator) {
         String retString = creator; // falls nichts gefunden wird einfach den
                                     // creator zurueckgeben
@@ -163 +187 @@
 
         // TODO: should go into config file
-        String ldapUrl = "ldap://ldapreplik.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de"; 
+        String ldapUrl = "ldap://ldap.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de"; 
         env.put(javax.naming.Context.PROVIDER_URL, ldapUrl);
 
@@ -175 +199 @@
         }
 
-        String base = "ou=People";
+        String base = "ou=people";
 
         SearchControls sc = new SearchControls();