Changeset 6269

Timestamp:

06/04/15 08:13:11 (9 years ago)

Author:

Twan Goosen

Message:

merged fixes of #625 from trunk

Location:

vlo/branches/vlo-3.2

Files:

• . (modified) (1 prop)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SmartLinkFieldValueLabel.java (modified) (3 diffs)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) (1 diff)
• vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (3 diffs)

vlo/branches/vlo-3.2/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);
+        }
+
+    }
+
 }

vlo/branches/vlo-3.2/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java

@@ -71 +71 @@
                     FacetConstants.FIELD_DESCRIPTION,
                     FacetConstants.FIELD_LANDINGPAGE,
-                    FacetConstants.FIELD_COMPLETE_METADATA
+                    FacetConstants.FIELD_COMPLETE_METADATA,
+                    FacetConstants.FIELD_SELF_LINK
             );
 

vlo/branches/vlo-3.2/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java

@@ -24 +24 @@
 import eu.clarin.cmdi.vlo.wicket.ResourceTypeCssBehaviour;
 import eu.clarin.cmdi.vlo.wicket.components.RecordPageLink;
+import eu.clarin.cmdi.vlo.wicket.components.SmartLinkFieldValueLabel;
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
 import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
@@ -45 +46 @@
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
@@ -71 +73 @@
         // add untruncated description
         final NullFallbackModel descriptionModel = new NullFallbackModel(new SolrFieldStringModel(documentModel, FacetConstants.FIELD_DESCRIPTION), "");
-        add(new SmartLinkLabel("description", descriptionModel));
+        add(new SmartLinkFieldValueLabel("description", descriptionModel, Model.of(FacetConstants.FIELD_DESCRIPTION)));
         
         // add link to record