make default fetch return the last entry and make sure we return C formatting; add...

[php-utility-classes.git] / include / classes / rrdstat.php-class

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 7ac9c04973b6b536e7c7fd228c2c4fbe431aa236..aa7079d1892f095ceb378378183ef75d977ed393 100644 (file)
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -440,11 +440,11 @@ class rrdstat {
     if (!is_numeric($end)) { $end = $this->last_update(); }
     elseif ($end < 0) { $end += $this->last_update(); }
     $end = intval($end/$resolution)*$resolution;
     if (!is_numeric($end)) { $end = $this->last_update(); }
     elseif ($end < 0) { $end += $this->last_update(); }
     $end = intval($end/$resolution)*$resolution;

-    if (!is_numeric($start)) { $start = $end; }
+    if (!is_numeric($start)) { $start = $end-$resolution; }

     elseif ($start < 0) { $start += $end; }
     $start = intval($start/$resolution)*$resolution;
 
     elseif ($start < 0) { $start += $end; }
     $start = intval($start/$resolution)*$resolution;
 

-    $fetch_cmd = $this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
+    $fetch_cmd = 'LANG=C '.$this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution

                  .' --start '.$start.' --end '.$end;
     $return = `$fetch_cmd 2>&1`;
 
                  .' --start '.$start.' --end '.$end;
     $return = `$fetch_cmd 2>&1`;
 


@@ -630,7 +630,7 @@ class rrdstat {
           $grow = array();
           $grow['dType'] = 'CDEF';
           $grow['name'] = $erow['name'];
           $grow = array();
           $grow['dType'] = 'CDEF';
           $grow['name'] = $erow['name'];

-          $grow['rpn_expr'] = $erow['name'].'_tmp,'.$erow['scale'].',*';
+          $grow['rpn_expr'] = $erow['name'].'_tmp,'.sprintf('%F', $erow['scale']).',*';

         }
         if ($use_gcrows) { $grow['gType'] = isset($erow['gType'])?$erow['gType']:'LINE1'; }
         else { $grow['gType'] = ((count($grow_def)==2) && ($key==0))?'AREA':'LINE1'; }
         }
         if ($use_gcrows) { $grow['gType'] = isset($erow['gType'])?$erow['gType']:'LINE1'; }
         else { $grow['gType'] = ((count($grow_def)==2) && ($key==0))?'AREA':'LINE1'; }