Revision 44750 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/date/DateFunction.java
DateFunction.java | ||
---|---|---|
4 | 4 |
import java.text.SimpleDateFormat; |
5 | 5 |
import java.util.Date; |
6 | 6 |
import org.apache.commons.lang3.Range; |
7 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_DATE; |
|
8 | 7 |
import org.gvsig.expressionevaluator.Interpreter; |
9 | 8 |
import org.gvsig.expressionevaluator.spi.AbstractFunction; |
9 |
import static org.gvsig.expressionevaluator.ExpressionBuilder.FUNCTION_DATE; |
|
10 | 10 |
|
11 | 11 |
public class DateFunction extends AbstractFunction { |
12 | 12 |
|
13 | 13 |
public DateFunction() { |
14 |
super("Date", FUNCTION_DATE,Range.between(1,2),
|
|
14 |
super("Date", FUNCTION_DATE,Range.is(1),
|
|
15 | 15 |
"Returns a date from the arguments", |
16 |
FUNCTION_DATE+"({{date}}, format)",
|
|
16 |
FUNCTION_DATE+"({{date}})", |
|
17 | 17 |
new String[]{ |
18 |
"date - a string with a date", |
|
19 |
"format - Optional. Format to use to parse the date" |
|
18 |
"date - a string with a date" |
|
20 | 19 |
}, |
21 | 20 |
"Date" |
22 | 21 |
); |
... | ... | |
38 | 37 |
return x; |
39 | 38 |
} |
40 | 39 |
String date = getStr(args, 0); |
41 |
String format = null; |
|
42 |
if( args.length==2 ) { |
|
43 |
format = getStr(args, 1); |
|
44 |
} |
|
45 |
SimpleDateFormat df = new SimpleDateFormat(); |
|
46 |
if( format != null ) { |
|
47 |
df.applyPattern(format); |
|
48 |
} |
|
40 |
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); |
|
49 | 41 |
try { |
50 | 42 |
Date x = df.parse(date); |
51 | 43 |
x.setHours(0); |
... | ... | |
53 | 45 |
x.setSeconds(0); |
54 | 46 |
return x; |
55 | 47 |
} catch (ParseException ex) { |
56 |
throw new RuntimeException("Can't parse date value '"+date+"' with format '"+format==null?"":format+"'", ex);
|
|
48 |
throw new RuntimeException("Can't parse date value '"+date+"', expected format 'yyyy-MM-dd'.", ex);
|
|
57 | 49 |
} |
58 | 50 |
|
59 | 51 |
} |
Also available in: Unified diff