Changeset 6136

Timestamp:

04/09/15 13:29:03 (9 years ago)

Author:

Twan Goosen

Message:

Customised link parser for field values
Fixes #625

File:

• vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabel.java (modified) (3 diffs)

vlo/branches/vlo-3.2-ticket575/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabel.java

@@ -19 +19 @@
 import org.apache.wicket.extensions.markup.html.basic.DefaultLinkParser;
 import org.apache.wicket.extensions.markup.html.basic.ILinkParser;
+import org.apache.wicket.extensions.markup.html.basic.LinkParser;
 import org.apache.wicket.extensions.markup.html.basic.SmartLinkLabel;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.model.IModel;
+
+import static org.apache.wicket.extensions.markup.html.basic.DefaultLinkParser.URL_RENDER_STRATEGY;
 
 /**
@@ -56 +59 @@
      */
     protected ILinkParser getLinkParser() {
-        return new DefaultLinkParser();
+        return new VloLinkParser();
     }
 
@@ -69 +72 @@
     }
 
+    /**
+     * Adapted version of {@link DefaultLinkParser} that does not parse e-mail
+     * addresses (to prevent false classifications of handle URIs containing an
+     * {@code @})
+     */
+    private static class VloLinkParser extends LinkParser {
+
+        /**
+         * URL pattern adapted from {@link DefaultLinkParser}; added the @ in
+         * the second part of the URI for cases like
+         * {@code hdl.handle.net/abc-123@format=cmdi}.
+         */
+        private static final String urlPattern = "([a-zA-Z]+://[\\w\\.\\-\\:\\/~]+)[\\w\\.:\\-/?&=%@]*";
+
+        public VloLinkParser() {
+            addLinkRenderStrategy(urlPattern, URL_RENDER_STRATEGY);
+        }
+
+    }
+
 }