annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 64:c48435e7f312

fix npe when an annotation has no creator.
author casties
date Mon, 03 Dec 2012 18:42:20 +0100
parents 9f8c9611848a
children 2b1e6df5e21a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
1 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
2 * Base class for Annotator resource classes.
47b53ae385d1 merging old code
casties
parents:
diff changeset
3 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
4 package de.mpiwg.itgroup.annotations.restlet;
47b53ae385d1 merging old code
casties
parents:
diff changeset
5
47b53ae385d1 merging old code
casties
parents:
diff changeset
6 import java.io.UnsupportedEncodingException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
7 import java.security.InvalidKeyException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
8 import java.security.SignatureException;
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
9 import java.text.SimpleDateFormat;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
10 import java.util.ArrayList;
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
11 import java.util.Calendar;
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
12 import java.util.HashSet;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
13 import java.util.List;
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
14 import java.util.Set;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
15 import java.util.regex.Matcher;
47b53ae385d1 merging old code
casties
parents:
diff changeset
16 import java.util.regex.Pattern;
47b53ae385d1 merging old code
casties
parents:
diff changeset
17
47b53ae385d1 merging old code
casties
parents:
diff changeset
18 import net.oauth.jsontoken.Checker;
47b53ae385d1 merging old code
casties
parents:
diff changeset
19 import net.oauth.jsontoken.JsonToken;
47b53ae385d1 merging old code
casties
parents:
diff changeset
20 import net.oauth.jsontoken.JsonTokenParser;
47b53ae385d1 merging old code
casties
parents:
diff changeset
21 import net.oauth.jsontoken.SystemClock;
47b53ae385d1 merging old code
casties
parents:
diff changeset
22 import net.oauth.jsontoken.crypto.HmacSHA256Verifier;
47b53ae385d1 merging old code
casties
parents:
diff changeset
23 import net.oauth.jsontoken.crypto.Verifier;
47b53ae385d1 merging old code
casties
parents:
diff changeset
24
47b53ae385d1 merging old code
casties
parents:
diff changeset
25 import org.apache.commons.codec.binary.Base64;
47b53ae385d1 merging old code
casties
parents:
diff changeset
26 import org.apache.log4j.Logger;
47b53ae385d1 merging old code
casties
parents:
diff changeset
27 import org.json.JSONArray;
47b53ae385d1 merging old code
casties
parents:
diff changeset
28 import org.json.JSONException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
29 import org.json.JSONObject;
47b53ae385d1 merging old code
casties
parents:
diff changeset
30 import org.restlet.data.Form;
47b53ae385d1 merging old code
casties
parents:
diff changeset
31 import org.restlet.data.Status;
47b53ae385d1 merging old code
casties
parents:
diff changeset
32 import org.restlet.representation.Representation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
33 import org.restlet.resource.Options;
47b53ae385d1 merging old code
casties
parents:
diff changeset
34 import org.restlet.resource.ServerResource;
47b53ae385d1 merging old code
casties
parents:
diff changeset
35
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
36 import de.mpiwg.itgroup.annotations.Actor;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
37 import de.mpiwg.itgroup.annotations.Annotation;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
38 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
39 import de.mpiwg.itgroup.annotations.Group;
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
40 import de.mpiwg.itgroup.annotations.Person;
48
0e00bf8e27fb targets and resources of Annotation object are objects now.
casties
parents: 40
diff changeset
41 import de.mpiwg.itgroup.annotations.Resource;
0e00bf8e27fb targets and resources of Annotation object are objects now.
casties
parents: 40
diff changeset
42 import de.mpiwg.itgroup.annotations.Target;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
43 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
44
47b53ae385d1 merging old code
casties
parents:
diff changeset
45 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
46 * Base class for Annotator resource classes.
47b53ae385d1 merging old code
casties
parents:
diff changeset
47 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
48 * @author dwinter, casties
47b53ae385d1 merging old code
casties
parents:
diff changeset
49 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
50 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
51 public abstract class AnnotatorResourceImpl extends ServerResource {
47b53ae385d1 merging old code
casties
parents:
diff changeset
52
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
53 protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
54
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
55 private AnnotationStore store;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
56
47b53ae385d1 merging old code
casties
parents:
diff changeset
57 protected String getAllowedMethodsForHeader() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
58 return "OPTIONS,GET,POST";
47b53ae385d1 merging old code
casties
parents:
diff changeset
59 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
60
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
61 protected AnnotationStore getAnnotationStore() {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
62 if (store == null) {
19
f0f55ab768c9 more work on HTML UI.
casties
parents: 18
diff changeset
63 store = ((BaseRestlet) getApplication()).getAnnotationStore();
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
64 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
65 return store;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
66 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
67
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
68 public String encodeJsonId(String id) {
64
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
69 if (id == null)
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
70 return null;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
71 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
72 return Base64.encodeBase64URLSafeString(id.getBytes("UTF-8"));
47b53ae385d1 merging old code
casties
parents:
diff changeset
73 } catch (UnsupportedEncodingException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
74 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
75 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
76 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
77
47b53ae385d1 merging old code
casties
parents:
diff changeset
78 public String decodeJsonId(String id) {
64
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
79 if (id == null)
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
80 return null;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
81 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
82 return new String(Base64.decodeBase64(id), "UTF-8");
47b53ae385d1 merging old code
casties
parents:
diff changeset
83 } catch (UnsupportedEncodingException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
84 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
85 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
86 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
87
47b53ae385d1 merging old code
casties
parents:
diff changeset
88 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
89 * Handle options request to allow CORS for AJAX.
47b53ae385d1 merging old code
casties
parents:
diff changeset
90 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
91 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
92 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
93 @Options
47b53ae385d1 merging old code
casties
parents:
diff changeset
94 public void doOptions(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
95 logger.debug("AnnotatorResourceImpl doOptions!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
96 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
97 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
98
47b53ae385d1 merging old code
casties
parents:
diff changeset
99 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
100 * set headers to allow CORS for AJAX.
47b53ae385d1 merging old code
casties
parents:
diff changeset
101 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
102 protected void setCorsHeaders() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
103 Form responseHeaders = (Form) getResponse().getAttributes().get("org.restlet.http.headers");
47b53ae385d1 merging old code
casties
parents:
diff changeset
104 if (responseHeaders == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
105 responseHeaders = new Form();
47b53ae385d1 merging old code
casties
parents:
diff changeset
106 getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
47b53ae385d1 merging old code
casties
parents:
diff changeset
107 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
108 responseHeaders.add("Access-Control-Allow-Methods", getAllowedMethodsForHeader());
47b53ae385d1 merging old code
casties
parents:
diff changeset
109 // echo back Origin and Request-Headers
47b53ae385d1 merging old code
casties
parents:
diff changeset
110 Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
47b53ae385d1 merging old code
casties
parents:
diff changeset
111 String origin = requestHeaders.getFirstValue("Origin", true);
47b53ae385d1 merging old code
casties
parents:
diff changeset
112 if (origin == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
113 responseHeaders.add("Access-Control-Allow-Origin", "*");
47b53ae385d1 merging old code
casties
parents:
diff changeset
114 } else {
47b53ae385d1 merging old code
casties
parents:
diff changeset
115 responseHeaders.add("Access-Control-Allow-Origin", origin);
47b53ae385d1 merging old code
casties
parents:
diff changeset
116 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
117 String allowHeaders = requestHeaders.getFirstValue("Access-Control-Request-Headers", true);
47b53ae385d1 merging old code
casties
parents:
diff changeset
118 if (allowHeaders != null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
119 responseHeaders.add("Access-Control-Allow-Headers", allowHeaders);
47b53ae385d1 merging old code
casties
parents:
diff changeset
120 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
121 responseHeaders.add("Access-Control-Allow-Credentials", "true");
47b53ae385d1 merging old code
casties
parents:
diff changeset
122 responseHeaders.add("Access-Control-Max-Age", "60");
47b53ae385d1 merging old code
casties
parents:
diff changeset
123 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
124
47b53ae385d1 merging old code
casties
parents:
diff changeset
125 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
126 * returns if authentication information from headers is valid.
47b53ae385d1 merging old code
casties
parents:
diff changeset
127 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
128 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
129 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
130 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
131 public boolean isAuthenticated(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
132 return (checkAuthToken(entity) != null);
47b53ae385d1 merging old code
casties
parents:
diff changeset
133 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
134
47b53ae385d1 merging old code
casties
parents:
diff changeset
135 /**
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
136 * Checks Annotator Auth plugin authentication information from headers.
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
137 * Returns userId if successful. Returns "anonymous" in non-authorization
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
138 * mode.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
139 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
140 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
141 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
142 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
143 public String checkAuthToken(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
144 Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
47b53ae385d1 merging old code
casties
parents:
diff changeset
145 String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true);
57
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
146 if (authToken == null) {
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
147 if (!((BaseRestlet) getApplication()).isAuthorizationMode()) {
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
148 return "anonymous";
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
149 }
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
150 return null;
4efb21cf0ce0 new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.
casties
parents: 52
diff changeset
151 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
152 // decode token first to get consumer key
47b53ae385d1 merging old code
casties
parents:
diff changeset
153 JsonToken token = new JsonTokenParser(null, null).deserialize(authToken);
47b53ae385d1 merging old code
casties
parents:
diff changeset
154 String userId = token.getParamAsPrimitive("userId").getAsString();
47b53ae385d1 merging old code
casties
parents:
diff changeset
155 String consumerKey = token.getParamAsPrimitive("consumerKey").getAsString();
47b53ae385d1 merging old code
casties
parents:
diff changeset
156 // get stored consumer secret for key
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents: 16
diff changeset
157 BaseRestlet restServer = (BaseRestlet) getApplication();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
158 String consumerSecret = restServer.getConsumerSecret(consumerKey);
47b53ae385d1 merging old code
casties
parents:
diff changeset
159 logger.debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret);
47b53ae385d1 merging old code
casties
parents:
diff changeset
160 if (consumerSecret == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
161 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
162 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
163 // logger.debug(String.format("token=%s tokenString=%s signatureAlgorithm=%s",token,token.getTokenString(),token.getSignatureAlgorithm()));
47b53ae385d1 merging old code
casties
parents:
diff changeset
164 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
165 List<Verifier> verifiers = new ArrayList<Verifier>();
47b53ae385d1 merging old code
casties
parents:
diff changeset
166 // we only do HS256 yet
47b53ae385d1 merging old code
casties
parents:
diff changeset
167 verifiers.add(new HmacSHA256Verifier(consumerSecret.getBytes("UTF-8")));
47b53ae385d1 merging old code
casties
parents:
diff changeset
168 // verify token signature(should really be static...)
47b53ae385d1 merging old code
casties
parents:
diff changeset
169 new JsonTokenParser(new SystemClock(), null, (Checker[]) null).verify(token, verifiers);
47b53ae385d1 merging old code
casties
parents:
diff changeset
170 } catch (SignatureException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
171 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
172 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
173 } catch (InvalidKeyException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
174 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
175 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
176 } catch (UnsupportedEncodingException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
177 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
178 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
179 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
180 // must be ok then
47b53ae385d1 merging old code
casties
parents:
diff changeset
181 logger.debug("auth OK! user=" + userId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
182 return userId;
47b53ae385d1 merging old code
casties
parents:
diff changeset
183 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
184
47b53ae385d1 merging old code
casties
parents:
diff changeset
185 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
186 * creates Annotator-JSON from an Annotation object.
47b53ae385d1 merging old code
casties
parents:
diff changeset
187 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
188 * @param annot
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
189 * @param forAnonymous
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
190 * TODO
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
191 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
192 */
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
193 public JSONObject createAnnotatorJson(Annotation annot, boolean forAnonymous) {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
194 // return user as a JSON object (otherwise just as string)
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
195 boolean makeUserObject = true;
47b53ae385d1 merging old code
casties
parents:
diff changeset
196 JSONObject jo = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
197 try {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
198 jo.put("text", annot.getBodyText());
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
199 jo.put("uri", annot.getTargetBaseUri());
40
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
200 if (annot.getResourceUri() != null) {
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
201 jo.put("resource", annot.getResourceUri());
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
202 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
203
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
204 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
205 * user
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
206 */
64
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
207 Actor creator = annot.getCreator();
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
208 if (creator != null) {
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
209 if (makeUserObject) {
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
210 // create user object
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
211 JSONObject userObject = new JSONObject();
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
212 // save creator as uri
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
213 userObject.put("uri", creator.getUri());
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
214 // make short user id
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
215 String userId = creator.getIdString();
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
216 // set as id
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
217 userObject.put("id", userId);
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
218 // get full name
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
219 String userName = creator.getName();
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
220 if (userName == null) {
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
221 BaseRestlet restServer = (BaseRestlet) getApplication();
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
222 userName = restServer.getFullNameFromLdap(userId);
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
223 }
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
224 userObject.put("name", userName);
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
225 // save user object
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
226 jo.put("user", userObject);
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
227 } else {
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
228 // save user as string
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
229 jo.put("user", annot.getCreatorUri());
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
230 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
231 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
232
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
233 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
234 * ranges
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
235 */
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
236 if (annot.getTargetFragment() != null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
237 // we only look at the first xpointer
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
238 List<String> fragments = new ArrayList<String>();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
239 fragments.add(annot.getTargetFragment());
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
240 FragmentTypes xt = annot.getFragmentType();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
241 if (xt == FragmentTypes.XPOINTER) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
242 jo.put("ranges", transformToRanges(fragments));
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
243 } else if (xt == FragmentTypes.AREA) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
244 jo.put("shapes", transformToShapes(fragments));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
245 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
246 }
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
247
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
248 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
249 * permissions
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
250 */
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
251 JSONObject perms = new JSONObject();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
252 jo.put("permissions", perms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
253 // admin
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
254 JSONArray adminPerms = new JSONArray();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
255 perms.put("admin", adminPerms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
256 Actor adminPerm = annot.getAdminPermission();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
257 if (adminPerm != null) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
258 adminPerms.put(adminPerm.getIdString());
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
259 } else if (forAnonymous) {
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
260 // set something because its not allowed for anonymous
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
261 adminPerms.put("not-you");
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
262 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
263 // delete
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
264 JSONArray deletePerms = new JSONArray();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
265 perms.put("delete", deletePerms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
266 Actor deletePerm = annot.getDeletePermission();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
267 if (deletePerm != null) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
268 deletePerms.put(deletePerm.getIdString());
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
269 } else if (forAnonymous) {
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
270 // set something because its not allowed for anonymous
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
271 deletePerms.put("not-you");
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
272 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
273 // update
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
274 JSONArray updatePerms = new JSONArray();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
275 perms.put("update", updatePerms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
276 Actor updatePerm = annot.getUpdatePermission();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
277 if (updatePerm != null) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
278 updatePerms.put(updatePerm.getIdString());
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
279 } else if (forAnonymous) {
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
280 // set something because its not allowed for anonymous
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 10
diff changeset
281 updatePerms.put("not-you");
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
282 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
283 // read
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
284 JSONArray readPerms = new JSONArray();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
285 perms.put("read", readPerms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
286 Actor readPerm = annot.getReadPermission();
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
287 if (readPerm != null) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
288 readPerms.put(readPerm.getIdString());
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
289 }
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
290
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
291 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
292 * tags
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
293 */
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
294 Set<String> tagset = annot.getTags();
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
295 if (tagset != null) {
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
296 JSONArray tags = new JSONArray();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
297 jo.put("tags", tags);
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
298 for (String tag : tagset) {
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
299 tags.put(tag);
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
300 }
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
301 }
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
302
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
303 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
304 * id
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
305 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
306 // encode Annotation URL (=id) in base64
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
307 String annotUrl = annot.getUri();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
308 String annotId = encodeJsonId(annotUrl);
47b53ae385d1 merging old code
casties
parents:
diff changeset
309 jo.put("id", annotId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
310 return jo;
47b53ae385d1 merging old code
casties
parents:
diff changeset
311 } catch (JSONException e) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
312 logger.error("Unable to create AnnotatorJSON!", e);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
313 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
314 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
315 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
316
47b53ae385d1 merging old code
casties
parents:
diff changeset
317 private JSONArray transformToRanges(List<String> xpointers) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
318 JSONArray ja = new JSONArray();
47b53ae385d1 merging old code
casties
parents:
diff changeset
319 Pattern rg = Pattern
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
320 .compile("xpointer\\(start-point\\(string-range\\(\"([^\"]*)\",([^,]*),1\\)\\)/range-to\\(end-point\\(string-range\\(\"([^\"]*)\",([^,]*),1\\)\\)\\)\\)");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
321 Pattern rg1 = Pattern.compile("xpointer\\(start-point\\(string-range\\(\"([^\"]*)\",([^,]*),1\\)\\)\\)");
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
322 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
323 for (String xpointer : xpointers) {
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
324 // String decoded = URLDecoder.decode(xpointer, "utf-8");
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
325 String decoded = xpointer;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
326 Matcher m = rg.matcher(decoded);
47b53ae385d1 merging old code
casties
parents:
diff changeset
327 if (m.find()) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
328 JSONObject jo = new JSONObject();
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
329 jo.put("start", m.group(1));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
330 jo.put("startOffset", m.group(2));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
331 jo.put("end", m.group(3));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
332 jo.put("endOffset", m.group(4));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
333 ja.put(jo);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
334 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
335 m = rg1.matcher(xpointer);
47b53ae385d1 merging old code
casties
parents:
diff changeset
336 if (m.find()) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
337 JSONObject jo = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
338 jo.put("start", m.group(1));
47b53ae385d1 merging old code
casties
parents:
diff changeset
339 jo.put("startOffset", m.group(2));
47b53ae385d1 merging old code
casties
parents:
diff changeset
340 ja.put(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
341 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
342 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
343 } catch (JSONException e) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
344 logger.error("Unable to transform to ranges!", e);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
345 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
346 return ja;
47b53ae385d1 merging old code
casties
parents:
diff changeset
347 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
348
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
349 private JSONArray transformToShapes(List<String> xpointers) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
350 JSONArray ja = new JSONArray();
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
351 Pattern rg = Pattern.compile("xywh=(\\w*):([\\d\\.]+),([\\d\\.]+),([\\d\\.]+),([\\d\\.]+)");
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
352 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
353 for (String xpointer : xpointers) {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
354 String decoded = xpointer;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
355 Matcher m = rg.matcher(decoded);
47b53ae385d1 merging old code
casties
parents:
diff changeset
356 if (m.find()) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
357 String units = m.group(1);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
358 float x = getFloat(m.group(2));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
359 float y = getFloat(m.group(3));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
360 float width = getFloat(m.group(4));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
361 float height = getFloat(m.group(5));
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
362 JSONObject shape = new JSONObject();
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
363 JSONObject geom = new JSONObject();
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
364 geom.put("units", units);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
365 geom.put("x", x);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
366 geom.put("y", y);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
367 if (width == 0 || height == 0) {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
368 shape.put("type", "point");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
369 shape.put("geometry", geom);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
370 } else {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
371 shape.put("type", "rectangle");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
372 geom.put("width", width);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
373 geom.put("height", height);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
374 shape.put("geometry", geom);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
375 }
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
376 ja.put(shape);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
377 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
378 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
379 } catch (JSONException e) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
380 logger.error("Unable to transform to shapes!", e);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
381 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
382 return ja;
47b53ae385d1 merging old code
casties
parents:
diff changeset
383 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
384
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
385 protected String parseShape(JSONObject shape) throws JSONException {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
386 String fragment = null;
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
387 String type = shape.getString("type");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
388 JSONObject geom = shape.getJSONObject("geometry");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
389 if (type.equalsIgnoreCase("point")) {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
390 String x = geom.getString("x");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
391 String y = geom.getString("y");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
392 fragment = String.format("xywh=fraction:%s,%s,0,0", x, y);
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
393 } else if (type.equalsIgnoreCase("rectangle")) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
394 String x = geom.getString("x");
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
395 String y = geom.getString("y");
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
396 String width = geom.getString("width");
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
397 String height = geom.getString("height");
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
398 fragment = String.format("xywh=fraction:%s,%s,%s,%s", x, y, width, height);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
399 } else {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
400 logger.error("Unable to parse this shape: " + shape);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
401 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
402 return fragment;
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
403 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
404
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
405 protected String parseArea(JSONObject area) throws JSONException {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
406 String x = area.getString("x");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
407 String y = area.getString("y");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
408 String width = "0";
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
409 String height = "0";
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
410 if (area.has("width")) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
411 width = area.getString("width");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
412 height = area.getString("height");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
413 }
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
414 String fragment = String.format("xywh=fraction:%s,%s,%s,%s", x, y, width, height);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
415 return fragment;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
416 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
417
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
418 protected String parseRange(JSONObject range) throws JSONException {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
419 String start = range.getString("start");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
420 String end = range.getString("end");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
421 String startOffset = range.getString("startOffset");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
422 String endOffset = range.getString("endOffset");
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
423 String fragment = String.format(
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
424 "xpointer(start-point(string-range(\"%s\",%s,1))/range-to(end-point(string-range(\"%s\",%s,1))))", start,
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
425 startOffset, end, endOffset);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
426 return fragment;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
427 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
428
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
429 /**
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
430 * Creates an Annotation object with data from JSON.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
431 *
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
432 * uses the specification from the annotator project: {@link https
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
433 * ://github.com/okfn/annotator/wiki/Annotation-format}
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
434 *
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
435 * The username will be transformed to an URI if not given already as URI,
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
436 * if not it will set to the MPIWG namespace defined in
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
437 * de.mpiwg.itgroup.annotationManager.Constants.NS
47b53ae385d1 merging old code
casties
parents:
diff changeset
438 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
439 * @param jo
47b53ae385d1 merging old code
casties
parents:
diff changeset
440 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
441 * @throws JSONException
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
442 * @throws UnsupportedEncodingException
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
443 */
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
444 public Annotation createAnnotation(JSONObject jo, Representation entity) throws JSONException, UnsupportedEncodingException {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
445 return updateAnnotation(new Annotation(), jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
446 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
447
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
448 /**
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
449 * Updates an Annotation object with data from JSON.
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
450 *
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
451 * uses the specification from the annotator project: {@link https
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
452 * ://github.com/okfn/annotator/wiki/Annotation-format}
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
453 *
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
454 * The username will be transformed to an URI if not given already as URI,
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
455 * if not it will set to the MPIWG namespace defined in
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
456 * de.mpiwg.itgroup.annotationManager.Constants.NS
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
457 *
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
458 * @param annot
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
459 * @param jo
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
460 * @return
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
461 * @throws JSONException
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
462 * @throws UnsupportedEncodingException
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
463 */
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
464 public Annotation updateAnnotation(Annotation annot, JSONObject jo, Representation entity) throws JSONException,
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
465 UnsupportedEncodingException {
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
466 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
467 * target uri
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
468 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
469 if (jo.has("uri")) {
48
0e00bf8e27fb targets and resources of Annotation object are objects now.
casties
parents: 40
diff changeset
470 annot.setTarget(new Target(jo.getString("uri")));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
471 }
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
472 /*
40
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
473 * resource uri
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
474 */
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
475 if (jo.has("resource")) {
48
0e00bf8e27fb targets and resources of Annotation object are objects now.
casties
parents: 40
diff changeset
476 annot.setResource(new Resource(jo.getString("resource")));
40
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
477 }
03e0f7574224 saving and loading resource targets should work now (no searching yet)
casties
parents: 22
diff changeset
478 /*
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
479 * annotation text
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
480 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
481 if (jo.has("text")) {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
482 annot.setBodyText(jo.getString("text"));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
483 }
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
484 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
485 * check authentication
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
486 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
487 String authUser = checkAuthToken(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
488 if (authUser == null) {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
489 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
490 * // try http auth User httpUser = getHttpAuthUser(entity); if
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
491 * (httpUser == null) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
492 */
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
493 setStatus(Status.CLIENT_ERROR_FORBIDDEN);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
494 return null;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
495 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
496 * } authUser = httpUser.getIdentifier();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
497 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
498 }
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
499 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
500 * get or create creator object
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
501 */
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
502 Actor creator = annot.getCreator();
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
503 if (creator == null) {
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
504 creator = new Person();
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
505 annot.setCreator(creator);
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
506 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
507 // username not required, if no username given authuser will be used
47b53ae385d1 merging old code
casties
parents:
diff changeset
508 String username = null;
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
509 String userUri = creator.getUri();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
510 if (jo.has("user")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
511 if (jo.get("user") instanceof String) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
512 // user is just a String
47b53ae385d1 merging old code
casties
parents:
diff changeset
513 username = jo.getString("user");
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
514 creator.setId(username);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
515 // TODO: what if username and authUser are different?
47b53ae385d1 merging old code
casties
parents:
diff changeset
516 } else {
47b53ae385d1 merging old code
casties
parents:
diff changeset
517 // user is an object
47b53ae385d1 merging old code
casties
parents:
diff changeset
518 JSONObject user = jo.getJSONObject("user");
47b53ae385d1 merging old code
casties
parents:
diff changeset
519 if (user.has("id")) {
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
520 String id = user.getString("id");
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
521 creator.setId(id);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
522 username = id;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
523 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
524 if (user.has("uri")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
525 userUri = user.getString("uri");
47b53ae385d1 merging old code
casties
parents:
diff changeset
526 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
527 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
528 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
529 if (username == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
530 username = authUser;
47b53ae385d1 merging old code
casties
parents:
diff changeset
531 }
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
532 // try to get full name
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
533 if (creator.getName() == null && username != null) {
18
aafa3884b2c4 new AnnotationStore restlet for HTML-UI.
casties
parents: 16
diff changeset
534 BaseRestlet restServer = (BaseRestlet) getApplication();
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
535 String fullName = restServer.getFullNameFromLdap(username);
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
536 creator.setName(fullName);
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
537 }
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
538 // userUri should be a URI, if not it will set to the MPIWG namespace
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
539 if (userUri == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
540 if (username.startsWith("http")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
541 userUri = username;
47b53ae385d1 merging old code
casties
parents:
diff changeset
542 } else {
58
f5c0e6df7e88 made uri prefixes in store configurable.
casties
parents: 57
diff changeset
543 userUri = BaseRestlet.PERSONS_URI_PREFIX + username;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
544 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
545 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
546 // TODO: should we overwrite the creator?
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
547 if (creator.getUri() == null) {
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
548 creator.setUri(userUri);
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
549 }
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
550 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
551 * creation date
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
552 */
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
553 if (annot.getCreated() == null) {
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
554 // set creation date
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
555 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
556 String ct = format.format(Calendar.getInstance().getTime());
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
557 annot.setCreated(ct);
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
558 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
559
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
560 /*
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
561 * create fragment from the first range/area
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
562 */
52
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
563 try {
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
564 if (jo.has("ranges")) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
565 JSONArray ranges = jo.getJSONArray("ranges");
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
566 if (ranges.length() > 0) {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
567 JSONObject range = ranges.getJSONObject(0);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
568 annot.setFragmentType(FragmentTypes.XPOINTER);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
569 String fragment = parseRange(range);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
570 annot.setTargetFragment(fragment);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
571 }
52
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
572 }
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
573 } catch (JSONException e) {
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
574 // nothing to do
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
575 }
52
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
576 try {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
577 if (jo.has("shapes")) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
578 JSONArray shapes = jo.getJSONArray("shapes");
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
579 if (shapes.length() > 0) {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
580 JSONObject shape = shapes.getJSONObject(0);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
581 annot.setFragmentType(FragmentTypes.AREA);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
582 String fragment = parseShape(shape);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
583 annot.setTargetFragment(fragment);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
584 }
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
585 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
586 } catch (JSONException e) {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
587 // nothing to do
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
588 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
589 // deprecated areas type
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
590 try {
52
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
591 if (jo.has("areas")) {
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
592 JSONArray areas = jo.getJSONArray("areas");
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
593 if (areas.length() > 0) {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
594 JSONObject area = areas.getJSONObject(0);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
595 annot.setFragmentType(FragmentTypes.AREA);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
596 String fragment = parseArea(area);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
597 annot.setTargetFragment(fragment);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
598 }
52
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
599 }
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
600 } catch (JSONException e) {
a52c597075dc more resilience to ranges and areas in JSON
casties
parents: 48
diff changeset
601 // nothing to do
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
602 }
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
603 // no fragment is an error
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
604 if (annot.getFragmentType() == null || annot.getTargetFragment() == null) {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
605 throw new JSONException("Annotation has no valid target fragment!");
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
606 }
64
c48435e7f312 fix npe when an annotation has no creator.
casties
parents: 63
diff changeset
607
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
608 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
609 * permissions
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
610 */
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
611 if (jo.has("permissions")) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
612 JSONObject permissions = jo.getJSONObject("permissions");
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
613 if (permissions.has("admin")) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
614 JSONArray perms = permissions.getJSONArray("admin");
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
615 Actor actor = getActorFromPermissions(perms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
616 annot.setAdminPermission(actor);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
617 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
618 if (permissions.has("delete")) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
619 JSONArray perms = permissions.getJSONArray("delete");
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
620 Actor actor = getActorFromPermissions(perms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
621 annot.setDeletePermission(actor);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
622 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
623 if (permissions.has("update")) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
624 JSONArray perms = permissions.getJSONArray("update");
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
625 Actor actor = getActorFromPermissions(perms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
626 annot.setUpdatePermission(actor);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
627 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
628 if (permissions.has("read")) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
629 JSONArray perms = permissions.getJSONArray("read");
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
630 Actor actor = getActorFromPermissions(perms);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
631 annot.setReadPermission(actor);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
632 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
633 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
634
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
635 /*
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
636 * tags
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
637 */
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
638 if (jo.has("tags")) {
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
639 HashSet<String> tagset = new HashSet<String>();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
640 JSONArray tags = jo.getJSONArray("tags");
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
641 for (int i = 0; i < tags.length(); ++i) {
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
642 tagset.add(tags.getString(i));
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
643 }
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
644 annot.setTags(tagset);
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
645 }
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
646
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
647 return annot;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
648 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
649
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
650 @SuppressWarnings("unused")
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
651 // i in for loop
10
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
652 protected Actor getActorFromPermissions(JSONArray perms) throws JSONException {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
653 Actor actor = null;
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
654 for (int i = 0; i < perms.length(); ++i) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
655 String perm = perms.getString(i);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
656 if (perm.toLowerCase().startsWith("group:")) {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
657 String groupId = perm.substring(6);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
658 actor = new Group(groupId);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
659 } else {
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
660 actor = new Person(perm);
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
661 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
662 // we just take the first one
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
663 break;
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
664 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
665 return actor;
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
666 }
90911b2da322 more work on permissions...
casties
parents: 9
diff changeset
667
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
668 public static float getFloat(String s) {
61
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
669 try {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
670 return Float.parseFloat(s);
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
671 } catch (NumberFormatException e) {
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
672 }
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
673 return 0f;
b8ef15c8c4a5 implemented new shape format for image annotations.
casties
parents: 58
diff changeset
674 }
63
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
675
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
676 public static int getInt(String s) {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
677 try {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
678 return Integer.parseInt(s);
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
679 } catch (NumberFormatException e) {
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
680 }
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
681 return 0;
9f8c9611848a fixed bug with new rectangle shapes. added limit, offset and sortBy parameters to annotator/ and annotator/search.
casties
parents: 61
diff changeset
682 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
683 }