annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java @ 48:0e00bf8e27fb

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