Changes in [27:6bc918105c9a:29:3be0ebb6d5ad] in AnnotationManagerN4J

Location:

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

Files:

• NS.java (modified) (1 diff)
• Tag.java (added)
• neo4j/AnnotationStore.java (modified) (8 diffs)
• restlet/AnnotatorAnnotationsByTags.java (added)
• restlet/AnnotatorRestlet.java (modified) (1 diff)
• restlet/AnnotatorTags.java (added)
• restlet/utils/JSONObjectComparator.java (added)

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

@@ -3 +3 @@
 public class NS {
     public static final String MPIWG_PERSONS_URL = "http://entities.mpiwg-berlin.mpg.de/persons/";
+    public static final String MPIWG_TAGS_URL = "http://entities.mpiwg-berlin.mpg.de/tags/";
     public static final String MPIWG_GROUPS_URL = "http://entities.mpiwg-berlin.mpg.de/groups/";
     public static final String OAC_NS = "http://www.openannotation.org/ns/";

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

@@ -25 +25 @@
 import de.mpiwg.itgroup.annotations.Group;
 import de.mpiwg.itgroup.annotations.Person;
+import de.mpiwg.itgroup.annotations.Tag;
 
 /**
@@ -74 +75 @@
     }
 
+    /**
+     * @param tagUri
+     * @return
+     */
+    public Node getTagNodeByUri(String tagUri) {
+        if (tagUri == null) return null;
+        Node person = getNodeIndex(NodeTypes.TAG).get("uri", tagUri).getSingle();
+        return person;
+    }
+
     public List<Actor> getActors(String key, String query, NodeTypes type) {
         ArrayList<Actor> actors = new ArrayList<Actor>();
@@ -111 +122 @@
         return groups;
     }
-
-    /**
+    
+    
+    /**
+     * Returns List of Tags.
+     * Key has to be indexed.
+     * 
+     * @param key
+     * @param query
+     * @return
+     */
+    public List<Tag> getTags(String key, String query) {
+        ArrayList<Tag> tags = new ArrayList<Tag>();
+        Index<Node> idx = getNodeIndex(NodeTypes.TAG);
+        if (key == null) {
+            key = "uri";
+            query = "*";
+        }
+        IndexHits<Node> groupNodes = idx.query(key, query);
+        for (Node groupNode : groupNodes) {
+            Tag tag = createTagFromNode(groupNode);
+            tags.add(tag);
+        }
+        return tags;
+    }
+
+ 
+   /**
      * Returns List of Groups the person is member of.
      * 
@@ -351 +387 @@
         return null;
     }
+    
+    public Tag createTagFromNode(Node tagNode) {
+        String name = (String) tagNode.getProperty("name", null);
+        String uri = (String) tagNode.getProperty("uri", null);
+        String id = (String) tagNode.getProperty("id", null);
+        
+        return new Tag(id, uri, name);
+                
+        }
+
 
     /**
@@ -466 +512 @@
                         for (String tag : newTags) {
                             // create new tag
-                            Node tagNode = getOrCreateTagNode(tag);
+                            Node tagNode = getOrCreateTagNode(new Tag(null,null,tag));
                             getOrCreateRelation(annotNode, RelationTypes.HAS_TAG, tagNode);
                         }
@@ -687 +733 @@
     }
 
-    protected Node getOrCreateTagNode(String tagname) {
+    protected Node getOrCreateTagNode(Tag inTag) {
         Index<Node> idx = getNodeIndex(NodeTypes.TAG);
+        String tagname = inTag.getName();
         IndexHits<Node> tags = idx.get("name", tagname);
         Node tag = tags.getSingle();
@@ -699 +746 @@
                 tag.setProperty("name", tagname);
                 idx.add(tag, "name", tagname);
+                
+                tag.setProperty("id", inTag.getId());
+                tag.setProperty("uri", inTag.getUri());
+                idx.add(tag, "uri", inTag.getUri());
+                
                 tx.success();
             } finally {
@@ -802 +854 @@
     }
 
+        public List<Annotation> getAnnotationsByTag(String tagUri) {
+                
+                ArrayList<Annotation> ret = new  ArrayList<Annotation>();
+                Node tag = getTagNodeByUri(tagUri);
+                
+                
+                Iterable<Relationship> rels = tag.getRelationships(Direction.INCOMING,RelationTypes.HAS_TAG);
+                
+                for (Relationship rel:rels){
+                        Node node = rel.getStartNode();
+                        ret.add(createAnnotationFromNode(node));
+                        
+                }
+                return ret;
+        }
+
 }

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

@@ -42 +42 @@
         router.attach("/search", AnnotatorSearch.class);
         router.attach("/groups", AnnotatorGroups.class);
-
+        router.attach("/tags", AnnotatorTags.class);
+        router.attach("/tags/{id}", AnnotatorTags.class);
+        router.attach("/tags/{id}", AnnotatorTags.class);
+        router.attach("/tags/{id}/annotations", AnnotatorAnnotationsByTags.class);
         router.attach("/", AnnotatorInfo.class);
         // authenticator.setNext(router);