hammant 02/01/07 23:04:06
Modified: apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql
SelectColumnHelper.java
Added: apps/db/src/java/org/apache/avalon/db/functions/impl
DayNameTemporalFunction.java
Log:
More functions from Larry McCay
Revision Changes Path
1.8 +5 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/SelectColumnHelper.java
Index: SelectColumnHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/handlers/lxsql/SelectColumnHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SelectColumnHelper.java 4 Jan 2002 21:53:49 -0000 1.7
+++ SelectColumnHelper.java 8 Jan 2002 07:04:06 -0000 1.8
@@ -46,7 +46,7 @@
import org.apache.avalon.db.functions.impl.HourMinuteSecondTemporalFunction;
import
org.apache.avalon.db.functions.impl.DayHourMinuteSecondTemporalFunction;
import org.apache.avalon.db.functions.impl.YearMonthTemporalFunction;
-//>>>>>>> 1.6
+import org.apache.avalon.db.functions.impl.DayNameTemporalFunction;
import org.apache.avalon.db.functions.StringFunction;
import org.apache.avalon.db.functions.NumericFunction;
import org.apache.avalon.db.functions.Function;
@@ -65,7 +65,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class SelectColumnHelper {
@@ -121,6 +121,8 @@
return getColumnFromFunction(queryable, elem, new
MinuteIntegerFunction(), colHldr);
} else if (nodeName.equals("month")) {
return getColumnFromFunction(queryable, elem, new
MonthIntegerFunction(), colHldr);
+ } else if (nodeName.equals("dayname")) {
+ return getColumnFromFunction(queryable, elem, new
DayNameTemporalFunction(), colHldr);
} else if (nodeName.equals("yearmonth")) {
return getColumnFromFunction(queryable, elem, new
YearMonthTemporalFunction(), colHldr);
} else if (nodeName.equals("daysecond")) {
@@ -220,3 +222,4 @@
}
}
}
+
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/functions/impl/DayNameTemporalFunction.java
Index: DayNameTemporalFunction.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.db.functions.impl;
import org.apache.avalon.db.data.Row;
import org.apache.avalon.db.data.types.StringColumn;
import org.apache.avalon.db.data.types.TemporalColumn;
import java.util.Date;
import java.util.Calendar;
import java.util.GregorianCalendar;
/**
* Class CurrentDateTemporalFunction
*
* @author Larry McCay <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public class DayNameTemporalFunction extends AbstractTemporalStringFunction {
//TODO use SimpleDateFormat instead to be language independant.
final String[] mDaysOfWeek = {
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
"Saturday"
};
/**
* Constructor DayNameTemporalFunction
*
*
*/
public DayNameTemporalFunction() {
super(9);
}
/**
* Method getMaxLength
*
*
* @return
*
*/
public int getMaxLength() {
return 9;
}
/**
* Method getStringValue
*
*
* @param row
*
* @return
*
*/
public String getStringValue(Row row) {
TemporalColumn tc = (TemporalColumn) mColumns[0];
Date date = (Date) tc.getValue(row);
mGregorianCalendar.setTime(date);
int dayofweek = mGregorianCalendar.get(Calendar.DAY_OF_WEEK);
return mDaysOfWeek[dayofweek - 1];
}
/**
* Method getMinCols
*
*
* @return
*
*/
public int getMinCols() {
return 1;
}
/**
* Method getMaxCols
*
*
* @return
*
*/
public int getMaxCols() {
return 1;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>