annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 63:9f8c9611848a

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