From b3532d0a35de9a0b41275d7faed32035255a84a0 Mon Sep 17 00:00:00 2001 From: Stephen L Johnson Date: Wed, 5 Apr 2000 03:50:57 +0000 Subject: [PATCH] renamed 'overview' functions and parameters to 'grp' to reflect group view name --- src/www-spong.pl | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/www-spong.pl b/src/www-spong.pl index 0efcb40..3c63d00 100755 --- a/src/www-spong.pl +++ b/src/www-spong.pl @@ -50,7 +50,7 @@ if( $ENV{'SCRIPT_NAME'} eq "" ) { my %opt; my @options = ( "help", "summary:s", "problems:s", "history:s", "host=s", "services=s", "stats=s", "config=s", "info=s", "service=s", - "histservice=s", "overview:s", "ovproblems", + "histservice=s", "grp-summary:s", "grp-problems", "brief", "standard", "full" ); $actionbar = 0; @@ -85,8 +85,8 @@ if( $ENV{'SCRIPT_NAME'} eq "" ) { $opt=1; } - if ( defined $opt{'overview'} ) { &overview( $opt{'overview'} ); $opt= 1; } - if ( defined $opt{'ovproblems'} ) { &ovproblems( $opt{'ovproblems'} ); $opt= 1; } + if ( defined $opt{'grp-summary'} ) { &grp_summary( $opt{'grp-summary'} ); $opt= 1; } + if ( defined $opt{'grp-problems'} ) { &grp_problems( $opt{'grp-problems'} ); $opt= 1; } if( ! $opt ) { &summary( "all" ); } @@ -120,8 +120,8 @@ if( $cmd =~ m!^/bygroup/(.*)$! ) { &ovinteractive( $1 ); exit; } if( $cmd =~ m!^/commands/(.*)$! ) { &commands( $1 ); exit; } if( $cmd =~ m!^/ovcommands/(.*)$! ) { &ovcommands( $1 ); exit; } -if( $cmd =~ m!^/ioverview/(.*)$! ) { &ioverview( $1 ); exit; } -if( $cmd =~ m!^/iovsummary/(.*)$! ) { &iovsummary( $1 ); exit; } +if( $cmd =~ m!^/igrp-summary/(.*)$! ) { &igrp_summary( $1 ); exit; } +if( $cmd =~ m!^/igrp-overview/(.*)$! ) { &igrp_overview( $1 ); exit; } if( $cmd =~ m!^/isummary/(.*)$! ) { &isummary( $1 ); exit; } if( $cmd =~ m!^/ihistory/(.*)$! ) { &ihistory( $1 ); exit; } @@ -153,8 +153,8 @@ if( $cmd =~ m!^/service/(.*)/(.*)$! ) { &service( $1, $2 ); exit; } if( $cmd =~ m!^/histservice/(.*)/(.*)/(.*)$! ) { &histservice( $1, "$2 $3" ); exit; } -if( $cmd =~ m!^/overview/(.*)$! ) { &overview( $1 ); exit;} -if( $cmd =~ m!^/ovproblems/(.*)$! ) { &ovproblems( $1 ); exit;} +if( $cmd =~ m!^/grp-summary/(.*)$! ) { &grp_summary( $1 ); exit;} +if( $cmd =~ m!^/grp-problems/(.*)$! ) { &grp_problems( $1 ); exit;} # Need to do something when an invalid request comes through... exit(0); @@ -217,7 +217,7 @@ sub ovinteractive { print ""; print "\n"; - print "\n"; print "\n"; print "\n"; @@ -306,8 +306,8 @@ sub ovcommands { } print "
\n"; - print "Groups || \n"; - print "Group Summary\n"; + print "Groups || \n"; + print "Group Summary\n"; print "
\n"; print "Ack || \n"; @@ -316,7 +316,7 @@ sub ovcommands { print "Help\n"; print "
\n

\n"; - &ovproblems( $group ); + &grp_problems( $group ); print "


"; # print "Group: $gname\n
\n"; @@ -352,7 +352,7 @@ sub ihistory { &footer(); } -sub ioverview { +sub igrp_summary { my $group = shift; # my $gname = $main::GROUPS{$group}->{'name'} if $main::GROUPS{$group}; # $gname = "Selected Hosts" unless $gname; @@ -360,11 +360,11 @@ sub ioverview { &header( 1 ); print "Host Groups\n
\n"; $main::view = "full"; - &overview($group); + &grp_summary($group); &footer(); } -sub iovsummary { +sub igrp_overview { my $group = shift; # my $gname = $main::GROUPS{$group}->{'name'} if $main::GROUPS{$group}; # $gname = "Selected Hosts" unless $gname; @@ -372,7 +372,7 @@ sub iovsummary { &header( 1 ); print "Host Groups Summary\n
\n"; $view = "standard"; - &overview($group); + &grp_summary($group); &footer(); } @@ -537,22 +537,22 @@ sub histservice { &footer(); } -sub overview { +sub grp_summary { my( $other ) = @_; my $view = $main::view || 'full'; &header(0); - print &query( $SPONGSERVER, "overview", '', "html", $view, $other); + print &query( $SPONGSERVER, "grp-summary", '', "html", $view, $other); &footer(); } -sub ovproblems { +sub grp-problems { my( $other ) = @_; my $view = $main::view || 'full'; &header(0); - print &query( $SPONGSERVER, "ovproblems", $other, "html", $view ); + print &query( $SPONGSERVER, "grp-problems", $other, "html", $view ); &footer(); } -- 2.30.2