Changeset 11694

Timestamp:

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

Author:

shaoqun

Message:

add code to check whether document_root is null

File:

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

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

@@ -366 +366 @@
         // get the image from the url
         if (verbosity_>=2) {
-        //System.err.println("  ****Downloading image URL: " + url.toString());
-        }
-
-            //System.out.println("add image**"+url.toString());
-        //System.out.println("***** URL Path**"+from_url);
-        //System.out.println("*** imagename**"+img_name);
-
+        System.err.println("  Downloading image URL: " + url.toString());
+        }
+            
            if (image_visited(url.toString(),img_name)) return;
 
@@ -401 +397 @@
     public void rec_add_images(String new_url, int depth)
     {
-
+   
     if (already_visited(new_url)) return;
 
@@ -424 +420 @@
         // get all the <code><img src=</code> links into a vector
         Vector src_links = curl.getSrcLinks();
-        
+
+                
         if (verbosity_ >= 2) {
         System.err.println("  Got src links... there are " + src_links.size() + " of them.");
@@ -487 +484 @@
         for (int i = 0; i < href_links.size(); i++) 
         {
+           
             URL url = (URL)href_links.get(i);
             String url_string  = url.toString();
@@ -517 +515 @@
                 if (filter_href(url_string,new_url,depth))
                 {
+        
                     rec_add_images(url_string,depth+1);
                     
@@ -539 +538 @@
     public void externalLinks() {
     external_links_ = null;
-
     try {
 
-        if (starting_url_.indexOf(document_root_) >= 0 ){ 
+        if (starting_url_ == null || (document_root_ != null && starting_url_.indexOf(document_root_) >= 0) ){ 
         return;
         }
@@ -556 +554 @@
         // split the line of the space, first part is the image, second part the link
         while (l != null) {
-
+    
         String tmp1 = new String();
         String tmp2 = new String();
@@ -569 +567 @@
             
             if (tmp2 != null) {
+            
             external_links_.put(tmp1, tmp2);
             //System.err.println(tmp1 + " " + tmp2);