AnnotationManagerN4J: src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java annotate

annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 67:875a97f8b8da

more quick fixes for neo4j 2.0.

author	casties
date	Fri, 21 Feb 2014 22:19:23 +0100
parents	5b568de5ee0d
children	39bc52f9b102

rev	line source
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	1 /**
3599b29c393f store seems to work now :-) casties parents: diff changeset	2 *
3599b29c393f store seems to work now :-) casties parents: diff changeset	3 */
3599b29c393f store seems to work now :-) casties parents: diff changeset	4 package de.mpiwg.itgroup.annotations.neo4j;
3599b29c393f store seems to work now :-) casties parents: diff changeset	5
3599b29c393f store seems to work now :-) casties parents: diff changeset	6 import java.util.ArrayList;
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	7 import java.util.Arrays;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	8 import java.util.Calendar;
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	9 import java.util.HashSet;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	10 import java.util.List;
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	11 import java.util.Set;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	12
3599b29c393f store seems to work now :-) casties parents: diff changeset	13 import org.apache.log4j.Logger;
5 bbf0cc5bee29 version 0.2 really works now casties parents: 4 diff changeset	14 import org.neo4j.graphdb.Direction;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	15 import org.neo4j.graphdb.GraphDatabaseService;
3599b29c393f store seems to work now :-) casties parents: diff changeset	16 import org.neo4j.graphdb.Node;
3599b29c393f store seems to work now :-) casties parents: diff changeset	17 import org.neo4j.graphdb.Relationship;
3599b29c393f store seems to work now :-) casties parents: diff changeset	18 import org.neo4j.graphdb.RelationshipType;
3599b29c393f store seems to work now :-) casties parents: diff changeset	19 import org.neo4j.graphdb.Transaction;
3599b29c393f store seems to work now :-) casties parents: diff changeset	20 import org.neo4j.graphdb.index.Index;
3599b29c393f store seems to work now :-) casties parents: diff changeset	21 import org.neo4j.graphdb.index.IndexHits;
3599b29c393f store seems to work now :-) casties parents: diff changeset	22
9 b2bfc3bc9ba8 new internal actor class for creator. casties parents: 8 diff changeset	23 import de.mpiwg.itgroup.annotations.Actor;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	24 import de.mpiwg.itgroup.annotations.Annotation;
3599b29c393f store seems to work now :-) casties parents: diff changeset	25 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
12 5928c5d9aae8 more work on permissions... casties parents: 11 diff changeset	26 import de.mpiwg.itgroup.annotations.Group;
10 90911b2da322 more work on permissions... casties parents: 9 diff changeset	27 import de.mpiwg.itgroup.annotations.Person;
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	28 import de.mpiwg.itgroup.annotations.Resource;
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	29 import de.mpiwg.itgroup.annotations.Tag;
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	30 import de.mpiwg.itgroup.annotations.Target;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	31 import de.mpiwg.itgroup.annotations.Uri;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	32
3599b29c393f store seems to work now :-) casties parents: diff changeset	33 /**
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	34 * Neo4J based Annotation store.
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	35 *
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	36 * @author casties
3599b29c393f store seems to work now :-) casties parents: diff changeset	37 *
3599b29c393f store seems to work now :-) casties parents: diff changeset	38 */
3599b29c393f store seems to work now :-) casties parents: diff changeset	39 public class AnnotationStore {
3599b29c393f store seems to work now :-) casties parents: diff changeset	40
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	41 protected static Logger logger = Logger.getLogger(AnnotationStore.class);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	42
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	43 protected GraphDatabaseService graphDb;
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	44
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	45 public static enum NodeTypes {
36 0fdb05f35139 new node type "resource" for base documents (sans page number). casties parents: 34 diff changeset	46 ANNOTATION, PERSON, TARGET, GROUP, TAG, RESOURCE
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	47 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	48
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	49 // types of nodes that should not be automatically deleted.
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	50 public Set<String> permanentNodeTypes = new HashSet<String>(Arrays.asList("PERSON", "GROUP", "TAG"));
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	51
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	52 protected List<Index<Node>> nodeIndexes;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	53
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	54 public static enum RelationTypes implements RelationshipType {
36 0fdb05f35139 new node type "resource" for base documents (sans page number). casties parents: 34 diff changeset	55 ANNOTATES, CREATED, PERMITS_ADMIN, PERMITS_DELETE, PERMITS_UPDATE, PERMITS_READ, MEMBER_OF, HAS_TAG, PART_OF
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	56 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	57
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	58 public static String ANNOTATION_URI_PREFIX = "";
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	59
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	60 public AnnotationStore(GraphDatabaseService graphDb) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	61 super();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	62 this.graphDb = graphDb;
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	63 nodeIndexes = new ArrayList<Index<Node>>(5);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	64 // List.set(enum.ordinal(), val) seems not to work.
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	65 try ( Transaction tx = graphDb.beginTx() ) {
66 5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	66 nodeIndexes.add(NodeTypes.ANNOTATION.ordinal(), graphDb.index().forNodes("annotations"));
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	67 nodeIndexes.add(NodeTypes.PERSON.ordinal(), graphDb.index().forNodes("persons"));
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	68 nodeIndexes.add(NodeTypes.TARGET.ordinal(), graphDb.index().forNodes("targets"));
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	69 nodeIndexes.add(NodeTypes.GROUP.ordinal(), graphDb.index().forNodes("groups"));
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	70 nodeIndexes.add(NodeTypes.TAG.ordinal(), graphDb.index().forNodes("tags"));
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	71 nodeIndexes.add(NodeTypes.RESOURCE.ordinal(), graphDb.index().forNodes("resources"));
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	72 tx.success();
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	73 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	74 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	75
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	76 protected Index<Node> getNodeIndex(NodeTypes type) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	77 return nodeIndexes.get(type.ordinal());
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	78 }
12 5928c5d9aae8 more work on permissions... casties parents: 11 diff changeset	79
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	80 /**
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	81 * @param userUri
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	82 * @return
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	83 */
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	84 public Node getPersonNodeByUri(String userUri) {
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	85 return getNodeFromIndex("uri", userUri, NodeTypes.PERSON);
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	86 }
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	87
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	88 /**
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	89 * @param tagUri
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	90 * @return
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	91 */
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	92 public Node getTagNodeByUri(String tagUri) {
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	93 return getNodeFromIndex("uri", tagUri, NodeTypes.TAG);
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	94 }
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	95
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	96 /**
43 d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	97 * @param resourceUri
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	98 * @return
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	99 */
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	100 public Node getResourceNodeByUri(String resourceUri) {
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	101 return getNodeFromIndex("uri", resourceUri, NodeTypes.RESOURCE);
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	102 }
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	103
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	104 /**
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	105 * @param targetUri
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	106 * @return
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	107 */
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	108 public Node getTargetNodeByUri(String targetUri) {
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	109 return getNodeFromIndex("uri", targetUri, NodeTypes.RESOURCE);
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	110 }
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	111
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	112 /**
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	113 * Returns the Node with the given key and value. Key has to be indexed.
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	114 *
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	115 * @param key
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	116 * @param value
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	117 * @param type
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	118 * @return
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	119 */
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	120 public Node getNodeFromIndex(String key, String value, NodeTypes type) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	121 if (key == null \|\| value == null) return null;
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	122 Node node = null;
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	123 try (Transaction tx = graphDb.beginTx()) {
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	124 node = getNodeIndex(type).get(key, value).getSingle();
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	125 tx.success();
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	126 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	127 return node;
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	128 }
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	129
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	130 /**
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	131 * Returns list of Actors of given type (Group or Person). Key has to be
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	132 * indexed.
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	133 *
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	134 * @param key
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	135 * @param query
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	136 * @param type
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	137 * @return
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	138 */
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	139 @SuppressWarnings("unchecked")
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	140 protected <T extends Actor> List<T> getActors(String key, String query, NodeTypes type) {
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	141 ArrayList<T> actors = new ArrayList<T>();
24 e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	142 Index<Node> idx = getNodeIndex(type);
e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	143 if (key == null) {
e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	144 key = "uri";
e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	145 query = "*";
e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	146 }
66 5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	147 try (Transaction tx = graphDb.beginTx()) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	148 IndexHits<Node> actorNodes = idx.query(key, query);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	149 for (Node actorNode : actorNodes) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	150 Actor actor = createActorFromNode(actorNode);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	151 actors.add((T) actor);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	152 }
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	153 tx.success();
24 e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	154 }
e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	155 return actors;
e208a7b1a37a more work on groups ui. casties parents: 22 diff changeset	156 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	157
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	158 /**
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	159 * Returns list of groups. Key has to be indexed.
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	160 *
19 f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	161 * @param key
f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	162 * @param query
18 aafa3884b2c4 new AnnotationStore restlet for HTML-UI. casties parents: 16 diff changeset	163 * @return
aafa3884b2c4 new AnnotationStore restlet for HTML-UI. casties parents: 16 diff changeset	164 */
19 f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	165 public List<Group> getGroups(String key, String query) {
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	166 List<Group> groups = getActors(key, query, NodeTypes.GROUP);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	167 return groups;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	168 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	169
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	170 /**
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	171 * Returns list of Persons. Key has to be indexed.
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	172 *
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	173 * @param key
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	174 * @param query
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	175 * @return
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	176 */
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	177 public List<Person> getPersons(String key, String query) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	178 List<Person> persons = getActors(key, query, NodeTypes.PERSON);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	179 return persons;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	180 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	181
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	182 /**
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	183 * Returns list of uri-like objects of given type (Target or Resource). Key
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	184 * has to be indexed.
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	185 *
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	186 * @param key
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	187 * @param query
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	188 * @param type
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	189 * @return
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	190 */
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	191 @SuppressWarnings("unchecked")
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	192 protected <T extends Uri> List<T> getUris(String key, String query, NodeTypes type) {
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	193 ArrayList<T> uris = new ArrayList<T>();
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	194 Index<Node> idx = getNodeIndex(type);
19 f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	195 if (key == null) {
f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	196 key = "uri";
f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	197 query = "*";
f0f55ab768c9 more work on HTML UI. casties parents: 18 diff changeset	198 }
66 5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	199 try (Transaction tx = graphDb.beginTx()) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	200 IndexHits<Node> actorNodes = idx.query(key, query);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	201 for (Node actorNode : actorNodes) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	202 Uri uri = createUriFromNode(actorNode);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	203 uris.add((T) uri);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	204 }
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	205 tx.success();
18 aafa3884b2c4 new AnnotationStore restlet for HTML-UI. casties parents: 16 diff changeset	206 }
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	207 return uris;
18 aafa3884b2c4 new AnnotationStore restlet for HTML-UI. casties parents: 16 diff changeset	208 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	209
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	210 /**
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	211 * Returns list of Targets. Key has to be indexed.
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	212 *
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	213 * @param key
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	214 * @param query
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	215 * @return
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	216 */
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	217 public List<Target> getTargets(String key, String query) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	218 List<Target> targets = getUris(key, query, NodeTypes.TARGET);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	219 return targets;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	220 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	221
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	222 /**
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	223 * Returns list of Resources. Key has to be indexed.
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	224 *
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	225 * @param key
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	226 * @param query
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	227 * @return
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	228 */
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	229 public List<Resource> getResources(String key, String query) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	230 List<Resource> targets = getUris(key, query, NodeTypes.RESOURCE);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	231 return targets;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	232 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	233
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	234 /**
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	235 * Returns List of Annotations. Key has to be indexed.
31 9f653697437e annotationbrowser dwinter parents: 29 diff changeset	236 *
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	237 * @param key
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	238 * @param query
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	239 * @return
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	240 */
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	241 public List<Annotation> getAnnotations(String key, String query) {
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	242 ArrayList<Annotation> annotations = new ArrayList<Annotation>();
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	243 Index<Node> idx = getNodeIndex(NodeTypes.ANNOTATION);
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	244 if (key == null) {
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	245 key = "id";
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	246 query = "*";
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	247 }
66 5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	248 try (Transaction tx = graphDb.beginTx()) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	249 IndexHits<Node> annotNodes = idx.query(key, query);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	250 for (Node annotNode : annotNodes) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	251 Annotation annotation = createAnnotationFromNode(annotNode);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	252 annotations.add(annotation);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	253 }
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	254 tx.success();
31 9f653697437e annotationbrowser dwinter parents: 29 diff changeset	255 }
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	256 return annotations;
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	257 }
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	258
9f653697437e annotationbrowser dwinter parents: 29 diff changeset	259 /**
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	260 * Returns List of Tags. Key has to be indexed.
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	261 *
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	262 * @param key
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	263 * @param query
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	264 * @return
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	265 */
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	266 public List<Tag> getTags(String key, String query) {
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	267 ArrayList<Tag> tags = new ArrayList<Tag>();
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	268 Index<Node> idx = getNodeIndex(NodeTypes.TAG);
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	269 if (key == null) {
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	270 key = "uri";
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	271 query = "*";
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	272 }
66 5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	273 try (Transaction tx = graphDb.beginTx()) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	274 IndexHits<Node> groupNodes = idx.query(key, query);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	275 for (Node groupNode : groupNodes) {
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	276 Tag tag = createTagFromNode(groupNode);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	277 tags.add(tag);
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	278 }
5b568de5ee0d updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui. casties parents: 63 diff changeset	279 tx.success();
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	280 }
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	281 return tags;
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	282 }
18 aafa3884b2c4 new AnnotationStore restlet for HTML-UI. casties parents: 16 diff changeset	283
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	284 /**
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	285 * Returns List of Groups the person is member of.
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	286 *
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	287 * @param person
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	288 * @return
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	289 */
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	290 public List<Group> getGroupsForPersonNode(Node person) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	291 ArrayList<Group> groups = new ArrayList<Group>();
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	292 Iterable<Relationship> rels = person.getRelationships(RelationTypes.MEMBER_OF);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	293 for (Relationship rel : rels) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	294 Node groupNode = rel.getEndNode();
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	295 Actor group = createActorFromNode(groupNode);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	296 // make sure we're getting a group
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	297 if (!(group instanceof Group)) {
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	298 logger.error("target of MEMBER_OF is not GROUP! rel=" + rel);
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	299 continue;
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	300 }
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	301 groups.add((Group) group);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	302 }
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	303 return groups;
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	304 }
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	305
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	306 /**
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	307 * Returns if person with uri is in Group group.
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	308 *
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	309 * @param person
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	310 * @param group
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	311 * @return
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	312 */
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	313 public boolean isPersonInGroup(Person person, Group group) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	314 Node pn = getPersonNodeByUri(person.getUriString());
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	315 if (pn == null) return false;
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	316 // optimized version of getGroupsForPersonNode
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	317 try (Transaction tx = graphDb.beginTx()) {
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	318 Iterable<Relationship> rels = pn.getRelationships(RelationTypes.MEMBER_OF);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	319 for (Relationship rel : rels) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	320 Node gn = rel.getEndNode();
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	321 if (gn.getProperty("uri", "").equals(group.getUriString()) \|\| gn.getProperty("id", "").equals(group.getId())) {
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	322 tx.success();
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	323 return true;
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	324 }
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	325 }
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	326 tx.success();
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	327 }
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	328 return false;
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	329 }
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	330
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	331 /**
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	332 * Returns the members of the group.
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	333 *
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	334 * @param group
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	335 * @return
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	336 */
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	337 public List<Person> getMembersOfGroup(Group group) {
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	338 ArrayList<Person> members = new ArrayList<Person>();
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	339 Node gn = getActorNode(group);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	340 Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	341 for (Relationship rel : rels) {
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	342 Node memberNode = rel.getStartNode();
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	343 Actor member = createActorFromNode(memberNode);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	344 // make sure we're getting a group
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	345 if (!(member instanceof Person)) {
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	346 logger.error("source of MEMBER_OF is not PERSON! rel=" + rel);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	347 continue;
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	348 }
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	349 members.add((Person) member);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	350 }
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	351 return members;
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	352 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	353
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	354 /**
25 2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	355 * Add Person newMember to Group group.
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	356 *
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	357 * @param group
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	358 * @param member
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	359 */
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	360 public Person addGroupMember(Group group, Person member) {
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	361 Node gn = getActorNode(group);
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	362 Node pn = getActorNode(member);
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	363 Person addedMember = null;
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	364 if (gn != null && pn != null) {
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	365 getOrCreateRelation(pn, RelationTypes.MEMBER_OF, gn);
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	366 addedMember = member;
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	367 }
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	368 return addedMember;
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	369 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	370
25 2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	371 /**
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	372 * Delete Person oldMember from Group group.
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	373 *
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	374 * @param group
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	375 * @param member
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	376 */
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	377 public void deleteGroupMember(Group group, Person member) {
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	378 Node gn = getActorNode(group);
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	379 Node pn = getActorNode(member);
25 2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	380 Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	381 for (Relationship rel : rels) {
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	382 Node mn = rel.getStartNode();
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	383 if (mn.equals(pn)) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	384 Transaction tx = graphDb.beginTx();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	385 try {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	386 rel.delete();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	387 tx.success();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	388 } finally {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	389 tx.finish();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	390 }
25 2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	391 // there should be only one
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	392 break;
2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	393 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	394 }
25 2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	395 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	396
25 2140ef107551 adding and deleting group members. casties parents: 24 diff changeset	397 /**
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	398 * Returns the stored Actor matching the given one.
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	399 *
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	400 * @param actor
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	401 * @return
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	402 */
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	403 public Actor getActor(Actor actor) {
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	404 Node actorNode = getActorNode(actor);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	405 Actor storedActor = createActorFromNode(actorNode);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	406 return storedActor;
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	407 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	408
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	409 /**
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	410 * Stores an Actor (Person or Group). Creates a new actor Node or update an
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	411 * existing one.
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	412 *
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	413 * @param actor
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	414 * @return
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	415 */
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	416 public Actor storeActor(Actor actor) {
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	417 Node actorNode = getOrCreateActorNode(actor);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	418 Transaction tx = graphDb.beginTx();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	419 try {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	420 // id
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	421 String id = actor.getId();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	422 if (id != null) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	423 actorNode.setProperty("id", id);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	424 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	425 // name
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	426 String name = actor.getName();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	427 if (name != null) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	428 actorNode.setProperty("name", name);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	429 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	430 // uri
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	431 String uri = actor.getUri();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	432 if (uri != null) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	433 actorNode.setProperty("uri", uri);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	434 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	435 tx.success();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	436 } finally {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	437 tx.finish();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	438 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	439 Actor storedActor = createActorFromNode(actorNode);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	440 return storedActor;
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	441 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	442
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	443 /**
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	444 * Deletes the given Actor.
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	445 *
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	446 * @param actor
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	447 */
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	448 public void deleteActor(Actor actor) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	449 String uri = actor.getUriString();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	450 Index<Node> idx;
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	451 if (actor.isGroup()) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	452 idx = getNodeIndex(NodeTypes.GROUP);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	453 } else {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	454 idx = getNodeIndex(NodeTypes.PERSON);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	455 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	456 Node actorNode = idx.get("uri", uri).getSingle();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	457 if (actorNode != null) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	458 // delete relations
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	459 Transaction tx = graphDb.beginTx();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	460 try {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	461 for (Relationship rel : actorNode.getRelationships()) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	462 rel.delete();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	463 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	464 if (!actorNode.hasRelationship()) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	465 // this shouldn't happen
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	466 deleteNode(actorNode);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	467 } else {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	468 logger.error("deleteActor: unable to delete: Node still has relations.");
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	469 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	470 tx.success();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	471 } finally {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	472 tx.finish();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	473 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	474 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	475 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	476
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	477 /**
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	478 * Returns the Annotation with the given id.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	479 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	480 * @param id
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	481 * @return
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	482 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	483 public Annotation getAnnotationById(String id) {
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	484 Annotation annot = null;
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	485 try ( Transaction tx = graphDb.beginTx() ) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	486 Node annotNode = getNodeIndex(NodeTypes.ANNOTATION).get("id", id).getSingle();
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	487 annot = createAnnotationFromNode(annotNode);
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	488 tx.success();
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	489 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	490 return annot;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	491 }
6 6dfbe2400f64 delete annotation should work now. casties parents: 5 diff changeset	492
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	493 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	494 * Returns an Annotation object from an annotation-Node.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	495 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	496 * @param annotNode
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	497 * @return
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	498 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	499 public Annotation createAnnotationFromNode(Node annotNode) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	500 Annotation annot = new Annotation();
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	501 try ( Transaction tx = graphDb.beginTx() ) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	502 annot.setUri((String) annotNode.getProperty("id", null));
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	503 annot.setBodyText((String) annotNode.getProperty("bodyText", null));
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	504 annot.setBodyUri((String) annotNode.getProperty("bodyUri", null));
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	505 /*
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	506 * get annotation target and resource from relation
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	507 */
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	508 for (Relationship rel : annotNode.getRelationships(RelationTypes.ANNOTATES)) {
707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	509 Node target = rel.getEndNode();
707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	510 String type = (String) target.getProperty("TYPE");
707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	511 if (type.equals("TARGET")) {
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	512 annot.setTarget(new Target((String) target.getProperty("uri", null)));
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	513 } else if (type.equals("RESOURCE")) {
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	514 annot.setResource(new Resource((String) target.getProperty("uri", null)));
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	515 }
707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	516 }
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	517 if (annot.getTarget() == null) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	518 logger.error("annotation " + annotNode + " has no target node!");
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	519 }
45 707902d468f6 store reads and sends annotations resources now. casties parents: 43 diff changeset	520 // get fragment from attribute
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	521 annot.setTargetFragment((String) annotNode.getProperty("targetFragment", null));
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	522 String ft = (String) annotNode.getProperty("fragmentType", null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	523 if (ft != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	524 annot.setFragmentType(FragmentTypes.valueOf(ft));
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	525 }
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	526 /*
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	527 * get creator from relation
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	528 */
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	529 Relationship creatorRel = getRelation(annotNode, RelationTypes.CREATED, null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	530 if (creatorRel != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	531 Node creatorNode = creatorRel.getStartNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	532 Actor creator = createActorFromNode(creatorNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	533 annot.setCreator(creator);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	534 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	535 logger.error("annotation " + annotNode + " has no creator node!");
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	536 }
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	537 /*
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	538 * get creation date
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	539 */
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	540 annot.setCreated((String) annotNode.getProperty("created", null));
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	541 /*
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	542 * get permissions
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	543 */
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	544 Relationship adminRel = getRelation(annotNode, RelationTypes.PERMITS_ADMIN, null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	545 if (adminRel != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	546 Node adminNode = adminRel.getEndNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	547 Actor admin = createActorFromNode(adminNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	548 annot.setAdminPermission(admin);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	549 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	550 Relationship deleteRel = getRelation(annotNode, RelationTypes.PERMITS_DELETE, null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	551 if (deleteRel != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	552 Node deleteNode = deleteRel.getEndNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	553 Actor delete = createActorFromNode(deleteNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	554 annot.setDeletePermission(delete);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	555 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	556 Relationship updateRel = getRelation(annotNode, RelationTypes.PERMITS_UPDATE, null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	557 if (updateRel != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	558 Node updateNode = updateRel.getEndNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	559 Actor update = createActorFromNode(updateNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	560 annot.setUpdatePermission(update);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	561 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	562 Relationship readRel = getRelation(annotNode, RelationTypes.PERMITS_READ, null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	563 if (readRel != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	564 Node readNode = readRel.getEndNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	565 Actor read = createActorFromNode(readNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	566 annot.setReadPermission(read);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	567 }
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	568 /*
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	569 * get tags
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	570 */
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	571 Set<String> tags = new HashSet<String>();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	572 for (Relationship rel : annotNode.getRelationships(RelationTypes.HAS_TAG)) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	573 String tag = (String) rel.getEndNode().getProperty("name", null);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	574 if (tag != null) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	575 tags.add(tag);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	576 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	577 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	578 annot.setTags(tags);
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	579
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	580 tx.success();
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	581 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	582 return annot;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	583 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	584
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	585 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	586 * Returns an Actor object from a node.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	587 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	588 * @param actorNode
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	589 * @return
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	590 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	591 protected Actor createActorFromNode(Node actorNode) {
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	592 if (actorNode == null) return null;
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	593 String id = (String) actorNode.getProperty("id", null);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	594 String uri = (String) actorNode.getProperty("uri", null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	595 String name = (String) actorNode.getProperty("name", null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	596 String type = (String) actorNode.getProperty("TYPE", null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	597 if (type != null && type.equals("PERSON")) {
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	598 return new Person(id, uri, name);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	599 } else if (type != null && type.equals("GROUP")) {
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	600 return new Group(id, uri, name);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	601 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	602 return null;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	603 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	604
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	605 public Tag createTagFromNode(Node tagNode) {
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	606 if (tagNode == null) return null;
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	607 String name = (String) tagNode.getProperty("name", null);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	608 String uri = (String) tagNode.getProperty("uri", null);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	609 String id = (String) tagNode.getProperty("id", null);
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	610
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	611 return new Tag(id, uri, name);
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	612
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	613 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	614
43 d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	615 /**
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	616 * @param resourceNode
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	617 * @return
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	618 */
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	619 public Resource createResourceFromNode(Node resourceNode) {
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	620 return (Resource) createUriFromNode(resourceNode);
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	621 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	622
43 d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	623 /**
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	624 * @param targetNode
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	625 * @return
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	626 */
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	627 public Target createTargetFromNode(Node targetNode) {
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	628 return (Target) createUriFromNode(targetNode);
d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	629 }
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	630
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	631 protected Uri createUriFromNode(Node uriNode) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	632 if (uriNode == null) return null;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	633 String uri = (String) uriNode.getProperty("uri", null);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	634 String type = (String) uriNode.getProperty("TYPE", null);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	635 if (type != null && type.equals("TARGET")) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	636 return new Target(uri);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	637 } else if (type != null && type.equals("RESOURCE")) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	638 return new Resource(uri);
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	639 }
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	640 return null;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	641 }
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	642
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	643 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	644 * Store a new annotation in the store or update an existing one. Returns
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	645 * the stored annotation.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	646 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	647 * @param annot
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	648 * @return
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	649 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	650 public Annotation storeAnnotation(Annotation annot) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	651 Node annotNode = null;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	652 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	653 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	654 /*
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	655 * create or get the annotation
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	656 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	657 String id = annot.getUri();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	658 if (id == null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	659 id = createRessourceURI("annot:");
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	660 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	661 annotNode = getOrCreateAnnotationNode(id);
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	662
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	663 /*
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	664 * the annotation body
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	665 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	666 String bodyText = annot.getBodyText();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	667 if (bodyText != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	668 annotNode.setProperty("bodyText", bodyText);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	669 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	670 String bodyUri = annot.getBodyUri();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	671 if (bodyUri != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	672 annotNode.setProperty("bodyUri", bodyUri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	673 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	674
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	675 /*
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	676 * the annotation target
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	677 */
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	678 Target target = annot.getTarget();
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	679 Node targetNode = null;
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	680 if (target != null) {
0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	681 targetNode = getOrCreateUriNode(target.getUri(), NodeTypes.TARGET);
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	682 getOrCreateRelation(annotNode, RelationTypes.ANNOTATES, targetNode);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	683 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	684
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	685 /*
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	686 * The fragment part of the annotation target.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	687 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	688 String targetFragment = annot.getTargetFragment();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	689 FragmentTypes fragmentType = annot.getFragmentType();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	690 if (targetFragment != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	691 annotNode.setProperty("targetFragment", targetFragment);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	692 annotNode.setProperty("fragmentType", fragmentType.name());
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	693 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	694
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	695 /*
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	696 * the annotation resource
03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	697 */
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	698 Resource resource = annot.getResource();
0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	699 if (resource != null) {
0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	700 Node resourceNode = getOrCreateUriNode(resource.getUri(), NodeTypes.RESOURCE);
0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	701 getOrCreateRelation(annotNode, RelationTypes.ANNOTATES, resourceNode);
0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	702 getOrCreateRelation(targetNode, RelationTypes.PART_OF, resourceNode);
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	703 }
03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	704
03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	705 /*
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	706 * The creator of this annotation.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	707 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	708 Actor creator = annot.getCreator();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	709 if (creator != null) {
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	710 Node creatorNode = getOrCreateActorNode(creator);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	711 getOrCreateRelation(creatorNode, RelationTypes.CREATED, annotNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	712 }
12 5928c5d9aae8 more work on permissions... casties parents: 11 diff changeset	713
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	714 /*
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	715 * The creation date of this annotation.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	716 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	717 String created = annot.getCreated();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	718 if (created != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	719 annotNode.setProperty("created", created);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	720 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	721
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	722 /*
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	723 * Permissions for this annotation.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	724 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	725 setPermissionRelation(annotNode, RelationTypes.PERMITS_ADMIN, annot.getAdminPermission());
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	726 setPermissionRelation(annotNode, RelationTypes.PERMITS_DELETE, annot.getDeletePermission());
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	727 setPermissionRelation(annotNode, RelationTypes.PERMITS_UPDATE, annot.getUpdatePermission());
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	728 setPermissionRelation(annotNode, RelationTypes.PERMITS_READ, annot.getReadPermission());
6 6dfbe2400f64 delete annotation should work now. casties parents: 5 diff changeset	729
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	730 /*
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	731 * Tags on this annotation.
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	732 */
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	733 Set<String> newTags = annot.getTags();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	734 // we ignore existing tags if tags == null
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	735 if (newTags != null) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	736 List<Relationship> oldHasTags = new ArrayList<Relationship>();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	737 for (Relationship rel : annotNode.getRelationships(RelationTypes.HAS_TAG)) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	738 oldHasTags.add(rel);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	739 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	740 // adjust to new tags
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	741 if (newTags.isEmpty()) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	742 // remove old tags
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	743 if (!oldHasTags.isEmpty()) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	744 for (Relationship rel : oldHasTags) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	745 rel.delete();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	746 // TODO: should we delete orphan nodes too?
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	747 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	748 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	749 } else {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	750 if (!oldHasTags.isEmpty()) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	751 // adjust old tags
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	752 for (Relationship rel : oldHasTags) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	753 String oldTag = (String) rel.getEndNode().getProperty("name", null);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	754 if (newTags.contains(oldTag)) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	755 // tag exists
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	756 newTags.remove(oldTag);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	757 } else {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	758 // tag exists no longer
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	759 rel.delete();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	760 // TODO: should we delete orphan nodes too?
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	761 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	762 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	763 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	764 if (!newTags.isEmpty()) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	765 // still tags to add
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	766 for (String tag : newTags) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	767 // create new tag
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	768 Node tagNode = getOrCreateTagNode(new Tag(null, null, tag));
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	769 getOrCreateRelation(annotNode, RelationTypes.HAS_TAG, tagNode);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	770 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	771 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	772
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	773 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	774 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	775 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	776 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	777 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	778 }
12 5928c5d9aae8 more work on permissions... casties parents: 11 diff changeset	779
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	780 // re-read and return annotation
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	781 Annotation storedAnnot = createAnnotationFromNode(annotNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	782 return storedAnnot;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	783 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	784
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	785 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	786 * Deletes the annotation with the given id.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	787 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	788 * @param id
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	789 */
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	790 public void deleteAnnotationById(String id) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	791 Node annotNode = getNodeIndex(NodeTypes.ANNOTATION).get("id", id).getSingle();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	792 if (annotNode != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	793 // delete related objects
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	794 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	795 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	796 for (Relationship rel : annotNode.getRelationships()) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	797 // delete relation and the related node if it has no other
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	798 // relations and is not permanent
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	799 Node other = rel.getOtherNode(annotNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	800 rel.delete();
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	801 if (!(other.hasRelationship() \|\| permanentNodeTypes.contains(other.getProperty("TYPE", null)))) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	802 deleteNode(other);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	803 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	804 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	805 if (!annotNode.hasRelationship()) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	806 deleteNode(annotNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	807 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	808 logger.error("deleteById: unable to delete: Node still has relations.");
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	809 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	810 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	811 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	812 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	813 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	814 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	815 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	816
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	817 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	818 * Returns all annotations with the given uri and/or user.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	819 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	820 * @param uri
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	821 * @param userUri
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	822 * @return
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	823 */
63 9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search. casties parents: 59 diff changeset	824 public List<Annotation> searchAnnotationByUriUser(String targetUri, String userUri) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	825 List<Annotation> annotations = new ArrayList<Annotation>();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	826 if (targetUri != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	827 // there should be only one
63 9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search. casties parents: 59 diff changeset	828 Node target = getNodeFromIndex("uri", targetUri, NodeTypes.TARGET);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	829 if (target != null) {
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	830 try ( Transaction tx = graphDb.beginTx() ) {
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	831 Iterable<Relationship> relations = target.getRelationships(RelationTypes.ANNOTATES);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	832 for (Relationship relation : relations) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	833 Node ann = relation.getStartNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	834 if (ann.getProperty("TYPE", "").equals("ANNOTATION")) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	835 Annotation annot = createAnnotationFromNode(ann);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	836 annotations.add(annot);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	837 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	838 logger.error("ANNOTATES relation does not start with ANNOTATION: " + ann);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	839 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	840 }
67 875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	841 tx.success();
875a97f8b8da more quick fixes for neo4j 2.0. casties parents: 66 diff changeset	842 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	843 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	844 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	845 if (userUri != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	846 // there should be only one
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	847 Node person = getPersonNodeByUri(userUri);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	848 if (person != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	849 Iterable<Relationship> relations = person.getRelationships(RelationTypes.CREATED);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	850 for (Relationship relation : relations) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	851 Node ann = relation.getEndNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	852 if (ann.getProperty("TYPE", "").equals("ANNOTATION")) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	853 Annotation annot = createAnnotationFromNode(ann);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	854 annotations.add(annot);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	855 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	856 logger.error("CREATED relation does not end with ANNOTATION: " + ann);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	857 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	858 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	859 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	860 }
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	861 // TODO: if both uri and user are given we should intersect
63 9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search. casties parents: 59 diff changeset	862
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	863 return annotations;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	864 }
5 bbf0cc5bee29 version 0.2 really works now casties parents: 4 diff changeset	865
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	866 /**
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	867 * Returns Relationship of type from Node start to Node end. Creates one if
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	868 * it doesn't exist.
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	869 *
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	870 * @param start
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	871 * @param type
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	872 * @param end
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	873 * @return
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	874 */
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	875 protected Relationship getOrCreateRelation(Node start, RelationshipType type, Node end) {
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	876 if (start == null \|\| end == null) return null;
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	877 if (start.hasRelationship()) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	878 // there are relations
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	879 Iterable<Relationship> rels = start.getRelationships(type, Direction.OUTGOING);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	880 for (Relationship rel : rels) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	881 if (rel.getEndNode().equals(end)) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	882 // relation exists
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	883 return rel;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	884 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	885 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	886 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	887 // create new one
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	888 Relationship rel;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	889 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	890 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	891 rel = start.createRelationshipTo(end, type);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	892 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	893 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	894 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	895 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	896 return rel;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	897 }
12 5928c5d9aae8 more work on permissions... casties parents: 11 diff changeset	898
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	899 protected Node getOrCreateAnnotationNode(String id) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	900 Index<Node> idx = getNodeIndex(NodeTypes.ANNOTATION);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	901 IndexHits<Node> annotations = idx.get("id", id);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	902 Node annotation = annotations.getSingle();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	903 if (annotation == null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	904 // does not exist yet
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	905 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	906 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	907 annotation = graphDb.createNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	908 annotation.setProperty("TYPE", NodeTypes.ANNOTATION.name());
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	909 annotation.setProperty("id", id);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	910 idx.add(annotation, "id", id);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	911 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	912 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	913 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	914 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	915 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	916 return annotation;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	917 }
6 6dfbe2400f64 delete annotation should work now. casties parents: 5 diff changeset	918
48 0e00bf8e27fb targets and resources of Annotation object are objects now. casties parents: 45 diff changeset	919 protected Node getOrCreateUriNode(String uri, NodeTypes type) {
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	920 Index<Node> idx = getNodeIndex(type);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	921 IndexHits<Node> targets = idx.get("uri", uri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	922 Node target = targets.getSingle();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	923 if (target == null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	924 // does not exist yet
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	925 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	926 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	927 target = graphDb.createNode();
40 03e0f7574224 saving and loading resource targets should work now (no searching yet) casties parents: 36 diff changeset	928 target.setProperty("TYPE", type.name());
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	929 target.setProperty("uri", uri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	930 idx.add(target, "uri", uri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	931 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	932 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	933 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	934 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	935 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	936 return target;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	937 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	938
22 b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	939 protected Node getActorNode(Actor actor) {
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	940 // Person/Group is identified by URI or id
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	941 String uri = actor.getUriString();
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	942 Index<Node> idx;
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	943 if (actor.isGroup()) {
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	944 idx = getNodeIndex(NodeTypes.GROUP);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	945 } else {
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	946 idx = getNodeIndex(NodeTypes.PERSON);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	947 }
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	948 IndexHits<Node> persons = idx.get("uri", uri);
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	949 Node person = persons.getSingle();
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	950 return person;
b1fb0d117877 adding and listing groups via html works now. casties parents: 19 diff changeset	951 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	952
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	953 protected Node getOrCreateActorNode(Actor actor) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	954 // Person/Group is identified by URI or id
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	955 String uri = actor.getUriString();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	956 String name = actor.getName();
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	957 String id = actor.getId();
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	958 Index<Node> idx;
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	959 if (actor.isGroup()) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	960 idx = getNodeIndex(NodeTypes.GROUP);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	961 } else {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	962 idx = getNodeIndex(NodeTypes.PERSON);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	963 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	964 IndexHits<Node> persons = idx.get("uri", uri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	965 Node person = persons.getSingle();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	966 if (person == null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	967 // does not exist yet
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	968 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	969 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	970 person = graphDb.createNode();
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	971 if (actor.isGroup()) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	972 person.setProperty("TYPE", NodeTypes.GROUP.name());
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	973 } else {
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	974 person.setProperty("TYPE", NodeTypes.PERSON.name());
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	975 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	976 person.setProperty("uri", uri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	977 idx.add(person, "uri", uri);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	978 if (name != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	979 person.setProperty("name", name);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	980 }
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	981 if (id != null) {
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	982 person.setProperty("id", id);
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	983 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	984 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	985 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	986 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	987 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	988 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	989 return person;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	990 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	991
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	992 protected Node getOrCreateTagNode(Tag inTag) {
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	993 Index<Node> idx = getNodeIndex(NodeTypes.TAG);
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	994 String tagname = inTag.getName();
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	995 IndexHits<Node> tags = idx.get("name", tagname);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	996 Node tag = tags.getSingle();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	997 if (tag == null) {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	998 // does not exist yet
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	999 Transaction tx = graphDb.beginTx();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1000 try {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1001 tag = graphDb.createNode();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1002 tag.setProperty("TYPE", NodeTypes.TAG.name());
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1003 tag.setProperty("name", tagname);
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1004 idx.add(tag, "name", tagname);
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1005
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	1006 tag.setProperty("id", inTag.getId());
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	1007 tag.setProperty("uri", inTag.getUri());
f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	1008 idx.add(tag, "uri", inTag.getUri());
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1009
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1010 tx.success();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1011 } finally {
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1012 tx.finish();
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1013 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1014 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1015 return tag;
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1016 }
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1017
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1018 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1019 * Create or update permissions relations for an annotation.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1020 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1021 * @param annotNode
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1022 * @param type
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1023 * @param annot
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1024 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1025 protected void setPermissionRelation(Node annotNode, RelationTypes type, Actor actor) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1026 Node newActorNode = null;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1027 if (actor != null) {
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	1028 newActorNode = getOrCreateActorNode(actor);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1029 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1030 Relationship rel = getRelation(annotNode, type, null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1031 if (rel != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1032 // relation exists
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1033 Node oldActorNode = rel.getEndNode();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1034 if (!oldActorNode.equals(newActorNode)) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1035 // new admin is different
33 86bb29132ba6 add transaction. casties parents: 32 diff changeset	1036 Transaction tx = graphDb.beginTx();
86bb29132ba6 add transaction. casties parents: 32 diff changeset	1037 try {
86bb29132ba6 add transaction. casties parents: 32 diff changeset	1038 rel.delete();
86bb29132ba6 add transaction. casties parents: 32 diff changeset	1039 tx.success();
86bb29132ba6 add transaction. casties parents: 32 diff changeset	1040 } finally {
86bb29132ba6 add transaction. casties parents: 32 diff changeset	1041 tx.finish();
86bb29132ba6 add transaction. casties parents: 32 diff changeset	1042 }
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1043 if (newActorNode != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1044 rel = getOrCreateRelation(annotNode, type, newActorNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1045 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1046 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1047 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1048 // no relation yet
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1049 if (newActorNode != null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1050 rel = getOrCreateRelation(annotNode, type, newActorNode);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1051 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1052 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1053 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	1054
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1055 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1056 * Unindexes and deletes given Node if it has no relations.
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1057 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1058 * @param node
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1059 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1060 protected void deleteNode(Node node) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1061 Transaction tx = graphDb.beginTx();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1062 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1063 if (node.hasRelationship()) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1064 logger.error("deleteNode: unable to delete: Node still has relations.");
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1065 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1066 String ts = (String) node.getProperty("TYPE", null);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1067 try {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1068 NodeTypes type = NodeTypes.valueOf(ts);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1069 getNodeIndex(type).remove(node);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1070 } catch (Exception e) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1071 logger.error("deleteNode: unable to get TYPE of node: " + node);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1072 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1073 node.delete();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1074 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1075 tx.success();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1076 } finally {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1077 tx.finish();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1078 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1079 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	1080
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1081 /**
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1082 * returns the (first) Relationship of RelationTypes type from Node start.
794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1083 *
15 58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	1084 * @param start
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	1085 * @param type
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	1086 * @param direction
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	1087 * @return
58357a4b86de ASSIGNED - # 249: Annotations shared in groups casties parents: 14 diff changeset	1088 */
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1089 protected Relationship getRelation(Node start, RelationTypes type, Direction direction) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1090 Iterable<Relationship> rels;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1091 if (direction == null) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1092 // ignore direction
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1093 rels = start.getRelationships(type);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1094 } else {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1095 rels = start.getRelationships(type, direction);
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1096 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1097 for (Relationship rel : rels) {
16 794077e6288c CLOSED - # 252: Tags for Annotations casties parents: 15 diff changeset	1098 // just the first one
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1099 return rel;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1100 }
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1101 return null;
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1102 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	1103
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1104 /**
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1105 * Erzeuge eine urn aus der aktuellen Zeit in millis
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1106 *
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1107 * @return
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1108 */
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1109 private String createRessourceURI(String prefix) {
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1110 Calendar cal = Calendar.getInstance();
629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1111 long time = cal.getTimeInMillis();
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1112 return String.format("%s%s%s", ANNOTATION_URI_PREFIX, prefix, time);
14 629e15b345aa permissions mostly work. need more server-side checking. casties parents: 13 diff changeset	1113 }
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	1114
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1115 public List<Annotation> getAnnotationsByTag(String tagUri) {
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1116 ArrayList<Annotation> ret = new ArrayList<Annotation>();
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1117 Node tag = getTagNodeByUri(tagUri);
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1118 if (tag != null) {
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1119 Iterable<Relationship> rels = tag.getRelationships(Direction.INCOMING, RelationTypes.HAS_TAG);
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1120 for (Relationship rel : rels) {
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1121 Node node = rel.getStartNode();
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1122 ret.add(createAnnotationFromNode(node));
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1123 }
32 0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1124 }
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1125 return ret;
0731c4549065 UI for editing groups and persons works now. (still no authorisation!) casties parents: 29 diff changeset	1126 }
28 f4ed2ed33e5b Restinterface zur Anzeige von Tags hinzugefuegt- dwinter parents: 24 diff changeset	1127
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	1128 public List<Annotation> getAnnotationsByResource(String resourceUri) {
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	1129 ArrayList<Annotation> ret = new ArrayList<Annotation>();
59 e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1130 Node res = getNodeFromIndex("uri", resourceUri, NodeTypes.RESOURCE);
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1131 if (res != null) {
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1132 Iterable<Relationship> rels = res.getRelationships(Direction.INCOMING, RelationTypes.ANNOTATES);
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1133 for (Relationship rel : rels) {
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1134 Node an = rel.getStartNode();
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1135 Node rn = rel.getEndNode();
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1136 if (rn.getProperty("TYPE", "").equals("RESOURCE")) {
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1137 logger.error("getAnnotationsByResource got ANNOTATES != RESOURCE");
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1138 }
e2f86ef9b871 make annotation uri in store configurable. fix npe with no tags. casties parents: 48 diff changeset	1139 ret.add(createAnnotationFromNode(an));
43 d1bef7952bec more work on resources and targets. casties parents: 42 diff changeset	1140 }
42 aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	1141 }
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	1142 return ret;
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	1143 }
aa2bb7ac04d9 more work on resources and targets. casties parents: 40 diff changeset	1144
4 3599b29c393f store seems to work now :-) casties parents: diff changeset	1145 }

Mercurial > hg > AnnotationManagerN4J

annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 67:875a97f8b8da