From 90137257d7d58596f3e4717463f09619393a1308 Mon Sep 17 00:00:00 2001 From: Mike Hibler Date: Fri, 30 Jan 2015 17:39:02 -0700 Subject: [PATCH] subosids() array has to have a "pid/osid" index as well as just "osid". --- tbsetup/ns2ir/parse-ns.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tbsetup/ns2ir/parse-ns.in b/tbsetup/ns2ir/parse-ns.in index 93663e0c3..3cd9b16dc 100644 --- a/tbsetup/ns2ir/parse-ns.in +++ b/tbsetup/ns2ir/parse-ns.in @@ -699,7 +699,7 @@ sub GenDefsFile($) } print TCL "# subOSIDs and parent OSIDs (default parent first element)\n"; $query_result = - DBQueryFatal("select oi.osname,oi3.osname," . + DBQueryFatal("select oi.pid,oi.osname,oi3.osname," . "group_concat(oi2.osname separator '\" \"')" . " from os_submap as osm" . " left join os_info as oi on osm.osid=oi.osid" . @@ -714,13 +714,14 @@ sub GenDefsFile($) " where ov.def_parentosid is not NULL" . " group by oi.osname"); - while (my ($osname,$def_parentosid,$parent_osids) = + while (my ($pid,$osname,$def_parentosid,$parent_osids) = $query_result->fetchrow_array()) { my $parentlist = "\"$def_parentosid\""; if (defined($parent_osids) && $parent_osids ne '') { $parentlist .= " \"$parent_osids\""; } print TCL "set subosids($osname) [list $parentlist]\n"; + print TCL "set subosids($pid/$osname) \$subosids($osname)\n"; } print TCL "\n"; } -- GitLab