Index: packages/rules/_ruleHandpicked/selectObjects.cfm
===================================================================
RCS file: /cvs/farcry/farcry_core/packages/rules/_ruleHandpicked/selectObjects.cfm,v
retrieving revision 1.12
diff -u -r1.12 selectObjects.cfm
--- packages/rules/_ruleHandpicked/selectObjects.cfm	2 Jun 2004 00:47:40 -0000	1.12
+++ packages/rules/_ruleHandpicked/selectObjects.cfm	9 Aug 2004 17:13:04 -0000
@@ -26,6 +26,8 @@
 
 <cffunction name="getMinTypeDate">
 	<cfargument name="typename">
+	<cfset var q = "">
+	<cfset var minDate = Now()>
 	<cfquery name="q" datasource="#application.dsn#">
 		SELECT min(datetimelastupdated) as mindate
 		FROM #application.dbowner##arguments.typename#
@@ -36,11 +38,14 @@
 	<cfelse>
 		<cfset mindate = q.mindate>
 	</cfif>
-	<cfreturn mindate>
+	<cfset minDate = DateAdd("d",-7,minDate)>
+	<cfreturn minDate>
 </cffunction>	
 
 <cffunction name="getMaxTypeDate">
 	<cfargument name="typename">
+	<cfset var q = "">
+	<cfset var maxDate = Now()>
 	<cfquery name="q" datasource="#application.dsn#">
 		SELECT max(datetimelastupdated) as maxdate
 		FROM #application.dbowner##arguments.typename#
@@ -51,7 +56,8 @@
 	<cfelse>
 		<cfset maxdate = q.maxdate>
 	</cfif>
-	<cfreturn maxdate>
+	<cfset maxDate = DateAdd("d",1,maxDate)>
+	<cfreturn maxDate>
 </cffunction>	
 
 
@@ -83,14 +89,14 @@
 <cfparam name="output.minyear" default="#year(getMinTypeDate(output.dmtype))#">--->
 <cfset output.startyear = #year(getMinTypeDate(output.dmtype))#>
 <cfset output.endyear = #year(getMaxTypeDate(output.dmtype))#>
-<cfset output.maxday = #day(getMaxTypeDate(output.dmtype)+1)#>
+<cfset output.maxday = #day(getMaxTypeDate(output.dmtype))#>
 <cfset output.maxmonth = #month(getMaxTypeDate(output.dmtype))#>
 <cfset output.maxyear = #year(getMaxTypeDate(output.dmtype))#>
-<cfset output.minday = #day(getMinTypeDate(output.dmtype)-7)#>
+<cfset output.minday = #day(getMinTypeDate(output.dmtype))#>
 <cfset output.minmonth = #month(getMinTypeDate(output.dmtype))#>
 <cfset output.minyear = #year(getMinTypeDate(output.dmtype))#>
 
-
+<!---
 	<cfscript>
 	if (output.maxday GT daysInMonth(createDate(output.maxyear,output.maxmonth,1)))
 	{
@@ -111,6 +117,7 @@
 		}	
 	}	
 	</cfscript>
+--->
 
 
 <cfparam name="output.orderby" default="label">