Changeset 34:8427930c5f88 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet

Timestamp:

Sep 25, 2012, 8:20:17 PM (13 years ago)

Author:

casties

Branch:

default

Parents:

33:86bb29132ba6 (diff), 31:9f653697437e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 8ad8596a570af38aacfaecdb68b7e06145624181

Location:

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

Files:

• AnnotatorAnnotations.java (modified) (1 diff)
• AnnotatorAnnotations.java (modified) (4 diffs)
• annotations_ui/AnnotationsUiRestlet.java (modified) (2 diffs)

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

@@ -276 +276 @@
         
         // delete annotation
-        store.deleteById(id);
+        store.deleteAnnotationById(id);
         setStatus(Status.SUCCESS_NO_CONTENT);
         return null;

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

@@ -6 +6 @@
 
 import java.io.IOException;
-
+import java.util.ArrayList;
+import java.util.List;
+
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.restlet.data.Form;
+import org.restlet.data.Parameter;
 import org.restlet.data.Status;
 import org.restlet.ext.json.JsonRepresentation;
@@ -19 +24 @@
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.Person;
+import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
+import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;
 
 /**
@@ -50 +57 @@
 
         if (id == null) {
-            // TODO: what to return without id - list all annotations?
-            setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
-            return null;
+            
+            return getAllAnnotations();
         }
 
@@ -77 +83 @@
     }
 
-    /**
+    private Representation getAllAnnotations() {
+        
+         Form form = getRequest().getResourceRef().getQueryAsForm();
+           String sortBy=null;
+           for (Parameter parameter : form) {
+             if (parameter.getName().equals("sortBy")){
+             sortBy =  parameter.getValue();
+             }
+           }
+        
+        AnnotationStore store = getAnnotationStore();
+        ArrayList<JSONObject> results = new ArrayList<JSONObject>();
+       
+        List<Annotation> annotations = store.getAnnotations(null, null);
+        for (Annotation annotation : annotations) {
+                
+                 JSONObject jo = createAnnotatorJson(annotation,false);
+             results.add(jo);
+           
+            }
+        
+        if (sortBy!=null){
+                JSONObjectComparator.sortAnnotations(results,sortBy);
+        }
+        
+        JSONArray resultsJa = new JSONArray();
+        for (JSONObject result:results){
+                resultsJa.put(result);
+        }
+        
+        // assemble result object
+        JSONObject result = new JSONObject();
+        try {
+            result.put("rows", resultsJa);
+            result.put("total", resultsJa.length());
+        } catch (JSONException e) {
+            setStatus(Status.SERVER_ERROR_INTERNAL, "JSON Error");
+            return null;
+        }
+        logger.debug("sending:");
+        logger.debug(result);
+        return new JsonRepresentation(result);
+    }
+
+        
+        
+        
+
+        /**
      * POST with JSON content-type. Creates a new Annotation.
      * 

src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java

@@ -17 +17 @@
 public class AnnotationsUiRestlet extends BaseRestlet {
 
-    public final String version = "AnnotationManagerN4J/AnnotationStore 0.1";
+    public final String version = "AnnotationManagerN4J/AnnotationsUI 0.2";
 
     public static Logger logger = Logger.getLogger(AnnotationsUiRestlet.class);
@@ -42 +42 @@
         router.attach("/groups/{id}/", GroupResource.class);
         router.attach("/groups/{id}/members", GroupMembersResource.class);
-              
+        router.attach("/persons", PersonsResource.class);
+        router.attach("/persons/", PersonsResource.class);
+        router.attach("/persons/{id}", PersonResource.class);
+        router.attach("/persons/{id}/", PersonResource.class);
+
         router.attach("/", InfoResource.class);
         // authenticator.setNext(router);