Changeset 5535

Timestamp:

08/07/14 14:16:17 (10 years ago)

Author:

Twan Goosen

Message:

Made HandleLinkModel? work for handles as well as DOIs (+made a test)
Refs #613

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src

Files:

• main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/HandleLinkModel.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/gui (added)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/gui/HandleLinkModelTest.java (added)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard (added)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/HandleLinkModel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.wicket.model.IModel;
 
@@ -28 +30 @@
 
     private final IModel<String> linkModel;
-    public static final String HANDLE_PREFIX = "hdl:";
+    public static final Pattern HANDLE_PATTERN = Pattern.compile("^(hdl|doi):(.*)$", Pattern.CASE_INSENSITIVE);
     public static final String HANDLE_PROXY = "http://hdl.handle.net/";
     public static final String URN_NBN_PREFIX = "urn:nbn";
     public static final String URN_NBN_RESOLVER_URL = "http://www.nbn-resolving.org/redirect/";
+    private static final int HANDLE_ID_GROUP = 2;
 
     public HandleLinkModel(IModel<String> linkModel) {
@@ -41 +44 @@
         final String link = linkModel.getObject();
         if (link != null) {
-            if (link.toLowerCase().startsWith(HANDLE_PREFIX)) {
-                return HANDLE_PROXY + link.substring(HANDLE_PREFIX.length());
+            final Matcher handleMatcher = HANDLE_PATTERN.matcher(link);
+            if (handleMatcher.matches()) {
+                return HANDLE_PROXY + handleMatcher.group(HANDLE_ID_GROUP);
             }
             if (link.toLowerCase().startsWith(URN_NBN_PREFIX)) {