[Htmlparser-cvs] htmlparser/src/org/htmlparser/beans LinkBean.java,1.27,1.28

[<der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24953

Modified Files:
	LinkBean.java 
Log Message:
Add retry on EncodingChangeException, just like StringBean.



Index: LinkBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/LinkBean.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** LinkBean.java	4 Jan 2004 03:23:09 -0000	1.27
--- LinkBean.java	14 Mar 2004 15:53:06 -0000	1.28
***************
*** 38,41 ****
--- 38,42 ----
  import org.htmlparser.Parser;
  import org.htmlparser.tags.LinkTag;
+ import org.htmlparser.util.EncodingChangeException;
  import org.htmlparser.util.ParserException;
  import org.htmlparser.visitors.ObjectFindingVisitor;
***************
*** 71,75 ****
      protected Parser mParser;
  
!     /** Creates new StringBean */
      public LinkBean ()
      {
--- 72,76 ----
      protected Parser mParser;
  
!     /** Creates new LinkBean */
      public LinkBean ()
      {
***************
*** 86,89 ****
--- 87,91 ----
      {
          Parser parser;
+         ObjectFindingVisitor visitor;
          Vector vector;
          LinkTag link;
***************
*** 91,96 ****
  
          parser = new Parser (url);
!         ObjectFindingVisitor visitor = new ObjectFindingVisitor(LinkTag.class);
!         parser.visitAllNodesWith(visitor);
          Node [] nodes = visitor.getTags();
          vector = new Vector();
--- 93,107 ----
  
          parser = new Parser (url);
!         visitor = new ObjectFindingVisitor (LinkTag.class);
!         try
!         {
!             parser.visitAllNodesWith (visitor);
!         }
!         catch (EncodingChangeException ece)
!         {
!             parser.reset ();
!             visitor = new ObjectFindingVisitor (LinkTag.class);
!             parser.visitAllNodesWith (visitor);
!         }
          Node [] nodes = visitor.getTags();
          vector = new Vector();
***************
*** 273,287 ****
      }
  
! //    /**
! //     * Unit test.
! //     */
! //    public static void main (String[] args)
! //    {
! //        LinkBean lb = new LinkBean ();
! //        lb.setURL ("http://cbc.ca");
! //        URL[] urls = lb.getLinks ();
! //        for (int i = 0; i < urls.length; i++)
! //            System.out.println (urls[i]);
! //    }
  }
  
--- 284,304 ----
      }
  
!     /**
!      * Unit test.
!      * @param args Pass arg[0] as the URL to process.
!      */
!     public static void main (String[] args)
!     {
!         if (0 >= args.length)
!             System.out.println ("Usage: java -classpath htmlparser.jar org.htmlparser.beans.LinkBean <http://whatever_url>");
!         else
!         {
!             LinkBean lb = new LinkBean ();
!             lb.setURL (args[0]);
!             URL[] urls = lb.getLinks ();
!             for (int i = 0; i < urls.length; i++)
!                 System.out.println (urls[i]);
!         }
!     }
  }