|
Lines 124-132
Link Here
|
| 124 |
$res = $this->link->query("SELECT Name FROM Pool"); |
124 |
$res = $this->link->query("SELECT Name FROM Pool"); |
| 125 |
while ( $tmp =& $res->fetchRow() ) { |
125 |
while ( $tmp =& $res->fetchRow() ) { |
| 126 |
if ($this->driver == "mysql" ) |
126 |
if ($this->driver == "mysql" ) |
| 127 |
$result = $this->link->query("select Media.VolumeName, Media.VolBytes,Media.VolStatus,Pool.Name,Media.MediaType,Media.LastWritten,FROM_UNIXTIME(UNIX_TIMESTAMP(Media.LastWritten)+Media.VolRetention ) as expire from Pool LEFT JOIN Media ON Media.PoolId=Pool.PoolId where Name='$tmp[0]' order by Media.VolumeName"); |
127 |
$result = $this->link->query("select Media.VolumeName, Media.VolBytes,Media.VolStatus,Pool.Name,Media.MediaType,Media.LastWritten,FROM_UNIXTIME(UNIX_TIMESTAMP(Media.LastWritten)+Media.VolRetention ) as expire from Pool LEFT JOIN Media ON Media.PoolId=Pool.PoolId where Name='$tmp[0]' AND Media.LastWritten IS NOT NULL order by Media.VolumeName"); |
| 128 |
else if ($this->driver == "pgsql") |
128 |
else if ($this->driver == "pgsql") |
| 129 |
$result = $this->link->query("select Media.VolumeName, Media.VolBytes,Media.VolStatus,Pool.Name,Media.MediaType,Media.LastWritten, Media.LastWritten + Media.VolRetention * interval '1 second' as expire from Pool LEFT JOIN Media ON Media.PoolId=Pool.PoolId where Name='$tmp[0]' order by Media.VolumeName"); |
129 |
$result = $this->link->query("select Media.VolumeName, Media.VolBytes,Media.VolStatus,Pool.Name,Media.MediaType,Media.LastWritten, Media.LastWritten + Media.VolRetention * interval '1 second' as expire from Pool LEFT JOIN Media ON Media.PoolId=Pool.PoolId where Name='$tmp[0]' AND Media.LastWritten IS NOT NULL order by Media.VolumeName"); |
| 130 |
while ( $tmp1 = $result->fetchRow() ) { |
130 |
while ( $tmp1 = $result->fetchRow() ) { |
| 131 |
$pos = array_key_exists($tmp[0],$volume); |
131 |
$pos = array_key_exists($tmp[0],$volume); |
| 132 |
if ($pos != FALSE) |
132 |
if ($pos != FALSE) |
