Changeset 11418 for trunk

Timestamp:

2006-03-21T09:30:08+12:00 (18 years ago)

Author:

shaoqun

Message:

replaced & with &

File:

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

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

@@ -27 +27 @@
 
     try {
-        url = new URL(url_str);
-        input = url.openStream();
+         url = new URL(url_str);
+         input = url.openStream();
+         //  int value = 0;
+
+         //            while ( (value=input.read())!=-1){
+         //System.err.print((char)value);
+         //}
+             
+         //url = new URL(url_str);
+         //input = url.openStream(); 
+
     } 
     catch (MalformedURLException e) {
+          
         url_valid = false;
     } 
     catch (IOException e) {
+     
         url_valid = false;
     }
@@ -71 +82 @@
     /** Checks that the content of the url is in html */
     public boolean isHTML() {
-    String content_type = guessContentType(url.toString());
-
+
+         String content_type = guessContentType(url.toString());
+   
     if(content_type.startsWith("text/html")) {
         return true;
@@ -144 +156 @@
     int value = getRaw();
     if(value != -1) {
+           
         if(value == '<') {
         //System.err.println("Parsing a tag starting " + (char)value);
@@ -151 +164 @@
         value = getRaw();
         while(value != -1 && peekRaw() != '<' && value != '>') {
-            //System.err.println("Read a " + (char)value);
+            //System.err.print((char)value);
             tag = tag + (char) value;
             value = getRaw();
         }
+    
         //System.err.println("Read a " + (char)value);
         //tag = smartLower(tag);
-        tag = findURL(tag);
+        //System.err.println("tag "+tag);
+                tag = findURL(tag);
         buffer = buffer + tag;
         // Add closing > to buffer
@@ -601 +616 @@
         }
     }
-
+       
+        url_str =   url_str.replaceAll("&amp;","&");
+    
     if(state == HREF_FINAL ) {
         try {