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

new internal actor class for creator.
author casties
date Thu, 12 Jul 2012 12:54:46 +0200
parents bbf0cc5bee29
children 90911b2da322
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;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
12 import java.util.List;
47b53ae385d1 merging old code
casties
parents:
diff changeset
13 import java.util.regex.Matcher;
47b53ae385d1 merging old code
casties
parents:
diff changeset
14 import java.util.regex.Pattern;
47b53ae385d1 merging old code
casties
parents:
diff changeset
15
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
16 import javax.servlet.ServletContext;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
17
3
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;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
39 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
40 import de.mpiwg.itgroup.annotations.old.NS;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
41
47b53ae385d1 merging old code
casties
parents:
diff changeset
42 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
43 * Base class for Annotator resource classes.
47b53ae385d1 merging old code
casties
parents:
diff changeset
44 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
45 * @author dwinter, casties
47b53ae385d1 merging old code
casties
parents:
diff changeset
46 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
47 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
48 public abstract class AnnotatorResourceImpl extends ServerResource {
47b53ae385d1 merging old code
casties
parents:
diff changeset
49
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
50 protected static Logger logger = Logger.getLogger(AnnotatorResourceImpl.class);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
51
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
52 private AnnotationStore store;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
53
47b53ae385d1 merging old code
casties
parents:
diff changeset
54 protected String getAllowedMethodsForHeader() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
55 return "OPTIONS,GET,POST";
47b53ae385d1 merging old code
casties
parents:
diff changeset
56 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
57
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
58 protected AnnotationStore getAnnotationStore() {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
59 if (store == null) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
60 ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
61 .get("org.restlet.ext.servlet.ServletContext");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
62 logger.debug("Getting AnnotationStore from Context");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
63 store = (AnnotationStore) sc.getAttribute(RestServer.ANNSTORE_KEY);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
64 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
65 return store;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
66 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
67
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
68 public String encodeJsonId(String id) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
69 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
70 return Base64.encodeBase64URLSafeString(id.getBytes("UTF-8"));
47b53ae385d1 merging old code
casties
parents:
diff changeset
71 } catch (UnsupportedEncodingException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
72 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
73 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
74 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
75
47b53ae385d1 merging old code
casties
parents:
diff changeset
76 public String decodeJsonId(String id) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
77 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
78 return new String(Base64.decodeBase64(id), "UTF-8");
47b53ae385d1 merging old code
casties
parents:
diff changeset
79 } catch (UnsupportedEncodingException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
80 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
81 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
82 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
83
47b53ae385d1 merging old code
casties
parents:
diff changeset
84 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
85 * Handle options request to allow CORS for AJAX.
47b53ae385d1 merging old code
casties
parents:
diff changeset
86 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
87 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
88 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
89 @Options
47b53ae385d1 merging old code
casties
parents:
diff changeset
90 public void doOptions(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
91 logger.debug("AnnotatorResourceImpl doOptions!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
92 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
93 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
94
47b53ae385d1 merging old code
casties
parents:
diff changeset
95 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
96 * set headers to allow CORS for AJAX.
47b53ae385d1 merging old code
casties
parents:
diff changeset
97 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
98 protected void setCorsHeaders() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
99 Form responseHeaders = (Form) getResponse().getAttributes().get("org.restlet.http.headers");
47b53ae385d1 merging old code
casties
parents:
diff changeset
100 if (responseHeaders == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
101 responseHeaders = new Form();
47b53ae385d1 merging old code
casties
parents:
diff changeset
102 getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
47b53ae385d1 merging old code
casties
parents:
diff changeset
103 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
104 responseHeaders.add("Access-Control-Allow-Methods", getAllowedMethodsForHeader());
47b53ae385d1 merging old code
casties
parents:
diff changeset
105 // echo back Origin and Request-Headers
47b53ae385d1 merging old code
casties
parents:
diff changeset
106 Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
47b53ae385d1 merging old code
casties
parents:
diff changeset
107 String origin = requestHeaders.getFirstValue("Origin", true);
47b53ae385d1 merging old code
casties
parents:
diff changeset
108 if (origin == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
109 responseHeaders.add("Access-Control-Allow-Origin", "*");
47b53ae385d1 merging old code
casties
parents:
diff changeset
110 } else {
47b53ae385d1 merging old code
casties
parents:
diff changeset
111 responseHeaders.add("Access-Control-Allow-Origin", origin);
47b53ae385d1 merging old code
casties
parents:
diff changeset
112 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
113 String allowHeaders = requestHeaders.getFirstValue("Access-Control-Request-Headers", true);
47b53ae385d1 merging old code
casties
parents:
diff changeset
114 if (allowHeaders != null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
115 responseHeaders.add("Access-Control-Allow-Headers", allowHeaders);
47b53ae385d1 merging old code
casties
parents:
diff changeset
116 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
117 responseHeaders.add("Access-Control-Allow-Credentials", "true");
47b53ae385d1 merging old code
casties
parents:
diff changeset
118 responseHeaders.add("Access-Control-Max-Age", "60");
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 * returns if authentication information from headers is valid.
47b53ae385d1 merging old code
casties
parents:
diff changeset
123 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
124 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
125 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
126 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
127 public boolean isAuthenticated(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
128 return (checkAuthToken(entity) != null);
47b53ae385d1 merging old code
casties
parents:
diff changeset
129 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
130
47b53ae385d1 merging old code
casties
parents:
diff changeset
131 /**
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
132 * checks Annotator Auth plugin authentication information from headers.
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
133 * returns userId if successful.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
134 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
135 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
136 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
137 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
138 public String checkAuthToken(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
139 Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
47b53ae385d1 merging old code
casties
parents:
diff changeset
140 String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true);
47b53ae385d1 merging old code
casties
parents:
diff changeset
141 // decode token first to get consumer key
47b53ae385d1 merging old code
casties
parents:
diff changeset
142 JsonToken token = new JsonTokenParser(null, null).deserialize(authToken);
47b53ae385d1 merging old code
casties
parents:
diff changeset
143 String userId = token.getParamAsPrimitive("userId").getAsString();
47b53ae385d1 merging old code
casties
parents:
diff changeset
144 String consumerKey = token.getParamAsPrimitive("consumerKey").getAsString();
47b53ae385d1 merging old code
casties
parents:
diff changeset
145 // get stored consumer secret for key
47b53ae385d1 merging old code
casties
parents:
diff changeset
146 RestServer restServer = (RestServer) getApplication();
47b53ae385d1 merging old code
casties
parents:
diff changeset
147 String consumerSecret = restServer.getConsumerSecret(consumerKey);
47b53ae385d1 merging old code
casties
parents:
diff changeset
148 logger.debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret);
47b53ae385d1 merging old code
casties
parents:
diff changeset
149 if (consumerSecret == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
150 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
151 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
152 // logger.debug(String.format("token=%s tokenString=%s signatureAlgorithm=%s",token,token.getTokenString(),token.getSignatureAlgorithm()));
47b53ae385d1 merging old code
casties
parents:
diff changeset
153 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
154 List<Verifier> verifiers = new ArrayList<Verifier>();
47b53ae385d1 merging old code
casties
parents:
diff changeset
155 // we only do HS256 yet
47b53ae385d1 merging old code
casties
parents:
diff changeset
156 verifiers.add(new HmacSHA256Verifier(consumerSecret.getBytes("UTF-8")));
47b53ae385d1 merging old code
casties
parents:
diff changeset
157 // verify token signature(should really be static...)
47b53ae385d1 merging old code
casties
parents:
diff changeset
158 new JsonTokenParser(new SystemClock(), null, (Checker[]) null).verify(token, verifiers);
47b53ae385d1 merging old code
casties
parents:
diff changeset
159 } catch (SignatureException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
160 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
161 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
162 } catch (InvalidKeyException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
163 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
164 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
165 } catch (UnsupportedEncodingException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
166 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
167 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
168 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
169 // must be ok then
47b53ae385d1 merging old code
casties
parents:
diff changeset
170 logger.debug("auth OK! user=" + userId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
171 return userId;
47b53ae385d1 merging old code
casties
parents:
diff changeset
172 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
173
47b53ae385d1 merging old code
casties
parents:
diff changeset
174 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
175 * creates Annotator-JSON from an Annotation object.
47b53ae385d1 merging old code
casties
parents:
diff changeset
176 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
177 * @param annot
47b53ae385d1 merging old code
casties
parents:
diff changeset
178 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
179 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
180 public JSONObject createAnnotatorJson(Annotation annot) {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
181 // return user as a JSON object (otherwise just as string)
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
182 boolean makeUserObject = true;
47b53ae385d1 merging old code
casties
parents:
diff changeset
183 JSONObject jo = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
184 try {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
185 jo.put("text", annot.getBodyText());
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
186 jo.put("uri", annot.getTargetBaseUri());
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
187
47b53ae385d1 merging old code
casties
parents:
diff changeset
188 if (makeUserObject) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
189 // create user object
47b53ae385d1 merging old code
casties
parents:
diff changeset
190 JSONObject userObject = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
191 // save creator as uri
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
192 userObject.put("uri", annot.getCreatorUri());
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
193 // make short user id
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
194 String userId = annot.getCreatorUri();
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
195 // remove namespace from user uri to get id
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
196 if (userId != null && userId.startsWith(NS.MPIWG_PERSONS_URL)) {
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
197 userId = userId.replace(NS.MPIWG_PERSONS_URL, "");
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
198 }
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
199 // set as id
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
200 userObject.put("id", userId);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
201 // get full name
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
202 String userName = annot.getCreatorName();
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
203 if (userName == null) {
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
204 RestServer restServer = (RestServer) getApplication();
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
205 userName = restServer.getFullNameFromLdap(userId);
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
206 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
207 userObject.put("name", userName);
47b53ae385d1 merging old code
casties
parents:
diff changeset
208 // save user object
47b53ae385d1 merging old code
casties
parents:
diff changeset
209 jo.put("user", userObject);
47b53ae385d1 merging old code
casties
parents:
diff changeset
210 } else {
47b53ae385d1 merging old code
casties
parents:
diff changeset
211 // save user as string
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
212 jo.put("user", annot.getCreatorUri());
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
213 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
214
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
215 if (annot.getTargetFragment() != null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
216 // we only look at the first xpointer
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
217 List<String> fragments = new ArrayList<String>();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
218 fragments.add(annot.getTargetFragment());
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
219 FragmentTypes xt = annot.getFragmentType();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
220 if (xt == FragmentTypes.XPOINTER) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
221 jo.put("ranges", transformToRanges(fragments));
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
222 } else if (xt == FragmentTypes.AREA) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
223 jo.put("areas", transformToAreas(fragments));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
224 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
225 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
226 // encode Annotation URL (=id) in base64
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
227 String annotUrl = annot.getUri();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
228 String annotId = encodeJsonId(annotUrl);
47b53ae385d1 merging old code
casties
parents:
diff changeset
229 jo.put("id", annotId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
230 return jo;
47b53ae385d1 merging old code
casties
parents:
diff changeset
231 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
232 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
233 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
234 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
235 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
236 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
237
47b53ae385d1 merging old code
casties
parents:
diff changeset
238 private JSONArray transformToRanges(List<String> xpointers) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
239
47b53ae385d1 merging old code
casties
parents:
diff changeset
240 JSONArray ja = new JSONArray();
47b53ae385d1 merging old code
casties
parents:
diff changeset
241
47b53ae385d1 merging old code
casties
parents:
diff changeset
242 Pattern rg = Pattern
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
243 .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
244 Pattern rg1 = Pattern.compile("xpointer\\(start-point\\(string-range\\(\"([^\"]*)\",([^,]*),1\\)\\)\\)");
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
245
47b53ae385d1 merging old code
casties
parents:
diff changeset
246 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
247 for (String xpointer : xpointers) {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
248 //String decoded = URLDecoder.decode(xpointer, "utf-8");
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
249 String decoded = xpointer;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
250 Matcher m = rg.matcher(decoded);
47b53ae385d1 merging old code
casties
parents:
diff changeset
251
47b53ae385d1 merging old code
casties
parents:
diff changeset
252 if (m.find()) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
253 {
47b53ae385d1 merging old code
casties
parents:
diff changeset
254 JSONObject jo = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
255 jo.put("start", m.group(1));
47b53ae385d1 merging old code
casties
parents:
diff changeset
256 jo.put("startOffset", m.group(2));
47b53ae385d1 merging old code
casties
parents:
diff changeset
257 jo.put("end", m.group(3));
47b53ae385d1 merging old code
casties
parents:
diff changeset
258 jo.put("endOffset", m.group(4));
47b53ae385d1 merging old code
casties
parents:
diff changeset
259 ja.put(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
260 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
261 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
262 m = rg1.matcher(xpointer);
47b53ae385d1 merging old code
casties
parents:
diff changeset
263 if (m.find()) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
264 JSONObject jo = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
265 jo.put("start", m.group(1));
47b53ae385d1 merging old code
casties
parents:
diff changeset
266 jo.put("startOffset", m.group(2));
47b53ae385d1 merging old code
casties
parents:
diff changeset
267
47b53ae385d1 merging old code
casties
parents:
diff changeset
268 ja.put(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
269 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
270 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
271 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
272 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
273 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
274 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
275 return ja;
47b53ae385d1 merging old code
casties
parents:
diff changeset
276 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
277
47b53ae385d1 merging old code
casties
parents:
diff changeset
278 private JSONArray transformToAreas(List<String> xpointers) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
279
47b53ae385d1 merging old code
casties
parents:
diff changeset
280 JSONArray ja = new JSONArray();
47b53ae385d1 merging old code
casties
parents:
diff changeset
281
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
282 Pattern rg = Pattern.compile("xywh=(\\w*:)([\\d\\.]+),([\\d\\.]+),([\\d\\.]+),([\\d\\.]+)");
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
283
47b53ae385d1 merging old code
casties
parents:
diff changeset
284 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
285 for (String xpointer : xpointers) {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
286 //String decoded = URLDecoder.decode(xpointer, "utf-8");
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
287 String decoded = xpointer;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
288 Matcher m = rg.matcher(decoded);
47b53ae385d1 merging old code
casties
parents:
diff changeset
289
47b53ae385d1 merging old code
casties
parents:
diff changeset
290 if (m.find()) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
291 {
47b53ae385d1 merging old code
casties
parents:
diff changeset
292 JSONObject jo = new JSONObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
293 String unit = m.group(1);
47b53ae385d1 merging old code
casties
parents:
diff changeset
294 jo.put("x", m.group(2));
47b53ae385d1 merging old code
casties
parents:
diff changeset
295 jo.put("y", m.group(3));
47b53ae385d1 merging old code
casties
parents:
diff changeset
296 jo.put("width", m.group(4));
47b53ae385d1 merging old code
casties
parents:
diff changeset
297 jo.put("height", m.group(5));
47b53ae385d1 merging old code
casties
parents:
diff changeset
298 ja.put(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
299 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
300 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
301 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
302 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
303 // TODO Auto-generated catch block
47b53ae385d1 merging old code
casties
parents:
diff changeset
304 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
305 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
306 return ja;
47b53ae385d1 merging old code
casties
parents:
diff changeset
307 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
308
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
309 protected String parseArea(JSONObject area) throws JSONException {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
310 String x = area.getString("x");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
311 String y = area.getString("y");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
312 String width = "0";
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
313 String height = "0";
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
314 if (area.has("width")) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
315 width = area.getString("width");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
316 height = area.getString("height");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
317 }
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
318 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
319 return fragment;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
320 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
321
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
322 protected String parseRange(JSONObject range) throws JSONException {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
323 String start = range.getString("start");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
324 String end = range.getString("end");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
325 String startOffset = range.getString("startOffset");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
326 String endOffset = range.getString("endOffset");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
327
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
328 String fragment = String.format(
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
329 "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
330 startOffset, end, endOffset);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
331 return fragment;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
332 }
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
333
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
334 /**
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
335 * Creates an Annotation object with data from JSON.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
336 *
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
337 * uses the specification from the annotator project: {@link https
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
338 * ://github.com/okfn/annotator/wiki/Annotation-format}
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
339 *
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
340 * 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
341 * if not it will set to the MPIWG namespace defined in
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
342 * de.mpiwg.itgroup.annotationManager.Constants.NS
47b53ae385d1 merging old code
casties
parents:
diff changeset
343 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
344 * @param jo
47b53ae385d1 merging old code
casties
parents:
diff changeset
345 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
346 * @throws JSONException
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
347 * @throws UnsupportedEncodingException
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
348 */
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
349 public Annotation createAnnotation(JSONObject jo, Representation entity) throws JSONException, UnsupportedEncodingException {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
350 return updateAnnotation(new Annotation(), jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
351 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
352
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
353 /**
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
354 * Updates an Annotation object with data from JSON.
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
355 *
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
356 * uses the specification from the annotator project: {@link https
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
357 * ://github.com/okfn/annotator/wiki/Annotation-format}
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
358 *
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
359 * 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
360 * if not it will set to the MPIWG namespace defined in
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
361 * de.mpiwg.itgroup.annotationManager.Constants.NS
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
362 *
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
363 * @param annot
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
364 * @param jo
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
365 * @return
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
366 * @throws JSONException
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
367 * @throws UnsupportedEncodingException
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
368 */
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
369 public Annotation updateAnnotation(Annotation annot, JSONObject jo, Representation entity) throws JSONException,
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
370 UnsupportedEncodingException {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
371 // target uri
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
372 if (jo.has("uri")) {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
373 annot.setTargetBaseUri(jo.getString("uri"));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
374 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
375 // annotation text
47b53ae385d1 merging old code
casties
parents:
diff changeset
376 if (jo.has("text")) {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
377 annot.setBodyText(jo.getString("text"));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
378 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
379 // check authentication
47b53ae385d1 merging old code
casties
parents:
diff changeset
380 String authUser = checkAuthToken(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
381 if (authUser == null) {
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
382 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
383 * // try http auth User httpUser = getHttpAuthUser(entity); if
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
384 * (httpUser == null) {
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
385 */
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
386 setStatus(Status.CLIENT_ERROR_FORBIDDEN);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
387 return null;
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
388 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
389 * } authUser = httpUser.getIdentifier();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
390 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
391 }
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
392 // get or create creator object
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
393 Actor creator = annot.getCreator();
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
394 if (creator == null) {
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
395 creator = new Actor(false, null, null);
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
396 annot.setCreator(creator);
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
397 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
398 // username not required, if no username given authuser will be used
47b53ae385d1 merging old code
casties
parents:
diff changeset
399 String username = null;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
400 String userUri = annot.getCreatorUri();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
401 if (jo.has("user")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
402 if (jo.get("user") instanceof String) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
403 // user is just a String
47b53ae385d1 merging old code
casties
parents:
diff changeset
404 username = jo.getString("user");
47b53ae385d1 merging old code
casties
parents:
diff changeset
405 // TODO: what if username and authUser are different?
47b53ae385d1 merging old code
casties
parents:
diff changeset
406 } else {
47b53ae385d1 merging old code
casties
parents:
diff changeset
407 // user is an object
47b53ae385d1 merging old code
casties
parents:
diff changeset
408 JSONObject user = jo.getJSONObject("user");
47b53ae385d1 merging old code
casties
parents:
diff changeset
409 if (user.has("id")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
410 username = user.getString("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
411 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
412 if (user.has("uri")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
413 userUri = user.getString("uri");
47b53ae385d1 merging old code
casties
parents:
diff changeset
414 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
415 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
416 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
417 if (username == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
418 username = authUser;
47b53ae385d1 merging old code
casties
parents:
diff changeset
419 }
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
420 // try to get full name
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
421 if (creator.getName() == null && username != null) {
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
422 RestServer restServer = (RestServer) getApplication();
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
423 String fullName = restServer.getFullNameFromLdap(username);
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
424 creator.setName(fullName);
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
425 }
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
426 // userUri should be a URI, if not it will set to the MPIWG namespace
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
427 if (userUri == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
428 if (username.startsWith("http")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
429 userUri = username;
47b53ae385d1 merging old code
casties
parents:
diff changeset
430 } else {
47b53ae385d1 merging old code
casties
parents:
diff changeset
431 userUri = NS.MPIWG_PERSONS_URL + username;
47b53ae385d1 merging old code
casties
parents:
diff changeset
432 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
433 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
434 // TODO: should we overwrite the creator?
9
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
435 if (creator.getUri() == null) {
b2bfc3bc9ba8 new internal actor class for creator.
casties
parents: 5
diff changeset
436 creator.setUri(userUri);
5
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
437 }
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
438
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
439 if (annot.getCreated() == null) {
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
440 // set creation date
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
441 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
442 String ct = format.format(Calendar.getInstance().getTime());
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
443 annot.setCreated(ct);
bbf0cc5bee29 version 0.2 really works now
casties
parents: 4
diff changeset
444 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
445
47b53ae385d1 merging old code
casties
parents:
diff changeset
446 // create xpointer from the first range/area
47b53ae385d1 merging old code
casties
parents:
diff changeset
447 if (jo.has("ranges")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
448 JSONObject ranges = jo.getJSONArray("ranges").getJSONObject(0);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
449 annot.setFragmentType(FragmentTypes.XPOINTER);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
450 String fragment = parseRange(ranges);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
451 annot.setTargetFragment(fragment);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
452 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
453 if (jo.has("areas")) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
454 JSONObject area = jo.getJSONArray("areas").getJSONObject(0);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
455 annot.setFragmentType(FragmentTypes.AREA);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
456 String fragment = parseArea(area);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
457 annot.setTargetFragment(fragment);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
458 }
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
459 return annot;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
460 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
461
47b53ae385d1 merging old code
casties
parents:
diff changeset
462 }