Changeset 5025

Timestamp:

04/23/14 09:18:13 (10 years ago)

Author:

Twan Goosen

Message:

urn:nbn links get prepended with resolver URL

Location:

vlo/branches/vlo-3.0

Files:

• vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModel.java (modified) (3 diffs)
• vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModelTest.java (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

@@ -60 +60 @@
     public static final String FIELD_RESOURCE_SPLIT_CHAR = "|";
     public static final String URN_NBN_PREFIX = "urn:nbn";
+    public static final String URN_NBN_RESOLVER_URL = "http://www.nbn-resolving.org/redirect/";
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModel.java

@@ -19 +19 @@
 import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PREFIX;
 import static eu.clarin.cmdi.vlo.FacetConstants.HANDLE_PROXY;
+import static eu.clarin.cmdi.vlo.FacetConstants.URN_NBN_PREFIX;
+import static eu.clarin.cmdi.vlo.FacetConstants.URN_NBN_RESOLVER_URL;
 import org.apache.wicket.model.IModel;
 
@@ -38 +40 @@
     public String getObject() {
         final String link = linkModel.getObject();
-        if (link != null && link.toLowerCase().startsWith(HANDLE_PREFIX)) {
-            return HANDLE_PROXY + link.substring(HANDLE_PREFIX.length());
+        if (link != null) {
+            if (link.toLowerCase().startsWith(HANDLE_PREFIX)) {
+                return HANDLE_PROXY + link.substring(HANDLE_PREFIX.length());
+            }
+            if (link.toLowerCase().startsWith(URN_NBN_PREFIX)) {
+                return URN_NBN_RESOLVER_URL + link;
+            }
         }
         return link;
@@ -53 +60 @@
         linkModel.detach();
     }
-
 }

vlo/branches/vlo-3.0/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModelTest.java

@@ -82 +82 @@
 
     @Test
+    public void testGetObjectWithUrnNbn() {
+        final IModel<String> inner = context.mock(IModel.class, "String");
+        final HandleLinkModel instance = new HandleLinkModel(inner);
+        // model holds a handle
+        context.checking(new Expectations() {
+            {
+                oneOf(inner).getObject();
+                will(returnValue("urn:nbn:de:kobv:b4-200905193201"));
+            }
+        });
+
+        final String result = instance.getObject();
+        // handle proxy should be prepended
+        assertEquals("http://www.nbn-resolving.org/redirect/urn:nbn:de:kobv:b4-200905193201", result);
+    }
+
+    @Test
     public void testGetObjectWithNull() {
         final IModel<String> inner = context.mock(IModel.class, "String");