Changeset 67:875a97f8b8da in AnnotationManagerN4J for src

Timestamp:

Feb 21, 2014, 9:19:23 PM (11 years ago)

Author:

casties

Branch:

default

Message:

more quick fixes for neo4j 2.0.

Location:

src/main

Files:

• java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java (modified) (8 diffs)
• webapp/annotationBrowser/js/annotation-core.js (modified) (2 diffs)

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -63 +63 @@
         nodeIndexes = new ArrayList<Index<Node>>(5);
         // List.set(enum.ordinal(), val) seems not to work.
-        try ( Transaction tx = graphDb.beginTx() )
-        {
+        try ( Transaction tx = graphDb.beginTx() ) {
             nodeIndexes.add(NodeTypes.ANNOTATION.ordinal(), graphDb.index().forNodes("annotations"));
             nodeIndexes.add(NodeTypes.PERSON.ordinal(), graphDb.index().forNodes("persons"));
@@ -121 +120 @@
     public Node getNodeFromIndex(String key, String value, NodeTypes type) {
         if (key == null || value == null) return null;
-        Node node = getNodeIndex(type).get(key, value).getSingle();
+        Node node = null;
+        try (Transaction tx = graphDb.beginTx()) {
+            node = getNodeIndex(type).get(key, value).getSingle();
+            tx.success();
+        }
         return node;
     }
@@ -312 +315 @@
         if (pn == null) return false;
         // optimized version of getGroupsForPersonNode
+        try (Transaction tx = graphDb.beginTx()) {
         Iterable<Relationship> rels = pn.getRelationships(RelationTypes.MEMBER_OF);
         for (Relationship rel : rels) {
             Node gn = rel.getEndNode();
             if (gn.getProperty("uri", "").equals(group.getUriString()) || gn.getProperty("id", "").equals(group.getId())) {
+                tx.success();
                 return true;
             }
+        }
+        tx.success();
         }
         return false;
@@ -475 +482 @@
      */
     public Annotation getAnnotationById(String id) {
+        Annotation annot = null;
+        try ( Transaction tx = graphDb.beginTx() ) {
         Node annotNode = getNodeIndex(NodeTypes.ANNOTATION).get("id", id).getSingle();
-        Annotation annot = createAnnotationFromNode(annotNode);
+        annot = createAnnotationFromNode(annotNode);
+        tx.success();
+        }
         return annot;
     }
@@ -488 +499 @@
     public Annotation createAnnotationFromNode(Node annotNode) {
         Annotation annot = new Annotation();
+        try ( Transaction tx = graphDb.beginTx() ) {        
         annot.setUri((String) annotNode.getProperty("id", null));
         annot.setBodyText((String) annotNode.getProperty("bodyText", null));
@@ -565 +577 @@
         }
         annot.setTags(tags);
-
+        
+        tx.success();
+        }
         return annot;
     }
@@ -814 +828 @@
             Node target = getNodeFromIndex("uri", targetUri, NodeTypes.TARGET); 
             if (target != null) {
+                try ( Transaction tx = graphDb.beginTx() ) {
                 Iterable<Relationship> relations = target.getRelationships(RelationTypes.ANNOTATES);
                 for (Relationship relation : relations) {
@@ -823 +838 @@
                         logger.error("ANNOTATES relation does not start with ANNOTATION: " + ann);
                     }
+                }
+                tx.success();
                 }
             }

src/main/webapp/annotationBrowser/js/annotation-core.js

@@ -18 +18 @@
 
 function createLinkFromURI(uri){
+    if (uri == null) return "";
         var docUri = uri.replace(docNamespace,viewerAddress);
         docUri = docUri.replace("?pn","&pn");
@@ -24 +25 @@
 
 function getDCdata(path,obj){
-        
+    if (path == null) return;
         var splitted = path.split("?");
         var docUri=splitted[0];