jsalvata 2003/12/11 16:38:38
Modified: src/protocol/http/org/apache/jmeter/protocol/http/parser
HtmlParserHTMLParser.java
Log:
- Added Base Href support.
- Somewhat improved error reporting.
Revision Changes Path
1.6 +20 -2
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HtmlParserHTMLParser.java 29 Nov 2003 21:52:52 -0000 1.5
+++ HtmlParserHTMLParser.java 12 Dec 2003 00:38:38 -0000 1.6
@@ -144,6 +144,18 @@
// body tag. Peter Lin 10-9-03
e= body.elements();
}
+ else if (node instanceof BaseHrefTag)
+ {
+ BaseHrefTag baseHref= (BaseHrefTag)node;
+ try
+ {
+ baseUrl= new URL(baseUrl, baseHref.getBaseUrl()+"/");
+ }
+ catch (MalformedURLException e1)
+ {
+ throw new HTMLParseException(e1);
+ }
+ }
else if (node instanceof ImageTag)
{
ImageTag image= (ImageTag)node;
@@ -192,6 +204,7 @@
}
catch (ParserException e)
{
+ throw new HTMLParseException(e);
}
return urls.iterator();
@@ -210,11 +223,16 @@
log.debug("Start : addTagListeners");
// add body tag scanner
parser.addScanner(new BodyScanner());
- // add ImageTag scanner
+ // add BaseHRefTag scanner
+ parser.addScanner(new BaseHrefScanner());
+ // add ImageTag and BaseHrefTag scanners
LinkScanner linkScanner= new LinkScanner(LinkTag.LINK_TAG_FILTER);
// parser.addScanner(linkScanner);
parser.addScanner(
linkScanner.createImageScanner(ImageTag.IMAGE_TAG_FILTER));
+ parser.addScanner(
+ linkScanner.createBaseHREFScanner("-b"));
+ // Taken from org.htmlparser.Parser
// add input tag scanner
parser.addScanner(new InputTagScanner());
// add applet tag scanner
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
