sebb 2005/03/01 17:34:14
Modified: src/protocol/http/org/apache/jmeter/protocol/http/parser
Tag: rel-2_0 HtmlParserHTMLParser.java
JTidyHTMLParser.java
Log:
Only parse <link if rel=stylesheet; add <frame src= parsers
Revision Changes Path
No revision
No revision
1.14.2.1 +11 -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.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- HtmlParserHTMLParser.java 25 Mar 2004 03:19:18 -0000 1.14
+++ HtmlParserHTMLParser.java 2 Mar 2005 01:34:14 -0000 1.14.2.1
@@ -32,6 +32,7 @@
import org.htmlparser.scanners.AppletScanner;
import org.htmlparser.scanners.BaseHrefScanner;
import org.htmlparser.scanners.BodyScanner;
+import org.htmlparser.scanners.FrameScanner;
import org.htmlparser.scanners.InputTagScanner;
import org.htmlparser.scanners.LinkScanner;
import org.htmlparser.scanners.LinkTagScanner;
@@ -39,6 +40,7 @@
import org.htmlparser.tags.AppletTag;
import org.htmlparser.tags.BaseHrefTag;
import org.htmlparser.tags.BodyTag;
+import org.htmlparser.tags.FrameTag;
import org.htmlparser.tags.ImageTag;
import org.htmlparser.tags.InputTag;
import org.htmlparser.tags.LinkTag;
@@ -162,9 +164,14 @@
} else if (node instanceof ScriptTag){
ScriptTag script = (ScriptTag)node;
binUrlStr = script.getAttribute("src");
+ } else if (node instanceof FrameTag){
+ FrameTag tag = (FrameTag)node;
+ binUrlStr = tag.getAttribute("src");
} else if (node instanceof LinkTagTag){
LinkTagTag script = (LinkTagTag)node;
- binUrlStr = script.getAttribute("href");
+ if
(script.getAttribute("rel").equalsIgnoreCase("stylesheet")){
+ binUrlStr =
script.getAttribute("href");
+ }
}
if (binUrlStr == null)
@@ -213,5 +220,6 @@
parser.addScanner(new AppletScanner());
parser.addScanner(new ScriptScanner());
parser.addScanner(new LinkTagScanner());
+ parser.addScanner(new FrameScanner());
}
}
1.12.2.1 +9 -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.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- JTidyHTMLParser.java 24 Mar 2004 03:00:56 -0000 1.12
+++ JTidyHTMLParser.java 2 Mar 2005 01:34:14 -0000 1.12.2.1
@@ -136,7 +136,8 @@
}
break;
}
- if (name.equalsIgnoreCase("link"))
+ if (name.equalsIgnoreCase("link")
+ &&
getValue(attrs,"rel").equalsIgnoreCase("stylesheet"))
{
urls.addURL(getValue(attrs,"href"),baseUrl);
break;
@@ -146,6 +147,11 @@
urls.addURL(getValue(attrs,"src"),baseUrl);
break;
}
+ if (name.equalsIgnoreCase("frame"))
+ {
+ urls.addURL(getValue(attrs,"src"),baseUrl);
+ break;
+ }
String back=getValue(attrs,"background");
if (back != null){
urls.addURL(back,baseUrl);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
