Author: mickw
Date: 2006-10-19 11:09:52 +0200 (Thu, 19 Oct 2006)
New Revision: 3812
Modified:
branches/2.5/src/javacc/QueryParserImpl.jj
Log:
simplify phone numbers as little. we were matching short numbers like "70". no
good.
Modified: branches/2.5/src/javacc/QueryParserImpl.jj
===================================================================
--- branches/2.5/src/javacc/QueryParserImpl.jj 2006-10-19 09:06:51 UTC (rev
3811)
+++ branches/2.5/src/javacc/QueryParserImpl.jj 2006-10-19 09:09:52 UTC (rev
3812)
@@ -110,10 +110,10 @@
<DEFAULT,URL_DISABLED,PHONE_NUMBER_DISABLED,NUMBER_GROUP_DISABLED,QUOTED_WORD_DISABLED>
TOKEN : { <EMAIL: <WORD>"@"<WORD>"."<WORD>> }
-// Very generic to match any Internation Phone Number !! Based off example
from http://www.weberdev.com/ViewArticle/461
+// Very generic to match any Internation Phone Number !!
// TODO deal with optional area codes. eg australian numbers can be written
(02) 4878 9336
<DEFAULT,URL_DISABLED,EMAIL_DISABLED,QUOTED_WORD_DISABLED>
-TOKEN : { <PHONE_NUMBER:
(("+"|"00"(<PHONE_MIDDLE>)?)?((<DIGIT>){1,3}(<PHONE_MIDDLE>)?)?((<DIGIT>){1,5}(<PHONE_MIDDLE>)?){1,3})"
"> }
+TOKEN : { <PHONE_NUMBER:
(("+"|"00"(<PHONE_MIDDLE>)?)?(<DIGIT>(<PHONE_MIDDLE>)?){7,14})" "> }
// Also prevent organisation numbers when phone numbers are disabled. Prevents
a cyclic loop.
<DEFAULT,URL_DISABLED,EMAIL_DISABLED,PHONE_NUMBER_DISABLED,QUOTED_WORD_DISABLED>
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
