Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
webmagic
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
沈俊林
webmagic
Commits
1bdffc1e
Commit
1bdffc1e
authored
Dec 20, 2013
by
黄亿华
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request !337 from Almark Ming/master
parents
0c3ff3d6
91ed66ec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
102 additions
and
93 deletions
+102
-93
RegexSelector.java
...in/java/us/codecraft/webmagic/selector/RegexSelector.java
+102
-93
No files found.
webmagic-core/src/main/java/us/codecraft/webmagic/selector/RegexSelector.java
View file @
1bdffc1e
...
...
@@ -26,12 +26,21 @@ public class RegexSelector implements Selector {
if
(
StringUtils
.
isBlank
(
regexStr
))
{
throw
new
IllegalArgumentException
(
"regex must not be empty"
);
}
/* Can't detect '\(', '(?:)' so that would result in ArrayIndexOutOfBoundsException
if (!StringUtils.contains(regexStr, "(") && !StringUtils.contains(regexStr, ")")) {
regexStr = "(" + regexStr + ")";
}
if (!StringUtils.contains(regexStr, "(") || !StringUtils.contains(regexStr, ")")) {
throw new IllegalArgumentException("regex must have capture group 1");
}
*/
// Try to fix: Only check if there exists the valid left parenthesis, leave regexp validation for Pattern
if
(
StringUtils
.
countMatches
(
regexStr
,
"("
)
-
StringUtils
.
countMatches
(
regexStr
,
"\\\\\\("
)
==
StringUtils
.
countMatches
(
regexStr
,
"(?:"
)
-
StringUtils
.
countMatches
(
regexStr
,
"\\\\\\(?:"
))
{
regexStr
=
"("
+
regexStr
+
")"
;
}
this
.
regexStr
=
regexStr
;
try
{
regex
=
Pattern
.
compile
(
regexStr
,
Pattern
.
DOTALL
|
Pattern
.
CASE_INSENSITIVE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment