Changeset 2057

Timestamp:

07/31/12 14:27:41 (12 years ago)

Author:

herste

Message:

trying to solve ticket 136; also fixed a test (the references component in the componentregistry was changed causing (undeserved) test failure)

Location:

vlo/trunk/vlo_webapp/src

Files:

• main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java (modified) (8 diffs)
• test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java (modified) (1 diff)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
@@ -8 +14 @@
 import net.handle.hdllib.HandleValue;
 
+import org.apache.commons.httpclient.HttpMethod;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
@@ -21 +28 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 
+import javax.net.ssl.HttpsURLConnection;
+
 public class ResourceLinkPanel extends Panel {
 
@@ -26 +35 @@
 
     private static final long serialVersionUID = 1L;
-    
+
     private final static String URN_NBN_RESOLVER_URL = "http://www.nbn-resolving.org/redirect/";
 
@@ -61 +70 @@
 
     /**
-     * Modifies resourceLink if necessary (adds support for different URN resolvers) 
+     * Modifies resourceLink if necessary (adds support for different URN resolvers)
      * @param resourceLink
      * @return Modified resourceLink, if no modifications are necessary original parameter resourceLink is returned
@@ -80 +89 @@
     private String getNameFromLink(String resourceLink) {
         String result = resourceLink;
-     // HandleResolver does not work at the moment on the clarin server see http://trac.clarin.eu/ticket/136, Disabled it for the release.        
+        // We ALWAYS backoff to the resourceLink as default thingy.
+
+
+
+     // HandleResolver does not work at the moment on the clarin server see http://trac.clarin.eu/ticket/136, Disabled it for the release.
 //      if (resourceLink != null) {
 //          if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
@@ -88 +101 @@
 //                  handleResolver.setTcpTimeout(5000);//5 secs, default is one minute
 //                  HandleValue values[] = handleResolver.resolveHandle(handle, new String[] { "URL" }, null);
-//                  
+//
 //                  for (HandleValue handleValue : values) {
 //                      String url = handleValue.getDataAsString();
@@ -106 +119 @@
 //      }
 
+        /** NOTE: We are trying a different approach from the "official" one.
+         * Will use the REST interface of hdl.handle.net.
+         */
+        if (resourceLink != null) {
+            if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
+                String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length());
+                resourceLink = Configuration.getInstance().getHandleServerUrl() + handle;
+                // Now points to something like http://hdl.handle.net/1839/00-0000-0000-0004-3357-F
+                HttpURLConnection con = null;
+                URL u;
+                try{
+                    u = new URL(resourceLink);
+                    URLConnection c = u.openConnection();
+                    if(c instanceof HttpURLConnection){
+                        con = (HttpURLConnection) c;
+                    }
+                    if(con != null){
+                        if(con.getResponseCode() == HttpURLConnection.HTTP_MOVED_PERM ||
+                                con.getResponseCode() == HttpURLConnection.HTTP_MOVED_TEMP ||
+                                con.getResponseCode() == HttpURLConnection.HTTP_SEE_OTHER){
+                            for (Map.Entry<String, List<String>> header : con.getHeaderFields().entrySet()) {
+                                if(header.getKey().equals("Location")){
+                                    result = header.getValue().get(0);
+                                }
+                            }
+                        }
+                    }
+                } catch (MalformedURLException e) {
+                    LOG.warn("Error trying to get the name of the handle", e);
+                } catch (IOException e) {
+                    LOG.warn("Error trying to get the name of the handle", e);
+                }
+            }
+        }
         return result;
     }

vlo/trunk/vlo_webapp/src/test/java/eu/clarin/cmdi/vlo/importer/FacetMappingFactoryTest.java

@@ -43 +43 @@
         mapping = facets.get(index++);
         assertEquals(FacetConstants.FIELD_YEAR, mapping.getName());
-        assertEquals(1, mapping.getPatterns().size());
+        assertEquals(2, mapping.getPatterns().size());
         assertEquals("/c:CMD/c:Components/c:Session/c:Date/text()", mapping.getPatterns().get(0));
         mapping = facets.get(index++);