htmlparser-cvs Mailing List for HTML Parser (Page 59)
Brought to you by:
derrickoswald
Menu
▾
▴
htmlparser-cvs — syncmail email notification of CVS commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(141) |
Jun
(108) |
Jul
(66) |
Aug
(127) |
Sep
(155) |
Oct
(149) |
Nov
(72) |
Dec
(72) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(100) |
Feb
(36) |
Mar
(21) |
Apr
(3) |
May
(87) |
Jun
(28) |
Jul
(84) |
Aug
(5) |
Sep
(14) |
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
(39) |
Mar
(26) |
Apr
(38) |
May
(14) |
Jun
(10) |
Jul
|
Aug
|
Sep
(13) |
Oct
(8) |
Nov
(10) |
Dec
|
| 2006 |
Jan
|
Feb
(1) |
Mar
(17) |
Apr
(20) |
May
(28) |
Jun
(24) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <der...@us...> - 2003-05-18 14:31:22
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv12038/org/htmlparser/tags
Modified Files:
LinkTag.java
Log Message:
Fixed bug #738504 MailLink != HTTPLink.
Added a testcase in LinkTagTest.
Index: LinkTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/LinkTag.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** LinkTag.java 12 May 2003 01:37:46 -0000 1.18
--- LinkTag.java 18 May 2003 14:31:18 -0000 1.19
***************
*** 160,166 ****
* @return flag indicating if this link is an HTTP link
*/
! public boolean isHTTPLink() {
! if (!isFTPLink() && !isHTTPSLink() && !isJavascriptLink()) return true;
! else return false;
}
--- 160,166 ----
* @return flag indicating if this link is an HTTP link
*/
! public boolean isHTTPLink()
! {
! return (!isFTPLink() && !isHTTPSLink() && !isJavascriptLink() && !isMailLink());
}
|
|
From: <der...@us...> - 2003-05-18 14:31:22
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv12038/org/htmlparser/tests/tagTests
Modified Files:
LinkTagTest.java
Log Message:
Fixed bug #738504 MailLink != HTTPLink.
Added a testcase in LinkTagTest.
Index: LinkTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/LinkTagTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** LinkTagTest.java 12 May 2003 01:37:49 -0000 1.19
--- LinkTagTest.java 18 May 2003 14:31:18 -0000 1.20
***************
*** 354,358 ****
);
assertTrue("This is a https link",linkTag2.isHTTPLikeLink());
! }
}
--- 354,375 ----
);
assertTrue("This is a https link",linkTag2.isHTTPLikeLink());
+ }
! /**
! * Bug #738504 MailLink != HTTPLink
! */
! public void testMailToIsNotAHTTPLink () throws ParserException
! {
! LinkTag link;
!
! createParser ("<A HREF='mailto:der...@us...'>Derrick</A>","http://sourceforge.net");
! // Register the link scanner
! parser.addScanner (new LinkScanner ("-l"));
!
! parseAndAssertNodeCount (1);
! assertTrue ("Node should be a HTMLLinkTag", node[0] instanceof LinkTag);
! link = (LinkTag)node[0];
! assertTrue ("bug #738504 MailLink != HTTPLink", !link.isHTTPLink ());
! assertTrue ("bug #738504 MailLink != HTTPSLink", !link.isHTTPSLink ());
! }
}
|
|
From: <der...@us...> - 2003-05-18 13:50:41
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv29793/org/htmlparser/tags
Modified Files:
CompositeTag.java
Log Message:
Make SimpleNodeIterator extend NodeIterator and provide elements() method for CompositeTag.
As per request by Dhaval to rationalize (somewhat) the API.
Index: CompositeTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/CompositeTag.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** CompositeTag.java 12 May 2003 01:37:46 -0000 1.37
--- CompositeTag.java 18 May 2003 13:50:38 -0000 1.38
***************
*** 63,68 ****
return childTags;
}
!
! public String toPlainTextString() {
StringBuffer stringRepresentation = new StringBuffer();
for (SimpleNodeIterator e=children();e.hasMoreNodes();) {
--- 63,78 ----
return childTags;
}
!
! /**
! * Return the child tags as an iterator.
! * Equivalent to calling getChildren ().elements ().
! * @return An iterator over the children.
! */
! public SimpleNodeIterator elements()
! {
! return (getChildren ().elements ());
! }
!
! public String toPlainTextString() {
StringBuffer stringRepresentation = new StringBuffer();
for (SimpleNodeIterator e=children();e.hasMoreNodes();) {
|
|
From: <der...@us...> - 2003-05-18 13:50:41
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util
In directory sc8-pr-cvs1:/tmp/cvs-serv29793/org/htmlparser/util
Modified Files:
SimpleNodeIterator.java
Log Message:
Make SimpleNodeIterator extend NodeIterator and provide elements() method for CompositeTag.
As per request by Dhaval to rationalize (somewhat) the API.
Index: SimpleNodeIterator.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/SimpleNodeIterator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SimpleNodeIterator.java 12 May 2003 01:37:51 -0000 1.15
--- SimpleNodeIterator.java 18 May 2003 13:50:38 -0000 1.16
***************
*** 38,42 ****
* @author Somik Raha
*/
! public interface SimpleNodeIterator {
/**
* Check if more nodes are available.
--- 38,43 ----
* @author Somik Raha
*/
! public interface SimpleNodeIterator extends NodeIterator
! {
/**
* Check if more nodes are available.
|
|
From: <der...@us...> - 2003-05-18 12:07:54
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/scanners
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:55 -0000 1.1
--- package.html 18 May 2003 12:07:20 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:54
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/tests
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:57 -0000 1.1
--- package.html 18 May 2003 12:07:20 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:54
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/util
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:55 -0000 1.1
--- package.html 18 May 2003 12:07:20 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:26
|
Update of /cvsroot/htmlparser/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser
Modified Files:
build.xml
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: build.xml
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** build.xml 18 May 2003 11:23:39 -0000 1.30
--- build.xml 18 May 2003 12:07:22 -0000 1.31
***************
*** 58,62 ****
</loadfile>
<echo message="previous version tag = ${previousTag}"/>
-
</target>
--- 58,61 ----
***************
*** 80,86 ****
--- 79,87 ----
<replacefilter token="${VERSION_NUMBER} (${VERSION_TYPE} ${VERSION_DATE})"/>
</replace>
+
<echo message="Replacing version tag ${previousTag} with ${versionTag} in all source files"/>
<replace dir="${src}" value="${versionTag}">
<include name="**/*.java"/>
+ <include name="**/package.html"/>
<replacefilter token="${previousTag}"/>
</replace>
|
|
From: <der...@us...> - 2003-05-18 12:07:26
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/tags
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:55 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:26
|
Update of /cvsroot/htmlparser/htmlparser/docs In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/docs Modified Files: changes.txt release.txt Removed Files: changes.html Log Message: Get all version tags up to date. Modify build.xml to keep package.html files up to date. Index: changes.txt =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/docs/changes.txt,v retrieving revision 1.177 retrieving revision 1.178 diff -C2 -d -r1.177 -r1.178 *** changes.txt 12 May 2003 01:37:42 -0000 1.177 --- changes.txt 18 May 2003 12:07:22 -0000 1.178 *************** *** 18,23 **** 2003-05-11 20:59 derrickoswald ! * docs/docs/index.html: Change the javadoc reference in the shipped ! documentation to reference local javadocs. 2003-05-11 16:42 derrickoswald --- 18,24 ---- 2003-05-11 20:59 derrickoswald ! * docs/docs/index.html: ! ! Change the javadoc reference in the shipped documentation to reference local javadocs. 2003-05-11 16:42 derrickoswald *************** *** 26,38 **** tests/parserHelperTests/AttributeParserTest.java, tests/parserHelperTests/TagParserTest.java, ! tests/scannersTests/TableScannerTest.java: Moved pending bugs to ! the 'feature request' tracker, and made the failing unit tests ! execution conditional on the Parser version being >= 1.4. 2003-05-11 15:32 derrickoswald ! * src/org/htmlparser/tests/scannersTests/DivScannerTest.java: Added ! testcase for bug #735193 Explicit tag type recognition for ! CompositTags not working. 2003-05-11 00:48 derrickoswald --- 27,40 ---- tests/parserHelperTests/AttributeParserTest.java, tests/parserHelperTests/TagParserTest.java, ! tests/scannersTests/TableScannerTest.java: ! ! Moved pending bugs to the 'feature request' tracker, ! and made the failing unit tests execution conditional on the Parser version being >= 1.4. 2003-05-11 15:32 derrickoswald ! * src/org/htmlparser/tests/scannersTests/DivScannerTest.java: ! ! Added testcase for bug #735193 Explicit tag type recognition for CompositTags not working. 2003-05-11 00:48 derrickoswald *************** *** 41,48 **** scanners/OptionTagScanner.java, tests/scannersTests/LabelScannerTest.java, util/NodeList.java, ! tests/tagTests/SelectTagTest.java: Fixed bug #735183 Problem in ! Label Scanning A NodeReader now prepends the pre-read tags onto the ! internal list, maintaining the correct order in recursively ! analysing unclosed tags. Also fixed OptionTagScanner tag enders. --- 43,51 ---- scanners/OptionTagScanner.java, tests/scannersTests/LabelScannerTest.java, util/NodeList.java, ! tests/tagTests/SelectTagTest.java: ! ! Fixed bug #735183 Problem in Label Scanning ! A NodeReader now prepends the pre-read tags onto the internal list, ! maintaining the correct order in recursively analysing unclosed tags. Also fixed OptionTagScanner tag enders. *************** *** 54,97 **** tests/scannersTests/OptionTagScannerTest.java, tests/scannersTests/SelectTagScannerTest.java, ! tests/tagTests/OptionTagTest.java: For Dhaval: I have converted the ! OptionTag to a composite tag. The problem that is present with ! Label tag exists here a well so my guess is that it is with ! CompositeTag itself. Once solved, all related problems will also ! get solved. In any case I have commented some test conditions in ! the OptionTagTest class. You can uncomment it and see it for ! yourself. Some SelectTag test cases are also changed as a result. 2003-05-09 21:22 derrickoswald ! * src/org/htmlparser/tests/scannersTests/LabelScannerTest.java: For ! Dhaval: New Test case. I added the LabelScanner to the parser and ! parsed. Strangely instead of returning node count as 13(number of ! LABEL tags) I get 17. Also when I see output of every node (using ! toHtml()), uptil "Microsoft Passport" everything is correct and I ! am getting LABEL tags as well. But the next node that I get is a ! String node with value as #alue="AOL"># (without the hash) and that ! entire tag got messed up. Any ideas. I have attached test file for ! that purpose. U'll also have to use the new LabelScanner.java file. ! Its quite strange. 2003-05-09 21:14 derrickoswald * src/org/htmlparser/: scanners/LabelScanner.java, ! tests/scannersTests/LabelScannerTest.java: For Dhaval: Changed code ! and test case for LabelScanner. Basically a string like ! <label>John Doe<label>Jane Doe</label> gets parsed as <LABEL>John ! Doe<LABEL>Jane Doe</LABEL></LABEL> instead of <LABEL>John ! Doe</LABEL><LABEL>Jane Doe</LABEL> after call to toHtml() on the ! single LabelTag. Also it is parsed as a single node instead of 2 ! distinct nodes. 2003-05-08 23:32 derrickoswald ! * docs/changes.txt: switch to cvs2cl mechanism 2003-05-07 18:00 derrickoswald * src/org/htmlparser/: tests/utilTests/NodeListTest.java, ! util/NodeList.java: added removeAll() to NodeList - Dhaval 2003-05-07 16:16 polarys --- 57,111 ---- tests/scannersTests/OptionTagScannerTest.java, tests/scannersTests/SelectTagScannerTest.java, ! tests/tagTests/OptionTagTest.java: ! ! For Dhaval: ! I have converted the OptionTag to a composite tag. The problem that is present ! with Label tag exists here a well so my guess is that it is with CompositeTag ! itself. Once solved, all related problems will also get solved. In any ! case I have commented some test conditions in the OptionTagTest class. You can ! uncomment it and see it for yourself. ! Some SelectTag test cases are also changed as a result. 2003-05-09 21:22 derrickoswald ! * src/org/htmlparser/tests/scannersTests/LabelScannerTest.java: ! ! For Dhaval: ! New Test case. ! I added the LabelScanner to the parser the parsed. Strangely instead of ! returning node count as 13(number of LABEL tags) I get 17. Also when I see ! output of every node (using toHtml()), uptil "Microsoft Passport" everything is ! correct and I am getting LABEL tags as well. But the next node that I get is a ! String node with value as #alue="AOL"># (without the hash) and that entire tag ! got messed up. Any ideas. I have attached test file for that purpose. U'll also ! have to use the new LabelScanner.java file. Its quite strange. 2003-05-09 21:14 derrickoswald * src/org/htmlparser/: scanners/LabelScanner.java, ! tests/scannersTests/LabelScannerTest.java: ! ! For Dhaval: ! Changed code and test case for LabelScanner. ! Basically a string like <label>John Doe<label>Jane Doe</label> ! gets parsed as ! <LABEL>John Doe<LABEL>Jane Doe</LABEL></LABEL> ! instead of ! <LABEL>John Doe</LABEL><LABEL>Jane Doe</LABEL> ! after call to toHtml() on the single LabelTag. ! Also it is parsed as a single node instead of 2 distinct nodes. 2003-05-08 23:32 derrickoswald ! * docs/changes.txt: ! ! switch to cvs2cl mechanism 2003-05-07 18:00 derrickoswald * src/org/htmlparser/: tests/utilTests/NodeListTest.java, ! util/NodeList.java: ! ! added removeAll() to NodeList - Dhaval 2003-05-07 16:16 polarys *************** *** 100,117 **** src/org/htmlparser/scanners/ScriptScanner.java, src/org/htmlparser/tests/scannersTests/ScriptScannerTest.java: ! Fixed NPE in ScriptScanner when a script tag was not ended before ! the end of document 2003-05-06 07:37 derrickoswald ! * src/org/htmlparser/parserHelper/ParserHelper.java: Fix #732517 ! Paser(String) c'tor not handling relative path local file 2003-05-05 20:43 derrickoswald * src/org/htmlparser/: scanners/LabelScanner.java, ! scanners/SelectTagScanner.java, tags/SelectTag.java: nodelist ! modifications from Dhaval ! Integration Build 1.3 - 20030504 --- 114,132 ---- src/org/htmlparser/scanners/ScriptScanner.java, src/org/htmlparser/tests/scannersTests/ScriptScannerTest.java: ! ! Fixed NPE in ScriptScanner when a script tag was not ended before the end of document 2003-05-06 07:37 derrickoswald ! * src/org/htmlparser/parserHelper/ParserHelper.java: ! ! Fix #732517 Paser(String) c'tor not handling relative path local file 2003-05-05 20:43 derrickoswald * src/org/htmlparser/: scanners/LabelScanner.java, ! scanners/SelectTagScanner.java, tags/SelectTag.java: ! ! nodelist modifications from Dhaval Integration Build 1.3 - 20030504 Index: release.txt =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/docs/release.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** release.txt 13 Apr 2003 23:53:50 -0000 1.37 --- release.txt 18 May 2003 12:07:22 -0000 1.38 *************** *** 1,3 **** ! HTMLParser Integration Release 1.3 - 20030413 ********************************************* --- 1,3 ---- ! HTMLParser Version 1.3 (Integration Build May 11, 2003) ********************************************* --- changes.html DELETED --- |
|
From: <der...@us...> - 2003-05-18 12:07:26
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/tests/scannersTests
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:55 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:26
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/tests/visitorsTests Modified Files: AllTests.java Log Message: Get all version tags up to date. Modify build.xml to keep package.html files up to date. Index: AllTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/visitorsTests/AllTests.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** AllTests.java 12 May 2003 01:37:50 -0000 1.20 --- AllTests.java 18 May 2003 12:07:22 -0000 1.21 *************** *** 1,3 **** ! // HTMLParser Library v1_3_20030511_20021210 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_3_20030511 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
|
From: <der...@us...> - 2003-05-18 12:07:25
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/tests/tagTests
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:55 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/beans
Modified Files:
StringBean.java HTMLTextBean.java package.html BeanyBaby.java
HTMLLinkBean.java LinkBean.java
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: StringBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/StringBean.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** StringBean.java 26 Apr 2003 10:58:14 -0000 1.10
--- StringBean.java 18 May 2003 12:07:21 -0000 1.11
***************
*** 1,3 ****
! // HTMLParser Library v1_2 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_3_20030511 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLTextBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/HTMLTextBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HTMLTextBean.java 6 Apr 2003 00:00:23 -0000 1.3
--- HTMLTextBean.java 18 May 2003 12:07:21 -0000 1.4
***************
*** 1,3 ****
! // HTMLParser Library v1_2 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! /// HTMLParser Library v1_3_20030511 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 31 Dec 2002 04:28:30 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021230 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
Index: BeanyBaby.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/BeanyBaby.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BeanyBaby.java 6 Apr 2003 00:00:19 -0000 1.2
--- BeanyBaby.java 18 May 2003 12:07:21 -0000 1.3
***************
*** 1,3 ****
! // HTMLParser Library v1_2 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_3_20030511 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLLinkBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/HTMLLinkBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HTMLLinkBean.java 11 Jan 2003 07:04:42 -0000 1.2
--- HTMLLinkBean.java 18 May 2003 12:07:21 -0000 1.3
***************
*** 1,3 ****
! // HTMLParser Library v1_2 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_3_20030511 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LinkBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/LinkBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LinkBean.java 24 Feb 2003 01:18:46 -0000 1.5
--- LinkBean.java 18 May 2003 12:07:21 -0000 1.6
***************
*** 1,3 ****
! // HTMLParser Library v1_2 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_3_20030511 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
|
|
From: <der...@us...> - 2003-05-18 12:07:25
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** package.html 21 Apr 2003 13:50:06 -0000 1.2
--- package.html 18 May 2003 12:07:22 -0000 1.3
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:25
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/tests/utilTests
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:57 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 12:07:25
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/visitors
Modified Files:
package.html ObjectFindingVisitor.java
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 21 Apr 2003 14:16:56 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021230 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
Index: ObjectFindingVisitor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors/ObjectFindingVisitor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ObjectFindingVisitor.java 12 May 2003 01:37:51 -0000 1.18
--- ObjectFindingVisitor.java 18 May 2003 12:07:21 -0000 1.19
***************
*** 1,3 ****
! // HTMLParser Library v1_3_20030511_20021210 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_3_20030511 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
|
|
From: <der...@us...> - 2003-05-18 12:07:25
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications
In directory sc8-pr-cvs1:/tmp/cvs-serv20005/htmlparser/src/org/htmlparser/parserapplications
Modified Files:
package.html
Log Message:
Get all version tags up to date.
Modify build.xml to keep package.html files up to date.
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 20 Nov 2002 06:25:57 -0000 1.1
--- package.html 18 May 2003 12:07:21 -0000 1.2
***************
*** 5,9 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_2_20021109 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 5,9 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_3_20030511 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-05-18 11:23:42
|
Update of /cvsroot/htmlparser/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv24361/htmlparser
Modified Files:
build.xml
Log Message:
Eliminate the build directory.
Index: build.xml
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** build.xml 18 May 2003 09:41:50 -0000 1.29
--- build.xml 18 May 2003 11:23:39 -0000 1.30
***************
*** 12,16 ****
<property name="versionQualifier" value="${versionMajor}_${versionMinor}"/>
<property name="src" value="src"/>
- <property name="build" value="build"/>
<property name="docs" value="docs"/>
<property name="resources" value="resources"/>
--- 12,15 ----
***************
*** 92,95 ****
--- 91,109 ----
<!-- cvschangelog daysinpast="7" destfile="changelog.xml" / -->
<!-- so we use cvs2cl instead -->
+ <!--
+ Note: This relies on being able to perform cvs operations to
+ cvs.htmlparser.sorceforge.net by default, so you need to have
+ environment variables CVSROOT and CVS_RSH set up and the ssh-agent
+ loaded and primed.
+ $ ssh-agent
+ $ ssh-add
+ $ CVSROOT=:ext:der...@cv...:/cvsroot/htmlparser
+ $ export CVSROOT
+ $ CVS_RSH=ssh
+ $ export CVS_RSH
+ At this point you should be able to ssh to sourceforge without answering
+ password prompts:
+ $ ssh -l derrickoswald shell.sourceforge.net
+ -->
<echo message="**********************************"/>
<echo message="* Creating change log *"/>
***************
*** 108,120 ****
<echo message="**********************************"/>
! <!-- Create the build directory structure used by compile -->
! <mkdir dir="${build}"/>
! <!-- Compile the java code from ${src} into ${build} -->
! <javac srcdir="${src}" destdir="${build}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**,org/htmlparser/util/Generate.java" debug="on" />
! <!-- Copy images from ${src} into ${build} -->
! <mkdir dir="${build}/org/htmlparser/beans/images"/>
! <copy todir="${build}/org/htmlparser/beans/images">
! <fileset dir="${src}/org/htmlparser/beans/images" includes="Chain16.gif Chain32.gif Knot16.gif Knot32.gif"/>
! </copy>
</target>
--- 122,127 ----
<echo message="**********************************"/>
! <!-- Compile the java code in ${src} -->
! <javac srcdir="${src}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**,org/htmlparser/util/Generate.java" debug="on" />
</target>
***************
*** 128,133 ****
<mkdir dir="${dist}/lib"/>
! <!-- Put everything in ${build} into the htmlparser.jar file -->
! <jar jarfile="${dist}/lib/htmlparser.jar" basedir="${build}" manifest="${resources}/Manifest.mf">
<manifest>
<section name="org/htmlparser/Parser.class">
--- 135,144 ----
<mkdir dir="${dist}/lib"/>
! <!-- Put classes and images into the htmlparser.jar file -->
! <jar jarfile="${dist}/lib/htmlparser.jar"
! basedir="${src}"
! includes="**/*.class **/*.gif"
! excludes="org/htmlparser/tests/**/*.class,org/htmlparser/util/Generate.class"
! manifest="${resources}/Manifest.mf">
<manifest>
<section name="org/htmlparser/Parser.class">
***************
*** 187,192 ****
version="true"
use="true"
! windowtitle="HTML Parser ${version}">
! <doctitle><![CDATA[<h1>HTML Parser ${version}</h1>]]></doctitle>
<header><![CDATA[<A HREF="http://htmlparser.sourceforge.net" target="_top">HTML Parser Home Page</A>]]></header>
<bottom><![CDATA[HTML Parser is an open source library released under LGPL. <BR> If you want to be notified when a new release of HTML Parser is out, join the <A HREF="http://lists.sourceforge.net/lists/listinfo/htmlparser-announce">HTML Parser Announcement List</A>.<BR>
--- 198,203 ----
version="true"
use="true"
! windowtitle="HTML Parser ${versionTag}">
! <doctitle><![CDATA[<h1>HTML Parser ${versionTag}</h1>]]></doctitle>
<header><![CDATA[<A HREF="http://htmlparser.sourceforge.net" target="_top">HTML Parser Home Page</A>]]></header>
<bottom><![CDATA[HTML Parser is an open source library released under LGPL. <BR> If you want to be notified when a new release of HTML Parser is out, join the <A HREF="http://lists.sourceforge.net/lists/listinfo/htmlparser-announce">HTML Parser Announcement List</A>.<BR>
***************
*** 231,235 ****
</target>
! <!-- The release directory structuring finishes here -->
<target name="Release" depends="versionSource,jar,javadoc,CopyBatch" description="prepare the release files">
</target>
--- 242,246 ----
</target>
! <!-- The release directory structuring finishes here -->
<target name="Release" depends="versionSource,jar,javadoc,CopyBatch" description="prepare the release files">
</target>
***************
*** 242,246 ****
<mkdir dir="${finalLoc}"/>
! <zip zipfile="${finalLoc}/htmlparser${version}.zip"
basedir="${releaseDir}"/>
<tar tarfile="${finalLoc}/docs.tar" basedir="${dist}/docs"/>
--- 253,257 ----
<mkdir dir="${finalLoc}"/>
! <zip zipfile="${finalLoc}/htmlparser${versionTag}.zip"
basedir="${releaseDir}"/>
<tar tarfile="${finalLoc}/docs.tar" basedir="${dist}/docs"/>
***************
*** 272,285 ****
</target>
! <!-- Clean up -->
! <target name="htmlparser" depends="Package" description="vacuous, same as Package">
<echo message="**********************************"/>
<echo message="* Cleaning up and finishing.... *"/>
<echo message="**********************************"/>
! <!-- Delete the ${build} and ${dist} directory trees -->
! <delete dir="${build}"/>
! <!-- Delete the release directory also -->
<delete dir="${releaseDir}"/>
</target>
</project>
--- 283,298 ----
</target>
! <!-- Perform the htmlparser integration -->
! <target name="htmlparser" depends="Package" description="same as Package plus cleanup">
<echo message="**********************************"/>
<echo message="* Cleaning up and finishing.... *"/>
<echo message="**********************************"/>
! <!-- delete the release directory -->
<delete dir="${releaseDir}"/>
+ <!-- delete the classes -->
+ <delete>
+ <fileset dir="${src}" includes="**/*.class"/>
+ </delete>
</target>
</project>
|
|
From: <der...@us...> - 2003-05-18 09:41:55
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests
In directory sc8-pr-cvs1:/tmp/cvs-serv23601/htmlparser/src/org/htmlparser/tests/parserHelperTests
Modified Files:
TagParserTest.java AttributeParserTest.java
Log Message:
Provide for automatic changelog generation. A changeLog target was added to the build.xml file.
The static version stuff in Parser was reworked to allow picking out the previous integration date.
The getVersion() method was made static.
The getVersionNumber() method was added to clean up some uglies.
Index: TagParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/TagParserTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** TagParserTest.java 12 May 2003 01:37:48 -0000 1.26
--- TagParserTest.java 18 May 2003 09:41:52 -0000 1.27
***************
*** 209,213 ****
// bar">
createParser("<meta name=\"foo\" content=\"<foo>\nbar\">");
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
parseAndAssertNodeCount (1);
--- 209,213 ----
// bar">
createParser("<meta name=\"foo\" content=\"<foo>\nbar\">");
! if (1.4 <= Parser.getVersionNumber ())
{
parseAndAssertNodeCount (1);
***************
*** 233,237 ****
// bar">
createParser("<meta name=\"foo\" content=\"foo>\nbar\">");
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
parseAndAssertNodeCount (1);
--- 233,237 ----
// bar">
createParser("<meta name=\"foo\" content=\"foo>\nbar\">");
! if (1.4 <= Parser.getVersionNumber ())
{
parseAndAssertNodeCount (1);
***************
*** 257,261 ****
// bar">
createParser("<meta name=\"foo\" content=\"<foo\nbar\"");
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
parseAndAssertNodeCount (1);
--- 257,261 ----
// bar">
createParser("<meta name=\"foo\" content=\"<foo\nbar\"");
! if (1.4 <= Parser.getVersionNumber ())
{
parseAndAssertNodeCount (1);
***************
*** 283,287 ****
{
createParser("<html></html>");
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
String testHtml1 = "<a HREF=\"/cgi-bin/view_search?query_text=postdate>20020701&txt_clr=White&bg_clr=Red&url=http://localhost/Testing/Report1.html\">20020702 Report 1</A>" +
--- 283,287 ----
{
createParser("<html></html>");
! if (1.4 <= Parser.getVersionNumber ())
{
String testHtml1 = "<a HREF=\"/cgi-bin/view_search?query_text=postdate>20020701&txt_clr=White&bg_clr=Red&url=http://localhost/Testing/Report1.html\">20020702 Report 1</A>" +
Index: AttributeParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/AttributeParserTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AttributeParserTest.java 12 May 2003 01:37:48 -0000 1.26
--- AttributeParserTest.java 18 May 2003 09:41:52 -0000 1.27
***************
*** 173,177 ****
parser = new Parser ();
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
getParameterTableFor(
--- 173,177 ----
parser = new Parser ();
! if (1.4 <= Parser.getVersionNumber ())
{
getParameterTableFor(
***************
*** 196,200 ****
parser = new Parser ();
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
getParameterTableFor("body onLoad=defaultStatus=''");
--- 196,200 ----
parser = new Parser ();
! if (1.4 <= Parser.getVersionNumber ())
{
getParameterTableFor("body onLoad=defaultStatus=''");
|
|
From: <der...@us...> - 2003-05-18 09:41:55
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests
In directory sc8-pr-cvs1:/tmp/cvs-serv23601/htmlparser/src/org/htmlparser/tests/scannersTests
Modified Files:
TableScannerTest.java
Log Message:
Provide for automatic changelog generation. A changeLog target was added to the build.xml file.
The static version stuff in Parser was reworked to allow picking out the previous integration date.
The getVersion() method was made static.
The getVersionNumber() method was added to clean up some uglies.
Index: TableScannerTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/scannersTests/TableScannerTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TableScannerTest.java 12 May 2003 01:37:49 -0000 1.17
--- TableScannerTest.java 18 May 2003 09:41:52 -0000 1.18
***************
*** 123,127 ****
parser = new Parser (url);
! if (1.4 <= Double.parseDouble (parser.getVersion ().substring (0, parser.getVersion ().indexOf (' '))))
{
parser.registerScanners ();
--- 123,127 ----
parser = new Parser (url);
! if (1.4 <= Parser.getVersionNumber ())
{
parser.registerScanners ();
|
|
From: <der...@us...> - 2003-05-18 09:41:55
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv23601/htmlparser/src/org/htmlparser
Modified Files:
Parser.java
Log Message:
Provide for automatic changelog generation. A changeLog target was added to the build.xml file.
The static version stuff in Parser was reworked to allow picking out the previous integration date.
The getVersion() method was made static.
The getVersionNumber() method was added to clean up some uglies.
Index: Parser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/Parser.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Parser.java 16 May 2003 11:38:38 -0000 1.38
--- Parser.java 18 May 2003 09:41:51 -0000 1.39
***************
*** 136,145 ****
Serializable
{
! // Please don't change the formatting of the VERSION_STRING
! // below. This is done so as to facilitate the ant script
! public final static java.lang.String
! VERSION_STRING="1.3 (Integration Build May 11, 2003)"
;
! // End of formatting
/**
--- 136,171 ----
Serializable
{
! // Please don't change the formatting of the version variables below.
! // This is done so as to facilitate ant script processing.
!
! /**
! * The floating point version number.
! */
! public final static double
! VERSION_NUMBER = 1.3
! ;
!
! /**
! * The type of version.
! */
! public final static String
! VERSION_TYPE = "Integration Build"
! ;
!
! /**
! * The date of the version.
! */
! public final static String
! VERSION_DATE = "May 11, 2003"
! ;
!
! /**
! * The display version.
! */
! public final static String
! VERSION_STRING = "" + VERSION_NUMBER + " (" + VERSION_TYPE + " " + VERSION_DATE + ")"
;
!
! // End of formatting
/**
***************
*** 204,207 ****
--- 230,234 ----
private ParserHelper parserHelper = new ParserHelper();
+
//
// Static methods
***************
*** 216,219 ****
--- 243,268 ----
}
+ /**
+ * Return the version string of this parser.
+ * @return A string of the form:
+ * <pre>
+ * "[floating point number] ([build-type] [build-date])"
+ * </pre>
+ */
+ public static String getVersion ()
+ {
+ return (VERSION_STRING);
+ }
+
+ /**
+ * Return the version number of this parser.
+ * @return A floating point number, the whole number part is the major
+ * version, and the fractional part is the minor version.
+ */
+ public static double getVersionNumber ()
+ {
+ return (VERSION_NUMBER);
+ }
+
//
// Constructors
***************
*** 384,399 ****
// Bean patterns
//
-
- /**
- * Return the version string of this parser.
- * @return A string of the form:
- * <pre>
- * "[floating point number] [description]"
- * </pre>
- */
- public String getVersion ()
- {
- return (VERSION_STRING);
- }
/**
--- 433,436 ----
|
|
From: <der...@us...> - 2003-05-18 09:41:55
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications
In directory sc8-pr-cvs1:/tmp/cvs-serv23601/htmlparser/src/org/htmlparser/parserapplications
Modified Files:
MailRipper.java Robot.java
Log Message:
Provide for automatic changelog generation. A changeLog target was added to the build.xml file.
The static version stuff in Parser was reworked to allow picking out the previous integration date.
The getVersion() method was made static.
The getVersionNumber() method was added to clean up some uglies.
Index: MailRipper.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/MailRipper.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** MailRipper.java 12 May 2003 01:37:44 -0000 1.31
--- MailRipper.java 18 May 2003 09:41:51 -0000 1.32
***************
*** 61,65 ****
}
public static void main(String[] args) {
! System.out.println("Mail Ripper v"+Parser.VERSION_STRING);
if (args.length<1 || args[0].equals("-help"))
{
--- 61,65 ----
}
public static void main(String[] args) {
! System.out.println("Mail Ripper v" + Parser.getVersion ());
if (args.length<1 || args[0].equals("-help"))
{
Index: Robot.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/Robot.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Robot.java 12 May 2003 01:37:44 -0000 1.32
--- Robot.java 18 May 2003 09:41:52 -0000 1.33
***************
*** 102,106 ****
public static void main(String[] args)
{
! System.out.println("Robot Crawler v"+Parser.VERSION_STRING);
if (args.length<2 || args[0].equals("-help"))
{
--- 102,106 ----
public static void main(String[] args)
{
! System.out.println("Robot Crawler v" + Parser.getVersion ());
if (args.length<2 || args[0].equals("-help"))
{
|
|
From: <der...@us...> - 2003-05-18 09:41:55
|
Update of /cvsroot/htmlparser/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv23601/htmlparser
Modified Files:
build.xml
Added Files:
cvs2cl.pl
Log Message:
Provide for automatic changelog generation. A changeLog target was added to the build.xml file.
The static version stuff in Parser was reworked to allow picking out the previous integration date.
The getVersion() method was made static.
The getVersionNumber() method was added to clean up some uglies.
--- NEW FILE: cvs2cl.pl ---
#!/bin/sh
exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*-
#!perl -w
##############################################################
### ###
### cvs2cl.pl: produce ChangeLog(s) from `cvs log` output. ###
### ###
##############################################################
## $Revision: 1.1 $
## $Date: 2003/05/18 09:41:51 $
## $Author: derrickoswald $
##
## (C) 2001,2002,2003 Martyn J. Pearce <fl...@cp...>, under the GNU GPL.
## (C) 1999 Karl Fogel <kf...@re...>, under the GNU GPL.
##
## (Extensively hacked on by Melissa O'Neill <on...@cs...>.)
[...2298 lines suppressed...]
Anyway, rather than fix this in Text::Wrap, we might as well write a
new wrap() which has the following much-needed features:
* initial indentation, like current Text::Wrap()
* subsequent line indentation, like current Text::Wrap()
* user chooses among: force-break long words, leave them alone, or die()?
* preserve existing indentation: chopped chunks from an indented line
are indented by same (like this line, not counting the asterisk!)
* optional list of things to preserve on line starts, default ">"
Note that the last two are essentially the same concept, so unify in
implementation and give a good interface to controlling them.
And how about:
Optionally, when encounter a line pre-indented by same as previous
line, then strip the newline and refill, but indent by the same.
Yeah...
Index: build.xml
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** build.xml 21 Apr 2003 14:17:54 -0000 1.28
--- build.xml 18 May 2003 09:41:50 -0000 1.29
***************
*** 2,11 ****
<!-- set global properties for this build -->
<property name="src" value="src"/>
<property name="build" value="build"/>
- <property name="versionString" value="1_3"/>
<property name="docs" value="docs"/>
<property name="resources" value="resources"/>
! <property name="dist" value="release/htmlparser${versionString}"/>
<property name="releaseDir" value="release"/>
<property name="finalLoc" value="distribution"/>
--- 2,19 ----
<!-- set global properties for this build -->
+ <!--
+ Note: These can be overridden on the command line, as in:
+ ant -DversionMinor=4 -DversionType=Release\ Build versionSource
+ -->
+ <property name="versionMajor" value="1"/>
+ <property name="versionMinor" value="3"/>
+ <property name="versionType" value="Integration Build"/>
+ <property name="versionNumber" value="${versionMajor}.${versionMinor}"/>
+ <property name="versionQualifier" value="${versionMajor}_${versionMinor}"/>
<property name="src" value="src"/>
<property name="build" value="build"/>
<property name="docs" value="docs"/>
<property name="resources" value="resources"/>
! <property name="dist" value="release/htmlparser${versionQualifier}"/>
<property name="releaseDir" value="release"/>
<property name="finalLoc" value="distribution"/>
***************
*** 18,55 ****
<echo message="**********************************"/>
<tstamp>
! <format property="TODAY" pattern="yyyyMMdd" locale="en"/>
! <format property="TODAY_STRING" pattern="MMM dd, yyyy"/>
</tstamp>
! <property name="version" value="1_3_${TODAY}"/>
! <property name="displayVersion" value=""1.3 (Integration Build ${TODAY_STRING})""/>
! <echo message="version=${version}"/>
! <echo message="displayVersion=${displayVersion}"/>
! <!-- set property VERSION_STRING to current display version -->
<loadproperties srcFile="${src}/org/htmlparser/Parser.java">
<filterchain>
<linecontains>
! <contains value="VERSION_STRING"/>
</linecontains>
</filterchain>
</loadproperties>
! <property name="previousDisplayVersion" value="${VERSION_STRING}"/>
! <echo message="Detected Previous Display Version = ${previousDisplayVersion}"/>
<!-- set property previousVersion to current version -->
! <loadfile srcFile="${src}/org/htmlparser/Parser.java" property="previousVersion">
<filterchain>
<headfilter lines="1"/>
<filterreader classname="org.apache.tools.ant.filters.StripLineBreaks">
! <param name="linebreaks" value=" - A java-based parser for HTML"/>
! </filterreader>
! <filterreader classname="org.apache.tools.ant.filters.StripLineBreaks">
! <param name="linebreaks" value="//Piy"/>
</filterreader>
<striplinebreaks/>
</filterchain>
</loadfile>
! <echo message="Detected Previous Version = ${previousVersion}"/>
</target>
--- 26,62 ----
<echo message="**********************************"/>
<tstamp>
! <format property="TODAY" pattern="yyyyMMdd" locale="en"/>
! <format property="TODAY_STRING" pattern="MMM dd, yyyy"/>
</tstamp>
! <property name="versionTag" value="${versionQualifier}_${TODAY}"/>
! <echo message="versionTag=${versionTag}"/>
! <!-- retrieve VERSION_XXX properties from Parser.java -->
<loadproperties srcFile="${src}/org/htmlparser/Parser.java">
<filterchain>
<linecontains>
! <contains value="VERSION_"/>
</linecontains>
+ <filterreader classname="org.apache.tools.ant.filters.StripLineBreaks">
+ <param name="linebreaks" value=")""/>
+ </filterreader>
</filterchain>
</loadproperties>
! <echo message="previous version number = ${VERSION_NUMBER}"/>
! <echo message="previous version type = ${VERSION_TYPE}"/>
! <echo message="previous version date = ${VERSION_DATE}"/>
<!-- set property previousVersion to current version -->
! <loadfile srcFile="${src}/org/htmlparser/Parser.java" property="previousTag">
<filterchain>
<headfilter lines="1"/>
<filterreader classname="org.apache.tools.ant.filters.StripLineBreaks">
! <param name="linebreaks" value="/Piy - A java-based parser for HTML"/>
</filterreader>
<striplinebreaks/>
</filterchain>
</loadfile>
! <echo message="previous version tag = ${previousTag}"/>
</target>
***************
*** 60,72 ****
<echo message="**********************************"/>
! <echo message="Replacing version ${previousVersion} with ${version} in all source files"/>
! <replace dir="${src}" value="${version}">
! <include name="**/*.java"/>
! <replacefilter token="${previousVersion}"/>
! </replace>
! <replace file="${src}/org/htmlparser/Parser.java" token="${previousDisplayVersion}" value="${displayVersion}"/>
! <replace file="${docs}/release.txt" token="${previousDisplayVersion}" value="${displayVersion}"/>
</target>
!
<target name="compile" description="compile all java files">
<echo message="**********************************"/>
--- 67,106 ----
<echo message="**********************************"/>
! <echo message="Replacing version VERSION_NUMBER = "${VERSION_NUMBER}" with VERSION_NUMBER = "${versionNumber}" in ${src}/org/htmlparser/Parser.java"/>
! <replace file="${src}/org/htmlparser/Parser.java" token="VERSION_NUMBER = "${VERSION_NUMBER}"" value="VERSION_NUMBER = "${versionNumber}""/>
!
! <echo message="Replacing version VERSION_TYPE = "${VERSION_TYPE}" with VERSION_TYPE = "${versionType}" in ${src}/org/htmlparser/Parser.java"/>
! <replace file="${src}/org/htmlparser/Parser.java" token="VERSION_TYPE = "${VERSION_TYPE}"" value="VERSION_TYPE = "${versionType}""/>
!
! <echo message="Replacing version VERSION_DATE = "${VERSION_DATE}" with VERSION_DATE = "${TODAY_STRING}" in ${src}/org/htmlparser/Parser.java"/>
! <replace file="${src}/org/htmlparser/Parser.java" token="VERSION_DATE = "${VERSION_DATE}"" value="VERSION_DATE = "${TODAY_STRING}""/>
!
! <echo message="Replacing version "${VERSION_NUMBER} (${VERSION_TYPE} ${VERSION_DATE})" with "${versionNumber} (${versionType} ${TODAY_STRING})" in ${docs}/release.txt"/>
! <replace dir="${docs}" value="${versionNumber} (${versionType} ${TODAY_STRING})">
! <include name="release.txt"/>
! <replacefilter token="${VERSION_NUMBER} (${VERSION_TYPE} ${VERSION_DATE})"/>
! </replace>
! <echo message="Replacing version tag ${previousTag} with ${versionTag} in all source files"/>
! <replace dir="${src}" value="${versionTag}">
! <include name="**/*.java"/>
! <replacefilter token="${previousTag}"/>
! </replace>
</target>
!
! <target name="changeLog" depends="init" description="create the change log from CVS logs">
! <!-- ant has a changelog task already, but it outputs XML and doesn't unify dates or spit them out in chronological order -->
! <!-- cvschangelog daysinpast="7" destfile="changelog.xml" / -->
! <!-- so we use cvs2cl instead -->
! <echo message="**********************************"/>
! <echo message="* Creating change log *"/>
! <echo message="**********************************"/>
! <echo message="./cvs2cl.pl --separate-header -l "-d'>${VERSION_DATE}'""/>
! <exec executable="./cvs2cl.pl">
! <arg value="--separate-header"/>
! <arg value="-l"/>
! <arg value="-d'>${VERSION_DATE}'"/>
! </exec>
! </target>
!
<target name="compile" description="compile all java files">
<echo message="**********************************"/>
|
|
From: <der...@us...> - 2003-05-17 12:12:53
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv30035/org/htmlparser/tests/tagTests
Modified Files:
TagTest.java
Log Message:
Fix tab handling on the suggestion of oyoaha (philippe blanc).
Rewrite some string handling methods to remove gross inefficiencies.
Index: TagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TagTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TagTest.java 12 May 2003 01:37:50 -0000 1.22
--- TagTest.java 17 May 2003 12:12:50 -0000 1.23
***************
*** 641,643 ****
--- 641,658 ----
assertStringEquals("Expected HTML","Jane Doe",htmlTag.getLabel());
}
+
+ /**
+ * From oyoaha
+ */
+ public void testTabText () throws ParserException
+ {
+ String testHTML = "<a\thref=\"http://cbc.ca\">";
+ createParser (testHTML);
+ parser.registerScanners ();
+ parseAndAssertNodeCount (1);
+ assertTrue("Node should be a LinkTag", node[0] instanceof LinkTag);
+ LinkTag tag = (LinkTag)node[0];
+ String href = tag.getAttribute ("HREF");
+ assertStringEquals("Resolved Link","http://cbc.ca", href);
+ }
}
|
1 message has been excluded from this view by a project administrator.
