Changeset 5489

Timestamp:

07/28/14 08:35:05 (10 years ago)

Author:

Twan Goosen

Message:

Added recognition and rewriting of handle links in the reference link panel
Fixes #599

Location:

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

Files:

• HandleLinkModel.java (copied) (copied from vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/HandleLinkModel.java) (2 diffs)
• pages/ReferenceLinkPanel.java (modified) (2 diffs)

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

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.wicket.model;
+package eu.clarin.cmdi.virtualcollectionregistry.gui;
 
-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;
 
@@ -32 +28 @@
 
     private final IModel<String> linkModel;
+    public static final String HANDLE_PREFIX = "hdl:";
+    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/";
 
     public HandleLinkModel(IModel<String> linkModel) {

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages;
 
+import eu.clarin.cmdi.virtualcollectionregistry.gui.HandleLinkModel;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
 import org.apache.wicket.markup.html.basic.Label;
@@ -16 +17 @@
     public ReferenceLinkPanel(String id, IModel<Resource> model) {
         super(id, model);
-        final ExternalLink link = new ExternalLink("reference", new PropertyModel(model, "ref"));
+        
+        // Rerence model shared by link and label
+        final PropertyModel refModel = new PropertyModel(model, "ref");
+        
+        // Wrapper for link model that detects handles
+        final HandleLinkModel linkModel = new HandleLinkModel(refModel);
+        final ExternalLink link = new ExternalLink("reference", linkModel);
+        
+        // Set label on link
         // TODO: get label from 'label' property if available
-        link.add(new Label("referenceLabel", new PropertyModel(model, "ref")));
+        link.add(new Label("referenceLabel", refModel));
+        
         add(link);
     }