Changeset 11646

Timestamp:

2006-04-12T09:26:58+12:00 (18 years ago)

Author:

shaoqun

Message:

if there is no screenview, clicking an collage image, the user will see the original image rather than the collage classifer pages

File:

• trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/GsdlCollageApplet.java (modified) (2 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/GsdlCollageApplet.java

@@ -251 +251 @@
         try {
         // displays the associated url in a new window
-        URL from_url = new URL(cimage.from_url_  + "#" + cimage.name_);
+                URL from_url = null;        
+        
+        java.util.regex.Pattern p = java.util.regex.Pattern.compile("cl=CL\\d(\\.\\d)*\\s");
+        java.util.regex.Matcher m = p.matcher(cimage.from_url_.trim()+" ");
+
+                if (m.find() ){
+            
+            from_url = cimage.url_;
+        }
+        else{
+           from_url =  new URL(cimage.from_url_  + "#" + cimage.name_);
+        }
         getAppletContext().showDocument(from_url,"gsdlDoc");
         } 
-        catch (MalformedURLException e) {
+        catch (MalformedURLException e) { 
         e.printStackTrace();
         }
@@ -282 +293 @@
         
             } catch (Exception e) {
-            e.printStackTrace();
+            
             }
         }