You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/03/22 08:24:39 UTC
svn commit: r757140 - in /lucene/solr/trunk/contrib/dataimporthandler:
CHANGES.txt
src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
Author: shalin
Date: Sun Mar 22 07:24:39 2009
New Revision: 757140
URL: http://svn.apache.org/viewvc?rev=757140&view=rev
Log:
SOLR-1080 -- RegexTransformer should not replace if regex is not matched
Modified:
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=757140&r1=757139&r2=757140&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Sun Mar 22 07:24:39 2009
@@ -195,6 +195,9 @@
23.SOLR-1077: IndexOutOfBoundsException with useSolrAddSchema in XPathEntityProcessor.
(Sam Keen, Noble Paul via shalin)
+24.SOLR-1080: RegexTransformer should not replace if regex is not matched.
+ (Noble Paul via shalin)
+
Documentation
----------------------
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java?rev=757140&r1=757139&r2=757140&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java Sun Mar 22 07:24:39 2009
@@ -124,7 +124,8 @@
return readBySplit(splitBy, value);
} else if (replaceWith != null) {
Pattern p = getPattern(reStr);
- return p.matcher(value).replaceAll(replaceWith);
+ Matcher m = p.matcher(value);
+ return m.find()? m.replaceAll(replaceWith): null;
} else {
return readfromRegExp(reStr, value, col, groupNames);
}