From 3644e0593c699a596600464bce9517b7c128b257 Mon Sep 17 00:00:00 2001 From: TrystanLea Date: Wed, 22 Aug 2018 13:11:19 +0100 Subject: [PATCH] modify phptimeseries DMY fn to return same as PHPFina --- Modules/feed/engine/PHPTimeSeries.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Modules/feed/engine/PHPTimeSeries.php b/Modules/feed/engine/PHPTimeSeries.php index 478135288..3f624f874 100644 --- a/Modules/feed/engine/PHPTimeSeries.php +++ b/Modules/feed/engine/PHPTimeSeries.php @@ -295,10 +295,12 @@ public function get_data_DMY($id,$start,$end,$mode,$timezone) if ($timezone===0) $timezone = "UTC"; $date->setTimezone(new DateTimeZone($timezone)); $date->setTimestamp($start); + $date->modify("midnight"); - if ($mode=="weekly") $date->modify("this monday"); - if ($mode=="monthly") $date->modify("first day of this month"); - + $increment="+1 day"; + if ($mode=="weekly") { $date->modify("this monday"); $increment="+1 week"; } + if ($mode=="monthly") { $date->modify("first day of this month"); $increment="+1 month"; } + $fh = fopen($this->dir."feed_$id.MYD", 'rb'); $filesize = filesize($this->dir."feed_$id.MYD"); @@ -317,11 +319,12 @@ public function get_data_DMY($id,$start,$end,$mode,$timezone) $array = unpack("x/Itime/fvalue",$d); if ($array['time']!=$lastarray['time']) { - $data[] = array($array['time']*1000,$array['value']); + if ($array['time']>=$start && $array['time']<$end) { + $data[] = array($array['time']*1000,$array['value']); + } } - if ($mode=="daily") $date->modify("+1 day"); - if ($mode=="weekly") $date->modify("+1 week"); - if ($mode=="monthly") $date->modify("+1 month"); + $date->modify($increment); + $n++; }