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

annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 63:9f8c9611848a

fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.

author	casties
date	Fri, 23 Nov 2012 17:55:04 +0100
parents	e2f86ef9b871
children	5b568de5ee0d

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

Mercurial > hg > AnnotationManagerN4J

annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 63:9f8c9611848a