Changeset 40:03e0f7574224 in AnnotationManagerN4J

Timestamp:

Sep 26, 2012, 12:56:42 PM (12 years ago)

Author:

casties

Branch:

default

Message:

saving and loading resource targets should work now (no searching yet)

Location:

src/main/java/de/mpiwg/itgroup/annotations

Files:

• Annotation.java (modified) (3 diffs)
• neo4j/AnnotationStore.java (modified) (5 diffs)
• restlet/AnnotatorAnnotations.java (modified) (1 diff)
• restlet/AnnotatorResourceImpl.java (modified) (2 diffs)

src/main/java/de/mpiwg/itgroup/annotations/Annotation.java

@@ -39 +39 @@
     
     /**
-     * The types of annotation targets.
+     * The types of annotation target fragments.
      *
      */
@@ -50 +50 @@
      */
     protected FragmentTypes fragmentType;
+    
+    
+    /**
+     * The uri of the resource that is annotated e.g. a book. 
+     * The target is part of this resource e.g. a page of a book.
+     */
+    protected String resourceUri;
     
     /**
@@ -224 +231 @@
 
     /**
+     * @return the resourceUri
+     */
+    public String getResourceUri() {
+        return resourceUri;
+    }
+
+    /**
+     * @param resourceUri the resourceUri to set
+     */
+    public void setResourceUri(String resourceUri) {
+        this.resourceUri = resourceUri;
+    }
+
+    /**
      * @return the creator
      */

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

@@ -528 +528 @@
              */
             String targetBaseUri = annot.getTargetBaseUri();
+            Node targetNode = null;
             if (targetBaseUri != null) {
-                Node target = getOrCreateTargetNode(targetBaseUri);
-                getOrCreateRelation(annotNode, RelationTypes.ANNOTATES, target);
+                targetNode = getOrCreateTargetNode(targetBaseUri, NodeTypes.TARGET);
+                getOrCreateRelation(annotNode, RelationTypes.ANNOTATES, targetNode);
             }
 
@@ -541 +542 @@
                 annotNode.setProperty("targetFragment", targetFragment);
                 annotNode.setProperty("fragmentType", fragmentType.name());
+            }
+
+            /*
+             * the annotation resource
+             */
+            String resourceUri = annot.getResourceUri();
+            if (resourceUri != null) {
+                Node resource = getOrCreateTargetNode(resourceUri, NodeTypes.RESOURCE);
+                getOrCreateRelation(annotNode, RelationTypes.ANNOTATES, resource);
+                getOrCreateRelation(targetNode, RelationTypes.PART_OF, resource);
             }
 
@@ -712 +723 @@
      */
     protected Relationship getOrCreateRelation(Node start, RelationshipType type, Node end) {
+        if (start == null || end == null) return null;
         if (start.hasRelationship()) {
             // there are relations
@@ -754 +766 @@
     }
 
-    protected Node getOrCreateTargetNode(String uri) {
-        Index<Node> idx = getNodeIndex(NodeTypes.TARGET);
+    protected Node getOrCreateTargetNode(String uri, NodeTypes type) {
+        Index<Node> idx = getNodeIndex(type);
         IndexHits<Node> targets = idx.get("uri", uri);
         Node target = targets.getSingle();
@@ -763 +775 @@
             try {
                 target = graphDb.createNode();
-                target.setProperty("TYPE", NodeTypes.TARGET.name());
+                target.setProperty("TYPE", type.name());
                 target.setProperty("uri", uri);
                 idx.add(target, "uri", uri);

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java

@@ -24 +24 @@
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.Person;
-import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -188 +188 @@
             jo.put("text", annot.getBodyText());
             jo.put("uri", annot.getTargetBaseUri());
+            if (annot.getResourceUri() != null) {
+                jo.put("resource", annot.getResourceUri());
+            }
 
             /*
@@ -442 +445 @@
         }
         /*
+         * resource uri
+         */
+        if (jo.has("resource")) {
+            annot.setResourceUri(jo.getString("resource"));
+        }
+        /*
          * annotation text
          */