Commit 90137257 authored by Mike Hibler's avatar Mike Hibler

subosids() array has to have a "pid/osid" index as well as just "osid".

parent 79439d86
...@@ -699,7 +699,7 @@ sub GenDefsFile($) ...@@ -699,7 +699,7 @@ sub GenDefsFile($)
} }
print TCL "# subOSIDs and parent OSIDs (default parent first element)\n"; print TCL "# subOSIDs and parent OSIDs (default parent first element)\n";
$query_result = $query_result =
DBQueryFatal("select oi.osname,oi3.osname," . DBQueryFatal("select oi.pid,oi.osname,oi3.osname," .
"group_concat(oi2.osname separator '\" \"')" . "group_concat(oi2.osname separator '\" \"')" .
" from os_submap as osm" . " from os_submap as osm" .
" left join os_info as oi on osm.osid=oi.osid" . " left join os_info as oi on osm.osid=oi.osid" .
...@@ -714,13 +714,14 @@ sub GenDefsFile($) ...@@ -714,13 +714,14 @@ sub GenDefsFile($)
" where ov.def_parentosid is not NULL" . " where ov.def_parentosid is not NULL" .
" group by oi.osname"); " group by oi.osname");
while (my ($osname,$def_parentosid,$parent_osids) = while (my ($pid,$osname,$def_parentosid,$parent_osids) =
$query_result->fetchrow_array()) { $query_result->fetchrow_array()) {
my $parentlist = "\"$def_parentosid\""; my $parentlist = "\"$def_parentosid\"";
if (defined($parent_osids) && $parent_osids ne '') { if (defined($parent_osids) && $parent_osids ne '') {
$parentlist .= " \"$parent_osids\""; $parentlist .= " \"$parent_osids\"";
} }
print TCL "set subosids($osname) [list $parentlist]\n"; print TCL "set subosids($osname) [list $parentlist]\n";
print TCL "set subosids($pid/$osname) \$subosids($osname)\n";
} }
print TCL "\n"; print TCL "\n";
} }
......
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