Changeset 2059

Timestamp:

08/01/12 08:40:12 (12 years ago)

Author:

herste

Message:

also added a test for ticket 136

Location:

vlo/trunk/vlo_webapp/src

Files:

• main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanelTest.java (added)

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

@@ -87 +87 @@
     }
 
-    private String getNameFromLink(String resourceLink) {
+    protected String getNameFromLink(String resourceLink) {
         String result = resourceLink;
         // We ALWAYS backoff to the resourceLink as default thingy.
@@ -131 +131 @@
                 try{
                     u = new URL(resourceLink);
+                    System.out.println(resourceLink);
                     URLConnection c = u.openConnection();
                     if(c instanceof HttpURLConnection){
@@ -139 +140 @@
                                 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);
+                           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);
+                                    }
                                 }
-                            }
+                            }*/
                         }
                     }