annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 90:475ab3d32630

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