Commit 60d321e1 authored by Mac Newbold's avatar Mac Newbold

Updated for new fields, rearranged things for proper display.

parent fbfa9eba
......@@ -41,10 +41,10 @@ open(TMP,">$filename");
print TMP "graph: {\n orientation: left_to_right\n".
" title: \"Testbed Database Relational Graph - ".$date."\"\n";
print TMP " display_edge_labels: yes\n scaling: 0.6\n";
print TMP " height: 1000\n width: 500\n";
print TMP " display_edge_labels: yes\n scaling: 0.5\n";
print TMP " height: 950\n width: 500\n";
print TMP " priority_phase: yes\n straight_phase: yes\n";
print TMP " crossingweight: medianbary\n splines: yes\n";
print TMP " crossingweight: barymedian\n splines: yes\n";
print TMP " layoutalgorithm: minbackward\n arrowmode: fixed\n";
my $sth ="";
......@@ -81,15 +81,16 @@ foreach $tbl ( @tbls ) {
my %sortlist = ("nodes",2,"interfaces",10,"ip_list",14,"node_types",4,
"wires",13,"reserved",16,"node_id",1,"ifc",11,"ip",15,
"mac",12,"type",3,"proc",5,"speed",6,"ifcs",7,"ram",8,
"hd",9,"eid",17,"sw_table",18,"fixed_list",20,"fixes_table",21,
"fix_compat",22,"disk_images",19,"image_id",23,"fix_id",24,
"hd",9,"eid",17,"sw_table",18,"delta_inst",20,"deltas",21,
"delta_compat",22,"disk_images",19,"image_id",23,"delta_id",24,
"img_desc",25,"os",26,"ver",27,"extras",28,"free_space",29,
"free_space_type",30,"time_install_exp",31,
"time_install_node",32,"time_boot_exp",33,"time_boot_node",34,
"img_path",35,"fix_name",36,"fix_desc",37,"fix_path",38,
"img_path",35,"delta_name",36,"delta_desc",37,"delta_path",38,
"quick_clean",39,"trusted",40,"users",41,"grp_memb",45,
"groups",42,"proj_memb",46,"projects",43,"proj_grps",47,
"experiments",44,"log",48
"experiments",44,"log",48,"login",49,"ssh_host_keys",50,
"outlets",51
);
sub mysort {
if(!defined $sortlist{"\L$a"}) {
......@@ -109,8 +110,8 @@ foreach $tbl ( sort mysort @tablelist) {
foreach $col ( sort keys %tablecols) {
@tables= sort mysort split('\.',$tablecols{$col});
foreach $tbl (sort mysort @tables) {
if (@tables < 2 || $tbl=~/disk|memb|grp|fix_c|reserv|fixed|inter|nodes|
|log|proje|IP|wires/i ) {
if (@tables < 2 ||
$tbl=~/^disk|grp|delta_|nodes|log|wir|int|proj|ssh|res|out/i ) {
print TMP " edge: { sourcename: \"$col\" ".
"targetname: \"$tbl\" }\n";
} else {
......
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