Commit Graph

233 Commits (930213b663a22563a7134d7d8631426aaf8bd1f6)

Author SHA1 Message Date
yihua.huang 4f68368db0 Merge branch 'master' of git.oschina.net:flashsword20/webmagic
Conflicts:
	webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java
2014-03-13 08:09:37 +08:00
yihua.huang 98e2bba099 Merge branch 'master' of github.com:code4craft/webmagic
Conflicts:
	README.md
	pom.xml
	webmagic-core/pom.xml
	webmagic-extension/pom.xml
	webmagic-scripts/pom.xml
2014-03-13 08:07:33 +08:00
yihua.huang 757cc9b942 [maven-release-plugin] prepare for next development iteration 2014-03-13 07:49:51 +08:00
yihua.huang 63ffb5c792 [maven-release-plugin] prepare release webmaigc-0.4.3 2014-03-13 07:49:27 +08:00
yihua.huang 66d4d3c192 Merge branch 'master' into 0.4.x 2014-03-13 07:12:29 +08:00
yihua.huang af07280176 remove defend code for httpclient 4.3.1 because it is fixed in 4.3.3 #59 2014-03-13 07:11:56 +08:00
yihua.huang d5a978e00f update version back to 0.4.3 2014-03-13 06:55:05 +08:00
yihua.huang 55368919df add attribute 'text' support for CssSelector #66 2014-03-11 13:18:34 +08:00
yihua.huang 88b50d4182 bigfix: cycleTry will not work when spawnUrl is set to false #62 2014-03-04 07:33:07 +08:00
yihua.huang 2768a1cae4 add test for cycleTriedTimes and fix cycleTriedTimes inc error #60 2014-03-01 15:10:38 +08:00
yihua.huang bbd0d7e600 update httpclient version to 4.3.3 #59 2014-02-28 21:17:02 +08:00
yihua.huang 571061454a #58 add CYCLE_TRIED_TIMES support to QueueScheduler and PriorityScheduler 2014-02-27 23:54:30 +08:00
yihua.huang 0e98183f74 Change log4j to slf4j #55 2014-02-12 09:35:57 +08:00
yihua.huang fa33b15843 property loader 2014-02-11 23:07:31 +08:00
yihua.huang af809c4d55 update version to 0.5.0-snapshot 2014-02-11 22:16:01 +08:00
Almark Ming 2b46b11e55 Update RegexSelector.java
Optimize regex format check

Conflicts:
	webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java
2013-12-21 08:38:17 +08:00
Almark Ming 91ed66ecac Update RegexSelector.java 2013-12-17 16:57:22 +08:00
Almark Ming 83926970b2 Check valid left parenthesis 2013-12-17 16:55:53 +08:00
yihua.huang b51fb2696b update ut for cookie 2013-12-06 00:30:01 +08:00
yihua.huang ff2f588c41 #48 nullpointer exception 2013-12-04 22:11:20 +08:00
yihua.huang fc97cb58c5 update lib and version 2013-12-04 00:04:29 +08:00
yihua.huang 7c41bec92f Merge branch 'master' of github.com:code4craft/webmagic
Conflicts:
	README.md
	webmagic-samples/pom.xml
	webmagic-selenium/pom.xml
2013-12-03 23:50:26 +08:00
yihua.huang d274310cb2 [maven-release-plugin] prepare for next development iteration 2013-12-03 23:35:06 +08:00
yihua.huang e8c32a32dc [maven-release-plugin] prepare release webmagic-0.4.2 2013-12-03 23:34:57 +08:00
yihua.huang 6a828e923c #46 Downloader thread hang up when timeout 2013-12-03 09:59:54 +08:00
shijinping 9a524aa364 double-check 中再取次httpClient的内容 2013-11-28 14:38:30 +08:00
yihua.huang fd23cb6dc0 Merge branch 'master' of github.com:code4craft/webmagic
Conflicts:
	README.md
	pom.xml
	webmagic-samples/pom.xml
	webmagic-selenium/pom.xml
2013-11-28 13:40:24 +08:00
yihua.huang e7083dc39d [maven-release-plugin] prepare for next development iteration 2013-11-28 13:04:32 +08:00
yihua.huang ae623567b3 [maven-release-plugin] prepare release webmagic-0.4.1 2013-11-28 13:04:22 +08:00
yihua.huang 59ad4cad27 #42 Add jsonpath in annotation mode for json result 2013-11-28 08:25:16 +08:00
yihua.huang c2d6d495b3 #41 add getThreadAlive(),getStatus,getPageCount() to spider 2013-11-28 07:59:24 +08:00
yihua.huang cf62d707e0 #36 Spider does not exit when success 2013-11-27 23:33:18 +08:00
yihua.huang a01312930a #39 Parsing html after page.getHtml() 2013-11-27 22:01:34 +08:00
yihua.huang f63d33b457 update some comments 2013-11-27 21:06:53 +08:00
yihua.huang 04fcf3193f #38 Change algorithm of SmartContentSelector 2013-11-23 13:56:55 +08:00
yihua.huang 296a68920e fix javadoc and add setPipelines() for spider 2013-11-14 13:23:29 +08:00
yihua.huang 47a0360783 #35 add status code to page 2013-11-12 11:51:34 +08:00
yihua.huang bc5c30de17 update scripts 2013-11-12 08:20:59 +08:00
yihua.huang f9daae39cf [maven-release-plugin] prepare for next development iteration 2013-11-11 14:33:11 +08:00
yihua.huang fdb9441519 [maven-release-plugin] prepare release webmagic-0.4.0 2013-11-11 14:33:01 +08:00
yihua.huang 1d75ae7f5b rollback version to 0.4.0 because not deploy success 2013-11-11 11:52:56 +08:00
yihua.huang df8ca8ad09 add scripts 2013-11-10 22:30:48 +08:00
yihua.huang e40b48e77b Merge tag 'webmagic-0.4.0' of github.com:code4craft/webmagic
[maven-release-plugin]  copy for tag webmagic-0.4.0

Conflicts:
	pom.xml
	webmagic-core/pom.xml
	webmagic-extension/pom.xml
2013-11-06 22:48:26 +08:00
yihua.huang 775eb9732f [maven-release-plugin] prepare for next development iteration 2013-11-06 22:17:58 +08:00
yihua.huang 0b4fadc24d [maven-release-plugin] prepare release webmagic-0.4.0 2013-11-06 22:17:47 +08:00
yihua.huang fe6d9bb2e2 get keep-alive rework 2013-11-06 21:53:39 +08:00
yihua.huang fd6d2fd6f8 try to keepalive TCP connection 2013-11-06 21:19:14 +08:00
yihua.huang 425df08523 update version to 0.4.0 2013-11-06 12:50:45 +08:00
yihua.huang e046bb0723 remove useless code 2013-11-06 12:48:14 +08:00
yihua.huang 6e32a19f80 update api for direct download 2013-11-06 12:46:50 +08:00