Changeset 11645

Timestamp:

2006-04-12T09:22:10+12:00 (18 years ago)

Author:

shaoqun

Message:

add a method to check wether an image and its screenview (if any) has been visited before downloading it

File:

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

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

@@ -65 +65 @@
     int verbosity_ = 0;
 
-    protected boolean busy_ = false;
-    
+     /** Records all images which have already been examined */
+    Hashtable visited_images_  = null;
+        
     MediaTracker tracker;
 
@@ -99 +100 @@
     System.err.println("starting_url_ "  + starting_url +"\n"+
                        "href_musthave_ " +  href_musthave +"\n"+
-               "image_mustnothave_" + image_mustnothave+"\n"+
+               "image_mustnothave_ " + image_mustnothave+"\n"+
                "image_ignore_ "+  image_ignore+"\n"+
                "image_type_ "+ image_type+"\n"+
@@ -110 +111 @@
     }
 
-      public boolean getStatus(){
-    return busy_;
-
-    } 
-
+  
     /** Determines whether or not a url has already been examined
      *
@@ -128 +125 @@
      }
 
-    // if the url has been visited before, return true
+        // if the url has been visited before, return true
     if (visited_url_.containsKey(url_string))
     {
@@ -142 +139 @@
     return false;
     }
+
+  /** Determines whether or not an images or its screenview has been visited)
+     *  has already been examined
+     *
+     *  @param url_string the url to check
+     *  @param img_name the image to check
+     *  @return true if the url has been visited, false if not */
+    public boolean image_visited(String url_string, String img_name)
+    {
+    String hash_dir = url_string.substring(0,url_string.lastIndexOf("/"));  
+    
+    if ( visited_images_.containsKey(hash_dir)){
+        Hashtable hashed_images = (Hashtable)visited_images_.get(hash_dir);   
+       
+            if (img_name.startsWith("screenview")){
+        return true;
+        }
+
+        if (hashed_images.containsKey(img_name)){
+        return true;
+        }
+         
+            Enumeration enu = hashed_images.keys();
+            for(;enu.hasMoreElements();){
+        String name = (String)enu.nextElement();
+        if(name.startsWith("screenview")){
+            return true;
+        }
+        }
+    
+            hashed_images.put(img_name,"visited");           
+    }
+    else{
+        Hashtable hashed_images = new Hashtable();
+        hashed_images.put(img_name,"visited");
+        visited_images_.put(hash_dir,hashed_images);        
+    }
+         
+    return false;
+    }
+
+   
+
+
 
     /** Restricts the type of images that can be included in the collage
@@ -328 +369 @@
         }
 
+            //System.out.println("add image**"+url.toString());
+        //System.out.println("***** URL Path**"+from_url);
+        //System.out.println("*** imagename**"+img_name);
+
+           if (image_visited(url.toString(),img_name)) return;
+
        int size = download_images_.downloadImage(tracker,url, from_url, img_name);
           
@@ -386 +433 @@
         URL url = (URL)src_links.get(i);
         String url_string  = url.toString();
-                
+            
         //System.err.println(" source links " + i + " ["  + url_string +"]");
 
@@ -442 +489 @@
             URL url = (URL)href_links.get(i);
             String url_string  = url.toString();
-
-            //System.err.println(" href links " + i + "["  + url_string +"]");
-                    
+            //System.err.println(" href links " + i + "["  + url_string +"]");      
 
             if (image_file_extension(url_string))
             {
-                                      
+                                  
                 if (filter_image(url_string))
 
                 {
+                                        
                     img_name = url_string.substring(url_string.lastIndexOf("/") + 1, url_string.length());
 
@@ -543 +589 @@
     System.err.println("Starting download thread.");
     visited_url_ = new Hashtable();
-    
+    visited_images_ = new Hashtable();
+
         rec_add_images(starting_url_,1);
     download_images_.stopDownload();