Changeset 5578 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java

Timestamp:

08/20/14 11:59:28 (10 years ago)

Author:

Twan Goosen

Message:

Also accepting PID resolver URL's for publication without warning. Added help text explaining PID's.

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java

@@ -34 +34 @@
 public class ReferenceValidator extends AbstractValidator<String> {
 
-    private static final Pattern HANDLE_PATTERN = Pattern.compile("^(hdl|doi):[0-9\\.]+\\/.+$");
+    private static final String HANDLE_SPECIFIC_PART_PATTERN = "[0-9\\.]+\\/.+$";
+    private static final Pattern HANDLE_PATTERN = Pattern.compile("^(hdl|doi):" + HANDLE_SPECIFIC_PART_PATTERN);
+    private static final Pattern HANDLE_RESOLVER_PATTERN = Pattern.compile("^http://(hdl\\.handle\\.net|dx\\.doi\\.org|)/" + HANDLE_SPECIFIC_PART_PATTERN);
     private final IValidator<String> urlValidator = new UrlValidator(UrlValidator.NO_FRAGMENTS);
 
@@ -54 +56 @@
         return validatable.isValid();
     }
-    
+
+    /**
+     *
+     * @param uri
+     * @return true IFF the expression is a URI consisting of a valid handle
+     * pattern preceded by a handle scheme expression (hdl: or doi:) OR one of
+     * the accepted handle resolver base URL's (http://hdl.handle.net or
+     * http://dx.doi.org)
+     */
     public static boolean isPid(CharSequence uri) {
-        return HANDLE_PATTERN.matcher(uri).matches();
+        return HANDLE_PATTERN.matcher(uri).matches()
+                || HANDLE_RESOLVER_PATTERN.matcher(uri).matches();
     }