Commit 96f5f23e authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Minor changes to match new slice naming (emulab_${exptidx}).

parent 14eee333
......@@ -45,7 +45,8 @@ else {
# Page args,
if (isset($slice)) {
if (preg_match("/^emulab_[-\w]*_([\d]*)$/", $slice, $matches)) {
if (preg_match("/^emulab_[-\w]*_([\d]*)$/", $slice, $matches) ||
preg_match("/^emulab_([\d]*)$/", $slice, $matches)) {
$wclause = "and s.exptidx='$matches[1]'";
}
else {
......@@ -121,7 +122,7 @@ while ($row = mysql_fetch_assoc($query_result)) {
$action = $row[action];
$pnodes = $row[plabnodes];
$exptidx = $row[exptidx];
$slice = "emulab_${pid}_${eid}_${exptidx}";
$slice = "emulab_${exptidx}";
if (!strcmp($action, "start")) {
$action = "swapin";
......
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