annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 76:4e2dc67997a0

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