woolfel     2005/08/11 15:08:44

  Modified:    src/protocol/http/org/apache/jmeter/protocol/http/parser
                        Tag: rel-2-1 HtmlParserHTMLParser.java
                        JTidyHTMLParser.java
  Log:
  applying the patch for extracting src attribute to 2.1 branch
  peter lin
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.19.2.1  +10 -3     
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
  
  Index: HtmlParserHTMLParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- HtmlParserHTMLParser.java 12 Jul 2005 20:50:42 -0000      1.19
  +++ HtmlParserHTMLParser.java 11 Aug 2005 22:08:44 -0000      1.19.2.1
  @@ -48,6 +48,7 @@
   import org.htmlparser.tags.LinkTag;
   import org.htmlparser.tags.LinkTagTag;
   import org.htmlparser.tags.ScriptTag;
  +import org.htmlparser.tags.Tag;
   import org.htmlparser.util.DefaultParserFeedback;
   import org.htmlparser.util.NodeIterator;
   import org.htmlparser.util.ParserException;
  @@ -165,7 +166,13 @@
                                } else if (node instanceof BgSoundTag) {
                                        BgSoundTag script = (BgSoundTag) node;
                                        binUrlStr = script.getAttribute("src");
  -                             }
  +                } else if (node instanceof Tag) {
  +                    Tag tag = (Tag) node;
  +                    String tagname=tag.getTagName();
  +                    if (tagname.equalsIgnoreCase("EMBED")){
  +                        binUrlStr = tag.getAttribute("src");  
  +                    }
  +                }
   
                                if (binUrlStr == null) {
                                        continue;
  
  
  
  1.15.2.1  +3 -3      
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
  
  Index: JTidyHTMLParser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- JTidyHTMLParser.java      12 Jul 2005 20:50:42 -0000      1.15
  +++ JTidyHTMLParser.java      11 Aug 2005 22:08:44 -0000      1.15.2.1
  @@ -111,7 +111,7 @@
                                break;
                        }
   
  -                     if (name.equalsIgnoreCase("img")) {
  +                     if (name.equalsIgnoreCase("img") || 
name.equalsIgnoreCase("embed")) {
                                urls.addURL(getValue(attrs, "src"), baseUrl);
                                break;
                        }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to