Changeset 1050

Timestamp:

01/10/11 15:10:02 (13 years ago)

Author:

patdui

Message:

• showing proper origin link for LRT resources and removed the origin link for olac resources. See ​http://trac.clarin.eu/ticket/46

Location:

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo

Files:

• FacetConstants.java (modified) (1 diff)
• Resources.java (modified) (1 diff)
• pages/ResourceLinkPanel.java (modified) (5 diffs)
• pages/ShowResultPage.html (modified) (1 diff)
• pages/ShowResultPage.java (modified) (4 diffs)

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java

@@ -20 +20 @@
     public static final String RESOURCE_TYPE_IMAGE = "image";
     public static final String RESOURCE_TYPE_ANNOTATION = "annotation";
+    
+    public static final String HANDLE_PREFIX = "hdl";
+    public static final String TEST_HANDLE_PREFIX = "test-hdl";
 
 }

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/Resources.java

@@ -12 +12 @@
     public final static String NO_RESOURCE_FOUND = "noResourceFound";
     public static final String VALUE = "value";
-    public static final String RESULTS = "results";    
+    public static final String RESULTS = "results";
+    public static final String OPEN_IN_ORIGINAL_CONTEXT = "openInOriginalContext";    
     
 

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
@@ -11 +9 @@
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.resource.ContextRelativeResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import eu.clarin.cmdi.vlo.CommonUtils;
@@ -19 +15 @@
 
 public class ResourceLinkPanel extends Panel {
-    private final static Logger LOG = LoggerFactory.getLogger(ResourceLinkPanel.class);
 
     private static final long serialVersionUID = 1L;
@@ -29 +24 @@
     private final static ImageResource TEXT = new ImageResource(new ContextRelativeResource("Images/text-x-generic.png"), "Text file");
     private final static ImageResource VIDEO = new ImageResource(new ContextRelativeResource("Images/video-x-generic.png"), "Video file");
-    private static final String HANDLE_PREFIX = "hdl";
 
     private final static Map<String, ImageResource> ICON_MAP = new HashMap<String, ImageResource>();
@@ -54 +48 @@
     private String getHref(String resourceLink) {
         String result = resourceLink;
-        try {
-            URL url = new URL(resourceLink);
-            String protocol = url.getProtocol();
-            if (HANDLE_PREFIX.equalsIgnoreCase(protocol)) {
+        if (resourceLink != null) {
+            if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
                 result = Configuration.getInstance().getHandleServerUrl() + resourceLink;
             }
-        } catch (MalformedURLException e) {
-            LOG.debug("URL error", e);
-            //ignore exception, just show the original link, perhaps the user can do something with, we cannot do anything else.
         }
         return result;

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.html

@@ -5 +5 @@
 <wicket:extend>
         <div class="endgame"><br>
-        <div><a wicket:id="backLink" href="#"><wicket:message key="backToResult">[back]</wicket:message></a>&nbsp;|&nbsp;<a wicket:id="openBrowserLink"
-                href="#"><wicket:message key="openInOriginalContext" >[open]</wicket:message></a>
+        <div><a wicket:id="backLink" href="#"><wicket:message key="backToResult">[back]</wicket:message></a>&nbsp;|&nbsp;
+        <a wicket:id="openBrowserLink"></a>
         <p />
         </div>

vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collection;
 
@@ -24 +26 @@
 import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.protocol.http.WicketURLEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import eu.clarin.cmdi.vlo.Configuration;
@@ -33 +37 @@
 public class ShowResultPage extends BasePage {
 
+    private final static Logger LOG = LoggerFactory.getLogger(ShowResultPage.class);
+
     public static final String PARAM_DOC_ID = "docId";
 
@@ -41 +47 @@
         BookmarkablePageLink backLink = new BookmarkablePageLink("backLink", FacetedSearchPage.class, query.getPageParameters());
         add(backLink);
-        String handle = docId.substring("test-".length());
-        add(new ExternalLink("openBrowserLink", Configuration.getInstance().getIMDIBrowserUrl(handle)));
+        String href = getHref(docId);
+        if (href != null) {
+            add(new ExternalLink("openBrowserLink", href, new ResourceModel(Resources.OPEN_IN_ORIGINAL_CONTEXT).getObject()));
+        } else {
+            add(new Label("openBrowserLink", ""));
+        }
         addPrevNextLabels(docId, query);
         SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId);
         addAttributesTable(solrDocument);
         addResourceLinks(solrDocument);
+    }
+
+    private String getHref(String linkToOriginalContext) {
+        String result = linkToOriginalContext;
+        if (linkToOriginalContext != null) {
+            if (linkToOriginalContext.startsWith(FacetConstants.TEST_HANDLE_PREFIX)) {
+                linkToOriginalContext = linkToOriginalContext.replace(FacetConstants.TEST_HANDLE_PREFIX, FacetConstants.HANDLE_PREFIX);
+            }
+            if (linkToOriginalContext.startsWith(FacetConstants.HANDLE_PREFIX)) {
+                result = Configuration.getInstance().getIMDIBrowserUrl(linkToOriginalContext);
+            } else {
+                try {
+                    new URL(linkToOriginalContext);
+                } catch (MalformedURLException e) {
+                    LOG.debug("Link to original context is incorrect:", e);
+                    result = null;
+                }
+            }
+        }
+        return result;
     }