Changeset 15:58357a4b86de in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java

Timestamp:

Aug 28, 2012, 6:23:12 PM (12 years ago)

Author:

casties

Branch:

default

Message:

ASSIGNED - # 249: Annotations shared in groups
​https://it-dev.mpiwg-berlin.mpg.de/tracs/mpdl-project-software/ticket/249

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorSearch.java (modified) (3 diffs)

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

@@ -16 +16 @@
 
 import de.mpiwg.itgroup.annotations.Annotation;
+import de.mpiwg.itgroup.annotations.Person;
+import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 
 /**
@@ -42 +44 @@
         setCorsHeaders();
         // do authentication
-        String authUser = this.checkAuthToken(entity);
+        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
         logger.debug("request authenticated=" + authUser);
 
@@ -54 +56 @@
         // do search
         logger.debug(String.format("searching for uri=%s user=%s", uri, user));
-        List<Annotation> annots = getAnnotationStore().searchByUriUser(uri, user, limit, offset);
+        AnnotationStore store = getAnnotationStore();
+        List<Annotation> annots = store.searchByUriUser(uri, user, limit, offset);
         for (Annotation annot : annots) {
             // check permission
-            if (!annot.isActionAllowed("read", authUser)) continue;
+            if (!annot.isActionAllowed("read", authUser, store)) continue;
             JSONObject jo = createAnnotatorJson(annot, (authUser == null));
             if (jo != null) {