Commit 428d54d3 authored by Leigh Stoller's avatar Leigh Stoller

Minor fixes to previous revision(s).

parent 32569e18
...@@ -1251,7 +1251,7 @@ sub HistoricalReservations($$$;$) { ...@@ -1251,7 +1251,7 @@ sub HistoricalReservations($$$;$) {
} }
my $query_result = my $query_result =
DBQueryFatal("select *,UNIX_TIMESTAMP(start) AS s, " . DBQueryFatal("select *,UNIX_TIMESTAMP(start) AS s, " .
" UNIX_TIMESTAMP(end), AS e ". " UNIX_TIMESTAMP(end) AS e, ".
" UNIX_TIMESTAMP(created) AS c, " . " UNIX_TIMESTAMP(created) AS c, " .
" UNIX_TIMESTAMP(canceled) AS d, " . " UNIX_TIMESTAMP(canceled) AS d, " .
" UNIX_TIMESTAMP(deleted) AS k " . " UNIX_TIMESTAMP(deleted) AS k " .
...@@ -1283,6 +1283,7 @@ sub HistoricalReservations($$$;$) { ...@@ -1283,6 +1283,7 @@ sub HistoricalReservations($$$;$) {
} }
return @answer; return @answer;
} }
sub deleted($) { return $_[0]->{"DELETED"}; }
sub ExptTypes($) { sub ExptTypes($) {
my ($exptidx) = @_; my ($exptidx) = @_;
......
...@@ -1713,7 +1713,7 @@ sub ReservationHistory($) ...@@ -1713,7 +1713,7 @@ sub ReservationHistory($)
$blob->{"nodes"} = $res->nodes(); $blob->{"nodes"} = $res->nodes();
$blob->{"type"} = $res->type(); $blob->{"type"} = $res->type();
$blob->{"created"} = TBDateStringGMT($res->created()); $blob->{"created"} = TBDateStringGMT($res->created());
$blob->{"canceled"} = TBDateStringGMT($res->canceled()); $blob->{"canceled"} = TBDateStringGMT($res->cancel());
$blob->{"deleted"} = TBDateStringGMT($res->deleted()); $blob->{"deleted"} = TBDateStringGMT($res->deleted());
$blob->{"start"} = TBDateStringGMT($res->start()); $blob->{"start"} = TBDateStringGMT($res->start());
$blob->{"end"} = TBDateStringGMT($res->end()); $blob->{"end"} = TBDateStringGMT($res->end());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment