Commit 88bcd21c authored by Leigh Stoller's avatar Leigh Stoller

Minor bug fix.

parent a2426373
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -411,18 +411,22 @@ my %imagemap = ();
# Get lists of ids for checking the special "attr_*_*id" attributes.
$query_result =
DBQueryFatal("select osid,osname,pid from os_info ".
"where (path='' or path is NULL) ".
"order by pid,osname");
DBQueryFatal("select o.osid,o.osname,o.pid from os_info as o ".
"left join os_info_versions as v on ".
" v.osid=i.osid and v.vers=i.version ".
"where (v.path='' or v.path is NULL) ".
"order by o.pid,o.osname");
while (my ($osid,$osname,$pid) = $query_result->fetchrow_array()) {
$osids{$osid} = "$pid,$osname";
$osidmap{"$pid,$osname"} = $osid;
}
$query_result =
DBQueryFatal("select osid,osname,pid from os_info ".
"where (path is not NULL and path!='') ".
"order by pid,osname");
DBQueryFatal("select o.osid,o.osname,o.pid from os_info as o ".
"left join os_info_versions as v on ".
" v.osid=i.osid and v.vers=i.version ".
"where (v.path is not NULL and v.path!='') ".
"order by o.pid,o.osname");
while (my ($osid,$osname,$pid) = $query_result->fetchrow_array()) {
$mfsosids{$osid} = "$pid,$osname";
$osidmap{"$pid,$osname"} = $osid;
......
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