Changeset 3362

Timestamp:

08/12/13 12:34:36 (11 years ago)

Author:

teckart

Message:

Fixed broken Handle resolution. New implementation is omiting requests to resource server (fixing ticket #290). Enables tests again that were disabled in commit r2949(fixing ticket #319)

Location:

vlo/trunk/vlo_web_app/src

Files:

• main/java/eu/clarin/cmdi/vlo/pages/LinkPanel.java (modified) (1 diff)
• test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java (modified) (1 diff)

vlo/trunk/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/LinkPanel.java

@@ -95 +95 @@
                 try{
                     u = new URL(resourceLink);
-                    System.out.println(resourceLink);
                     URLConnection c = u.openConnection();
                     if(c instanceof HttpURLConnection){
                         con = (HttpURLConnection) c;
+                        con.setInstanceFollowRedirects(false);
                     }
                     if(con != null){
                         if(con.getResponseCode() == HttpURLConnection.HTTP_MOVED_PERM ||
                                 con.getResponseCode() == HttpURLConnection.HTTP_MOVED_TEMP ||
-                                con.getResponseCode() == HttpURLConnection.HTTP_SEE_OTHER){
-                           result = con.getURL().toString();
-/*                            for (Map.Entry<String, List<String>> header : con.getHeaderFields().entrySet()) {
-                                if(header != null && header.getKey() != null){
-                                    System.out.println("XXX:" + header.getKey());
-                                    System.out.println(header.getValue().get(0));
-                                    if(header.getKey().equals("Location")){
-                                        result = header.getValue().get(0);
-                                    }
-                                }
-                            }*/
+                                con.getResponseCode() == HttpURLConnection.HTTP_SEE_OTHER) {
+                                String location = con.getHeaderField("location");
+                                        if(location != null)
+                                                result = location;
                         }
                     }

vlo/trunk/vlo_web_app/src/test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java

@@ -36 +36 @@
 
         uit = totest.getNameFromLink(_RESOLVE_STRING);
-        // from at least 29.05.2013 this was not working
-        // Assert.assertTrue("Returns the resolved url of the handle pid", uit.equals(_RESOLVE_OUT));
+        Assert.assertTrue("Returns the resolved url of the handle pid", uit.equals(_RESOLVE_OUT));
     }
 }