[Stacomir-commits] r304 - in pkg: stacomir/R stacomirtools/R

[noreply at r-forge.r-project.org]

Author: briand
Date: 2017-03-16 10:34:57 +0100 (Thu, 16 Mar 2017)
New Revision: 304

Modified:
   pkg/stacomir/R/BilanMigrationMult.r
   pkg/stacomirtools/R/RequeteODBCwheredate.r
Log:


Modified: pkg/stacomir/R/BilanMigrationMult.r
===================================================================
--- pkg/stacomir/R/BilanMigrationMult.r	2017-03-16 09:00:49 UTC (rev 303)
+++ pkg/stacomir/R/BilanMigrationMult.r	2017-03-16 09:34:57 UTC (rev 304)
@@ -276,8 +276,8 @@
 			req at colonnedebut<-"ope_date_debut"
 			req at colonnefin<-"ope_date_fin"
 			# we round the date to be consistent with daily values from the 
-			req at datedebut=as.POSIXlt(as.Date(bilanMigrationMult at pasDeTemps@dateDebut,tz=Sys.timezone()))
-			req at datefin=as.POSIXlt(as.Date(DateFin(bilanMigrationMult at pasDeTemps),tz=Sys.timezone()))
+			req at datedebut=bilanMigrationMult at pasDeTemps@dateDebut
+			req at datefin=as.POSIXlt(DateFin(bilanMigrationMult at pasDeTemps)+as.difftime("23:59:59"))
 			dc = vector_to_listsql(bilanMigrationMult at dc@dc_selectionne)
 			tax=vector_to_listsql(bilanMigrationMult at taxons@data$tax_code)
 			std=vector_to_listsql(bilanMigrationMult at stades@data$std_code)

Modified: pkg/stacomirtools/R/RequeteODBCwheredate.r
===================================================================
--- pkg/stacomirtools/R/RequeteODBCwheredate.r	2017-03-16 09:00:49 UTC (rev 303)
+++ pkg/stacomirtools/R/RequeteODBCwheredate.r	2017-03-16 09:34:57 UTC (rev 304)
@@ -28,8 +28,8 @@
 			requeteODBCwhere=new("RequeteODBCwhere")
 			requeteODBCwhere at where=paste("WHERE (",from at colonnedebut,
 					", ",from at colonnefin,
-					") overlaps (DATE '",
-					from at datedebut,"',DATE '",
+					") overlaps (timestamp without time zone '",
+					from at datedebut,"',timestamp without time zone '",
 					from at datefin,"') ")
 			requeteODBCwhere at and=paste(from at and,sep=" ") # concatenation du vecteur
 			requeteODBCwhere at select=from at select