fix #2065 parse pdf_date

This commit is contained in:
Shinsuke Sugaya 2019-03-26 06:52:30 +09:00
parent 79bd447c59
commit db2364e238
2 changed files with 13 additions and 5 deletions

View file

@ -402,6 +402,8 @@ public class Constants extends CoreLibConstants {
public static final String MAPPING_TYPE_DATE = "date";
public static final String MAPPING_TYPE_PDF_DATE = "pdf_date";
public static final String PAGING_QUERY_LIST = "pagingQueryList";
public static final String REQUEST_LANGUAGES = "requestLanguages";

View file

@ -138,11 +138,17 @@ public abstract class AbstractFessFileTransformer extends AbstractTransformer im
dataMap.put(mapping.getValue1(), Long.parseLong(values[0]));
} else if (Constants.MAPPING_TYPE_DOUBLE.equalsIgnoreCase(mapping.getValue2())) {
dataMap.put(mapping.getValue1(), Double.parseDouble(values[0]));
} else if (Constants.MAPPING_TYPE_DATE.equalsIgnoreCase(mapping.getValue2())) {
final Date dt =
FessFunctions.parseDate(values[0],
StringUtil.isNotBlank(mapping.getValue3()) ? mapping.getValue3()
: Constants.DATE_OPTIONAL_TIME);
} else if (Constants.MAPPING_TYPE_DATE.equalsIgnoreCase(mapping.getValue2())
|| Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) {
final String dateFormate;
if (StringUtil.isNotBlank(mapping.getValue3())) {
dateFormate = mapping.getValue3();
} else if (Constants.MAPPING_TYPE_PDF_DATE.equalsIgnoreCase(mapping.getValue2())) {
dateFormate = mapping.getValue2();
} else {
dateFormate = Constants.DATE_OPTIONAL_TIME;
}
final Date dt = FessFunctions.parseDate(values[0], dateFormate);
if (dt != null) {
dataMap.put(mapping.getValue1(), FessFunctions.formatDate(dt));
} else {