Mercurial > hg > AnnotationManagerN4J

changeset 52:a52c597075dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more resilience to ranges and areas in JSON
author casties
date Tue, 06 Nov 2012 17:55:36 +0100
parents d99b915c6ed0
children fc4c23247bb5
files src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java
diffstat 2 files changed, 19 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Thu Sep 27 17:37:05 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Tue Nov 06 17:55:36 2012 +0100
@@ -536,17 +536,25 @@
         /*
          * create xpointer from the first range/area
          */
-        if (jo.has("ranges")) {
-            JSONObject ranges = jo.getJSONArray("ranges").getJSONObject(0);
-            annot.setFragmentType(FragmentTypes.XPOINTER);
-            String fragment = parseRange(ranges);
-            annot.setTargetFragment(fragment);
+        try {
+            if (jo.has("ranges")) {
+                JSONObject ranges = jo.getJSONArray("ranges").getJSONObject(0);
+                annot.setFragmentType(FragmentTypes.XPOINTER);
+                String fragment = parseRange(ranges);
+                annot.setTargetFragment(fragment);
+            }
+        } catch (JSONException e) {
+            // nothing to do
         }
-        if (jo.has("areas")) {
-            JSONObject area = jo.getJSONArray("areas").getJSONObject(0);
-            annot.setFragmentType(FragmentTypes.AREA);
-            String fragment = parseArea(area);
-            annot.setTargetFragment(fragment);
+        try {
+            if (jo.has("areas")) {
+                JSONObject area = jo.getJSONArray("areas").getJSONObject(0);
+                annot.setFragmentType(FragmentTypes.AREA);
+                String fragment = parseArea(area);
+                annot.setTargetFragment(fragment);
+            }
+        } catch (JSONException e) {
+            // nothing to do
         }
 
         /*
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java	Thu Sep 27 17:37:05 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java	Tue Nov 06 17:55:36 2012 +0100
@@ -14,7 +14,7 @@
  */
 public class AnnotatorRestlet extends BaseRestlet {
 
-    public final String version = "AnnotationManagerN4J/Annotator 0.2.1";
+    public final String version = "AnnotationManagerN4J/Annotator 0.2.2";
 
     public static Logger logger = Logger.getLogger(AnnotatorRestlet.class);