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

annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 81:3be57c18c693

more fixing bugs with transactions thanks to neo4j 2 :-(

author	casties
date	Wed, 23 Jul 2014 15:09:54 +0200
parents	4e2dc67997a0
children	5a764c625290

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

Mercurial > hg > AnnotationManagerN4J

annotate src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java @ 81:3be57c18c693