annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 66:5b568de5ee0d

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