Changeset 29:3be0ebb6d5ad in AnnotationManagerN4J for src

Timestamp:

Sep 25, 2012, 7:35:26 AM (12 years ago)

Author:

dwinter

Branch:

default

Parents:

28:f4ed2ed33e5b (diff), 27:6bc918105c9a (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 1cf7203009f26a8a55fc387adcb8ae6ca681520c

Files:

• src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java (modified) (8 diffs)
• src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java (modified) (1 diff)

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/neo4j/AnnotationStore.java

@@ -212 +212 @@
         }
         return members;
+    }
+    
+    /**
+     * Add Person newMember to Group group.
+     * 
+     * @param group
+     * @param member
+     */
+    public Person addGroupMember(Group group, Person member) {
+        Node gn = getActorNode(group);
+        Node pn = getActorNode(member);
+        Person addedMember = null;
+        if (gn != null && pn != null) {
+            getOrCreateRelation(pn, RelationTypes.MEMBER_OF, gn);
+            addedMember = member;
+        }
+        return addedMember;
+    }
+    
+    /**
+     * Delete Person oldMember from Group group.
+     * 
+     * @param group
+     * @param member
+     */
+    public void deleteGroupMember(Group group, Person member) {
+        Node gn = getActorNode(group);
+        Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
+        for (Relationship rel : rels) {
+            Node mn = rel.getStartNode();
+            if (mn.equals(member)) {
+                rel.delete();
+                // there should be only one
+                break;
+            }
+        }        
     }