Changeset 101:7268c3ca025b in AnnotationManagerN4J for src

Timestamp:

Feb 13, 2015, 5:10:11 PM (9 years ago)

Author:

casties

Branch:

default

Message:

make admin ui view of all annotations scale better.

Location:

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

Files:

• neo4j/AnnotationStore.java (modified) (3 diffs)
• restlet/AnnotatorAnnotations.java (modified) (3 diffs)
• restlet/annotations_ui/AnnotationsResource.java (modified) (3 diffs)

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -62 +62 @@
 public class AnnotationStore {
 
-    protected static Logger logger = Logger.getLogger("de.mpiwg.itgroup.annotations.neo4j.AnnotationStore");
+    protected static Logger logger = Logger.getLogger(AnnotationStore.class.getCanonicalName());
 
     protected GraphDatabaseService graphDb;
@@ -257 +257 @@
 
     /**
+     * Returns the total number of Annotations.
+     * 
+     * @return number of annotations
+     */
+    public int getAnnotationCount() {
+        int num = -1;
+        Index<Node> idx = getNodeIndex(NodeTypes.ANNOTATION);
+        try (Transaction tx = graphDb.beginTx()) {
+            IndexHits<Node> annotNodes = idx.query("id", "*");
+            num = annotNodes.size();
+            tx.success();
+        }
+        return num;
+    }
+    
+    /**
      * Returns List of Annotations. Key has to be indexed.
      * 
      * @param key
      * @param query
-     * @return
-     */
-    public List<Annotation> getAnnotations(String key, String query) {
+     * @param limit 
+     * @param offset 
+     * @return
+     */
+    public List<Annotation> getAnnotations(String key, String query, int limit, int offset) {
+        long ts = System.currentTimeMillis();
         ArrayList<Annotation> annotations = new ArrayList<Annotation>();
         Index<Node> idx = getNodeIndex(NodeTypes.ANNOTATION);
@@ -272 +291 @@
         try (Transaction tx = graphDb.beginTx()) {
             IndexHits<Node> annotNodes = idx.query(key, query);
+            int cnt = 0;
+            int max = offset + limit;
             for (Node annotNode : annotNodes) {
+                cnt += 1;
+                if (cnt < offset) continue;
                 Annotation annotation = createAnnotationFromNode(annotNode);
                 annotations.add(annotation);
-            }
-            tx.success();
-        }
+                if (limit > 0 && cnt >= max) {
+                    annotNodes.close();
+                    break;
+                }
+            }
+            tx.success();
+        }
+        logger.finer("got "+annotations.size()+" annotations in "+(System.currentTimeMillis()-ts)+"ms");
         return annotations;
     }

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

@@ -85 +85 @@
             // no id -- send all annotations
             Form form = getRequest().getResourceRef().getQueryAsForm();
-            int limit = getInt(form.getFirstValue("limit"));
-            int offset = getInt(form.getFirstValue("offset"));
+            int limit = getInt(form.getFirstValue("limit", "1000"));
+            int offset = getInt(form.getFirstValue("offset", "0"));
             String sortBy = form.getFirstValue("sortBy");
             return getAllAnnotations(authUser, limit, offset, sortBy);
@@ -113 +113 @@
 
         // read all annotations
-        List<Annotation> annotations = store.getAnnotations(null, null);
+        List<Annotation> annotations = store.getAnnotations(null, null, 0, 0);
         for (Annotation annotation : annotations) {
             // check permission
@@ -131 +131 @@
         JSONArray rows = new JSONArray();
         int cnt = 0;
+        int max = limit + offset;
         for (JSONObject result : results) {
             cnt += 1;
-            if (offset > 0 && cnt < offset)
-                continue;
+            if (cnt < offset) continue;
             rows.put(result);
-            if (limit > 0 && cnt >= limit)
-                break;
+            if (limit > 0 && cnt >= max) break;
         }
 

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

@@ -29 +29 @@
 import java.util.logging.Logger;
 
+import org.restlet.data.Form;
 import org.restlet.data.MediaType;
 import org.restlet.data.Reference;
@@ -39 +40 @@
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
+import de.mpiwg.itgroup.annotations.restlet.AnnotatorResourceImpl;
 import de.mpiwg.itgroup.annotations.restlet.BaseRestlet;
 
@@ -70 +72 @@
     @Get("html")
     public Representation doGetHTML(Representation entity) {
-        String result = null;
+        Form form = getRequest().getResourceRef().getQueryAsForm();
+        int limit = AnnotatorResourceImpl.getInt(form.getFirstValue("limit", "100"));
+        int offset = AnnotatorResourceImpl.getInt(form.getFirstValue("offset", "0"));
+        int max = offset + limit;
+        int numannots = store.getAnnotationCount();
+        String baseUrl = this.getReference().getHierarchicalPart();
+        StringBuilder result = null;
         // list all annotations
-        result = "<html><body>\n<h1>Annotations</h1>\n<table>";
-        result += "<tr><th>uri</th><th>text</th><th>target</th><th>fragment</th><th>creator</th></tr>";
-        List<Annotation> annotations = store.getAnnotations("id", "*");
+        result = new StringBuilder("<html><body>\n<h1>Annotations</h1>\n");
+        result.append("<p>");
+        if (offset > 0) {
+            result.append(String.format(" <a href=\"%s?offset=%s&limit=%s\">prev</a> ", baseUrl, Math.max(offset - limit, 0), limit));
+        }
+        result.append(String.format("| %s - %s of %s annotations |", offset, (offset + limit), numannots));
+        if (max < numannots) {
+            result.append(String.format(" <a href=\"%s?offset=%s&limit=%s\">next</a>", baseUrl, Math.min(max, numannots), limit));
+        }
+        result.append("</p>\n");
+        result.append("<table>");
+        result.append("<tr><th>uri</th><th>text</th><th>target</th><th>fragment</th><th>creator</th></tr>");
+        List<Annotation> annotations = store.getAnnotations("id", "*", limit, offset);
         for (Annotation annotation : annotations) {
             Reference url = this.getReference().clone();
             url.addSegment(annotation.getUrlId());
-            result += String.format("<tr><td><a href=\"%s\">%s</a></td><td>%s</td><td><a href=\"%s\">%s</a></td><td>%s</td><td>%s</td></tr>\n", url,
+            result.append(String.format("<tr><td><a href=\"%s\">%s</a></td><td>%s</td><td><a href=\"%s\">%s</a></td><td>%s</td><td>%s</td></tr>\n", url,
                     annotation.getUri(), annotation.getBodyText(), annotation.getTargetBaseUri(), annotation.getTargetBaseUri(), 
-                    annotation.getTargetFragment(), annotation.getCreatorName());
+                    annotation.getTargetFragment(), annotation.getCreatorName()));
         }
-        result += "</table>\n";
-        result += "</body>\n</html>";
+        result.append("</table>\n");
+        result.append("</body>\n</html>");
         return new StringRepresentation(result, MediaType.TEXT_HTML);
     }