Author: jfthomps
Date: Thu Oct 16 21:08:46 2014
New Revision: 1632435
URL: http://svn.apache.org/r1632435
Log:
VCL-584 - Extend features of Server loads
image.php: modified createImage and AJupdateImage: no longer update
request.forimaging for checkpoints
Modified:
vcl/trunk/web/.ht-inc/image.php
Modified: vcl/trunk/web/.ht-inc/image.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1632435&r1=1632434&r2=1632435&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Thu Oct 16 21:08:46 2014
@@ -703,16 +703,20 @@ class Image extends Resource {
return;
}
- $newstateid = 16;
+ $sets = array("rs.imageid = $imageid",
+ "rs.imagerevisionid = {$this->imagerevisionid}");
+
if($checkpoint)
- $newstateid = 24;
+ $sets[] = "rq.stateid = 24";
+ else {
+ $sets[] = "rq.stateid = 16";
+ $sets[] = "rq.forimaging = 1";
+ }
+ $allsets = implode(', ', $sets);
$query = "UPDATE request rq, "
. "reservation rs "
- . "SET rs.imageid = $imageid, "
- . "rs.imagerevisionid = {$this->imagerevisionid}, "
- . "rq.stateid = $newstateid,"
- . "rq.forimaging = 1 "
+ . "SET $allsets "
. "WHERE rq.id = {$data['requestid']} AND "
. "rq.id = rs.requestid";
doQuery($query, 101);
@@ -871,16 +875,20 @@ class Image extends Resource {
. "WHERE imagerevisionid = $oldrevisionid";
doQuery($query, 101);
- $newstateid = 16;
+ $sets = array("rs.imagerevisionid = $imagerevisionid");
+
if($checkpoint)
- $newstateid = 24;
+ $sets[] = "rq.stateid = 24";
+ else {
+ $sets[] = "rq.stateid = 16";
+ $sets[] = "rq.forimaging = 1";
+ }
# update request and reservation
+ $allsets = implode(', ', $sets);
$query = "UPDATE request rq, "
. "reservation rs "
- . "SET rs.imagerevisionid = $imagerevisionid, "
- . "rq.stateid = $newstateid,"
- . "rq.forimaging = 1 "
+ . "SET $allsets "
. "WHERE rq.id = $requestid AND "
. "rq.id = rs.requestid AND "
. "rs.imageid = $imageid";
