Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1762: DateFormatTransformer does not work correctly with non-default locale dates 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@907562 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2010-02-08 06:57:53 +00:00
parent 63754a9572
commit ce39a0b12f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/dataimporthandler/CHANGES.txt
View File

@ -55,6 +55,8 @@ Bug Fixes
* SOLR-1759: $skipDoc was not working correctly (Gian Marco Tagliani via noble)
* SOLR-1762: DateFormatTransformer does not work correctly with non-default locale dates (tommy chheng via noble)
Other Changes
----------------------

15
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
View File

@ -47,7 +47,14 @@ public class DateFormatTransformer extends Transformer {
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> aRow, Context context) {
for (Map<String, String> map : context.getAllEntityFields()) {
Locale locale = Locale.getDefault();
String customLocale = map.get("locale");
if(customLocale != null){
locale = new Locale(customLocale);
}
String fmt = map.get(DATE_TIME_FMT);
if (fmt == null)
continue;
@ -61,12 +68,12 @@ public class DateFormatTransformer extends Transformer {
List inputs = (List) o;
List<Date> results = new ArrayList<Date>();
for (Object input : inputs) {
results.add(process(input, fmt));
results.add(process(input, fmt, locale));
}
aRow.put(column, results);
} else {
if (o != null) {
aRow.put(column, process(o, fmt));
aRow.put(column, process(o, fmt, locale));
}
}
} catch (ParseException e) {
@ -76,14 +83,14 @@ public class DateFormatTransformer extends Transformer {
return aRow;
}
private Date process(Object value, String format) throws ParseException {
private Date process(Object value, String format, Locale locale) throws ParseException {
if (value == null) return null;
String strVal = value.toString().trim();
if (strVal.length() == 0)
return null;
SimpleDateFormat fmt = fmtCache.get(format);
if (fmt == null) {
fmt = new SimpleDateFormat(format);
fmt = new SimpleDateFormat(format, locale);
fmtCache.put(format, fmt);
}
return fmt.parse(strVal);