Changeset 31:9f653697437e in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet

Timestamp:

Sep 25, 2012, 7:47:58 PM (13 years ago)

Author:

dwinter

Branch:

default

Message:

annotationbrowser

Location:

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

Files:

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

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/AnnotatorAnnotationsByTags.java

@@ -65 +65 @@
     
         if (sortBy!=null){
-                sortAnnotations(results,sortBy);
+                JSONObjectComparator.sortAnnotations(results,sortBy);
         }
                 
@@ -88 +88 @@
 
     
-        /**
-         * Sortiere array nach einem Parameter in den Annotationen
-         * @param results
-         * @return
-         */
-        private void sortAnnotations(List<JSONObject> results,String attribute) {
-                JSONObjectComparator comp = new JSONObjectComparator(attribute);
-                
-                
         
-                java.util.Collections.sort( results, comp);
-                
-                
-
-        }               
 }

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

@@ -42 +42 @@
         router.attach("/groups/{id}/", GroupResource.class);
         router.attach("/groups/{id}/members", GroupMembersResource.class);
-
+              
         router.attach("/", InfoResource.class);
         // authenticator.setNext(router);

src/main/java/de/mpiwg/itgroup/annotations/restlet/utils/JSONObjectComparator.java

@@ -2 +2 @@
 
 import java.util.Comparator;
+import java.util.List;
 
 import de.mpiwg.itgroup.annotations.Annotation;
@@ -34 +35 @@
     }
         
-  
+        /**
+         * Sortiere array nach einem Parameter in den Annotationen
+         * @param results
+         * @return
+         */
+        public static void sortAnnotations(List<JSONObject> results,String attribute) {
+                JSONObjectComparator comp = new JSONObjectComparator(attribute);
+                
+                
+        
+                java.util.Collections.sort( results, comp);
+                
+                
+
+        }        
         
 }