s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a little more solid (it's possible to have both Dates and Calendars in there)

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1239 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-08-31 19:12:11 +00:00
parent 3648883e0c
commit 860d6c4ee2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/com/google/gridworks/expr/functions/strings/Diff.java
View File

@ -1,5 +1,6 @@
package com.google.gridworks.expr.functions.strings;
import java.util.Calendar;
import java.util.Date;
import java.util.Properties;
@ -20,12 +21,12 @@ public class Diff implements Function {
if (o1 != null && o2 != null) {
if (o1 instanceof String && o2 instanceof String) {
return StringUtils.difference((String) o1,(String) o2);
} else if (o1 instanceof Date && args.length == 3) {
} else if ((o1 instanceof Date || o1 instanceof Calendar) && args.length == 3) {
Object o3 = args[3];
if (o3 != null && o3 instanceof String) {
try {
String unit = ((String) o3).toLowerCase();
Date c1 = (Date) o1;
Date c1 = (o1 instanceof Date) ? (Date) o1 : ((Calendar) o1).getTime();
Date c2 = (o2 instanceof Date) ? (Date) o2 : CalendarParser.parse((o2 instanceof String) ? (String) o2 : o2.toString()).getTime();
long delta = (c1.getTime() - c2.getTime()) / 1000;
if ("seconds".equals(unit)) return delta;