Update of /cvsroot/nutch/nutch/src/java/net/nutch/analysis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1927/src/java/net/nutch/analysis
Modified Files:
NutchAnalysis.java NutchAnalysis.jj
Log Message:
Fixed a bug parsing urls in queries.
Index: NutchAnalysis.jj
===================================================================
RCS file: /cvsroot/nutch/nutch/src/java/net/nutch/analysis/NutchAnalysis.jj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NutchAnalysis.jj 2 Sep 2004 22:39:23 -0000 1.9
--- NutchAnalysis.jj 29 Sep 2004 18:55:35 -0000 1.10
***************
*** 181,185 ****
// optional field spec.
! ( LOOKAHEAD(2) token=<WORD> <COLON> { field = token.image; } )?
( terms=phrase(field) {stop=false;} | // quoted terms or
--- 181,186 ----
// optional field spec.
! ( LOOKAHEAD(<WORD><COLON>(phrase(field)|compound(field)))
! token=<WORD> <COLON> { field = token.image; } )?
( terms=phrase(field) {stop=false;} | // quoted terms or
Index: NutchAnalysis.java
===================================================================
RCS file: /cvsroot/nutch/nutch/src/java/net/nutch/analysis/NutchAnalysis.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NutchAnalysis.java 2 Sep 2004 22:39:23 -0000 1.9
--- NutchAnalysis.java 29 Sep 2004 18:55:34 -0000 1.10
***************
*** 97,104 ****
;
}
! if (jj_2_1(2)) {
token = jj_consume_token(WORD);
jj_consume_token(COLON);
! field = token.image;
} else {
;
--- 97,104 ----
;
}
! if (jj_2_1(2147483647)) {
token = jj_consume_token(WORD);
jj_consume_token(COLON);
! field = token.image;
} else {
;
***************
*** 416,442 ****
}
! final private boolean jj_3R_15() {
! if (jj_3R_13()) return true;
return false;
}
! final private boolean jj_3R_16() {
! if (jj_3R_12()) return true;
return false;
}
final private boolean jj_3R_10() {
! if (jj_3R_13()) return true;
return false;
}
! final private boolean jj_3_3() {
Token xsp;
xsp = jj_scanpos;
! if (jj_scan_token(15)) {
jj_scanpos = xsp;
! if (jj_3R_10()) {
jj_scanpos = xsp;
! if (jj_3R_11()) return true;
}
}
--- 416,512 ----
}
! final private boolean jj_3R_24() {
! if (jj_3R_18()) return true;
return false;
}
! final private boolean jj_3R_11() {
! Token xsp;
! xsp = jj_scanpos;
! if (jj_scan_token(1)) {
! jj_scanpos = xsp;
! if (jj_scan_token(2)) {
! jj_scanpos = xsp;
! if (jj_scan_token(3)) return true;
! }
! }
! return false;
! }
!
! final private boolean jj_3R_20() {
! if (jj_3R_11()) return true;
! Token xsp;
! while (true) {
! xsp = jj_scanpos;
! if (jj_3R_24()) { jj_scanpos = xsp; break; }
! }
! return false;
! }
!
! final private boolean jj_3R_9() {
! if (jj_3R_15()) return true;
! return false;
! }
!
! final private boolean jj_3R_22() {
! if (jj_3R_17()) return true;
! return false;
! }
!
! final private boolean jj_3R_19() {
! if (jj_3R_18()) return true;
! return false;
! }
!
! final private boolean jj_3R_12() {
! if (jj_3R_17()) return true;
return false;
}
final private boolean jj_3R_10() {
! if (jj_3R_16()) return true;
return false;
}
! final private boolean jj_3_2() {
! Token xsp;
! if (jj_3R_10()) return true;
! while (true) {
! xsp = jj_scanpos;
! if (jj_3R_10()) { jj_scanpos = xsp; break; }
! }
! if (jj_3R_11()) return true;
! return false;
! }
!
! final private boolean jj_3R_14() {
! if (jj_scan_token(QUOTE)) return true;
! Token xsp;
! while (true) {
! xsp = jj_scanpos;
! if (jj_3R_19()) { jj_scanpos = xsp; break; }
! }
! while (true) {
! xsp = jj_scanpos;
! if (jj_3R_20()) { jj_scanpos = xsp; break; }
! }
! if (jj_scan_token(QUOTE)) return true;
! return false;
! }
!
! final private boolean jj_3R_17() {
Token xsp;
xsp = jj_scanpos;
! if (jj_scan_token(10)) {
jj_scanpos = xsp;
! if (jj_scan_token(11)) {
jj_scanpos = xsp;
! if (jj_scan_token(12)) {
! jj_scanpos = xsp;
! if (jj_scan_token(13)) {
! jj_scanpos = xsp;
! if (jj_scan_token(14)) return true;
! }
! }
}
}
***************
*** 444,501 ****
}
final private boolean jj_3R_8() {
! if (jj_3R_12()) return true;
return false;
}
! final private boolean jj_3_2() {
Token xsp;
! if (jj_3R_8()) return true;
while (true) {
xsp = jj_scanpos;
! if (jj_3R_8()) { jj_scanpos = xsp; break; }
}
! if (jj_3R_9()) return true;
return false;
}
! final private boolean jj_3R_11() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(7)) {
jj_scanpos = xsp;
! if (jj_scan_token(8)) return true;
}
- if (jj_3R_14()) return true;
return false;
}
! final private boolean jj_3R_14() {
Token xsp;
! xsp = jj_scanpos;
! if (jj_scan_token(15)) {
! jj_scanpos = xsp;
! if (jj_3R_16()) {
! jj_scanpos = xsp;
! if (jj_scan_token(0)) return true;
! }
}
return false;
}
! final private boolean jj_3R_13() {
Token xsp;
xsp = jj_scanpos;
! if (jj_scan_token(10)) {
! jj_scanpos = xsp;
! if (jj_scan_token(11)) {
! jj_scanpos = xsp;
! if (jj_scan_token(12)) {
jj_scanpos = xsp;
! if (jj_scan_token(13)) {
jj_scanpos = xsp;
! if (jj_scan_token(14)) return true;
! }
! }
}
}
--- 514,574 ----
}
+ final private boolean jj_3R_25() {
+ if (jj_3R_16()) return true;
+ return false;
+ }
+
final private boolean jj_3R_8() {
! if (jj_3R_14()) return true;
return false;
}
! final private boolean jj_3R_21() {
Token xsp;
! if (jj_3R_25()) return true;
while (true) {
xsp = jj_scanpos;
! if (jj_3R_25()) { jj_scanpos = xsp; break; }
}
! if (jj_3R_11()) return true;
return false;
}
! final private boolean jj_3R_16() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(7)) {
jj_scanpos = xsp;
! if (jj_scan_token(8)) {
! jj_scanpos = xsp;
! if (jj_3R_22()) return true;
! }
}
return false;
}
! final private boolean jj_3R_15() {
! if (jj_3R_11()) return true;
Token xsp;
! while (true) {
! xsp = jj_scanpos;
! if (jj_3R_21()) { jj_scanpos = xsp; break; }
}
return false;
}
! final private boolean jj_3R_23() {
! if (jj_3R_16()) return true;
! return false;
! }
!
! final private boolean jj_3_3() {
Token xsp;
xsp = jj_scanpos;
! if (jj_scan_token(15)) {
jj_scanpos = xsp;
! if (jj_3R_12()) {
jj_scanpos = xsp;
! if (jj_3R_13()) return true;
}
}
***************
*** 506,533 ****
if (jj_scan_token(WORD)) return true;
if (jj_scan_token(COLON)) return true;
return false;
}
! final private boolean jj_3R_12() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(7)) {
jj_scanpos = xsp;
! if (jj_scan_token(8)) {
! jj_scanpos = xsp;
! if (jj_3R_15()) return true;
! }
}
return false;
}
! final private boolean jj_3R_9() {
Token xsp;
xsp = jj_scanpos;
! if (jj_scan_token(1)) {
jj_scanpos = xsp;
! if (jj_scan_token(2)) {
jj_scanpos = xsp;
! if (jj_scan_token(3)) return true;
}
}
--- 579,610 ----
if (jj_scan_token(WORD)) return true;
if (jj_scan_token(COLON)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_8()) {
+ jj_scanpos = xsp;
+ if (jj_3R_9()) return true;
+ }
return false;
}
! final private boolean jj_3R_13() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(7)) {
jj_scanpos = xsp;
! if (jj_scan_token(8)) return true;
}
+ if (jj_3R_18()) return true;
return false;
}
! final private boolean jj_3R_18() {
Token xsp;
xsp = jj_scanpos;
! if (jj_scan_token(15)) {
jj_scanpos = xsp;
! if (jj_3R_23()) {
jj_scanpos = xsp;
! if (jj_scan_token(0)) return true;
}
}
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Nutch-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/nutch-cvs
