- Fixed get PHPFiwa feed size bug

- Fixed PHPTIMESTORE csv export bug

Modules/feed/engine/PHPFiwa.php

@@ -433,7 +433,14 @@ public function delete($id)
     public function get_feed_size($id)
     {
         if (!$meta = $this->get_meta($id)) return false;
-        return (filesize($this->dir.$meta->id.".meta") + filesize($this->dir.$meta->id.".dat"));
+
+        $size = 0;
+        $size += filesize($this->dir.$meta->id.".meta");
+        $size += filesize($this->dir.$meta->id."_0.dat");
+        $size += filesize($this->dir.$meta->id."_1.dat");
+        $size += filesize($this->dir.$meta->id."_2.dat");
+        $size += filesize($this->dir.$meta->id."_3.dat");
+        return $size;
     }
 
 

Modules/feed/engine/PHPTimestore.php

@@ -601,6 +601,17 @@ public function csv_export($feedid,$start,$end,$outinterval)
         $start = (int) $start;
         $end = (int) $end;
         $outinterval = (int) $outinterval;
+
+        if ($end == 0) $end = time();
+
+        $meta = $this->get_meta($feedid);
+
+        $start = round($start/$meta->interval)*$meta->interval;
+
+        if ($outinterval<1) $outinterval = 1;
+        $npoints = ceil(($end - $start) / $outinterval);
+        $end = $start + ($npoints * $outinterval);
+        if ($npoints<1) return false;
 
         $meta->decimation = array(20, 6, 6, 4, 7);
 

index.php

@@ -12,7 +12,7 @@
 
     */
 
-    $emoncms_version = "8.0.4";
+    $emoncms_version = "8.0.6";
 
     $ltime = microtime(true);