[Benson-commit] CVS: benson3/handlers S05benson.pm,1.8,1.9

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv24273/handlers

Modified Files:
	S05benson.pm 
Log Message:
A few fixes to the network code.

Index: S05benson.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/S05benson.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** S05benson.pm	11 Nov 2003 19:32:53 -0000	1.8
--- S05benson.pm	16 Dec 2003 16:17:46 -0000	1.9
***************
*** 20,23 ****
--- 20,27 ----
  	my $starttime = $hash{starttime} || $current_time;
  	my $endtime = $hash{endtime} || $default_endtime;
+ 	my $override = $hash{override} || "N";
+ 	if($override =~ m/y/i) {
+ 		$override = "Y";
+ 	}
  	if(defined $hash{duration}) {
  		# calculate startime in epoch seconds
***************
*** 43,47 ****
  	endtime,
  	reason,
! 	remove)
  VALUES
  	(NEXTVAL('suppress_sequence'),
--- 47,52 ----
  	endtime,
  	reason,
! 	remove,
! 	override)
  VALUES
  	(NEXTVAL('suppress_sequence'),
***************
*** 50,54 ****
  	to_timestamp('$endtime','yyyy-mm-dd_HH24:MI:SS'),
  	'$reason',
! 	'N')
  EOSQL
  
--- 55,60 ----
  	to_timestamp('$endtime','yyyy-mm-dd_HH24:MI:SS'),
  	'$reason',
! 	'N',
! 	'$override')
  EOSQL
  
***************
*** 71,75 ****
  	my $id = $hash{identity} || "null";
  	my $agent = $hash{agent} || "null";
! 	my $sql_remove;
  
  	if($id ne "null") {
--- 77,82 ----
  	my $id = $hash{identity} || "null";
  	my $agent = $hash{agent} || "null";
! 	my $override = $hash{override} || "no";
! 	my $current_time = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime(time));
  
  	if($id ne "null") {
***************
*** 89,97 ****
  	remove = 'Y'
  WHERE
! 	agent = $agent
  EOSQL
  	} else {
  		return;
  	}
  
  	my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword);
--- 96,114 ----
  	remove = 'Y'
  WHERE
! 	agent = '$agent'
! AND
! 	endtime > to_timestamp('$current_time', 'yyyy-mm-dd_HH24:MI:SS')
  EOSQL
  	} else {
  		return;
  	}
+ 
+ 	if($override =~ m/n/i) {
+ 		$sql_remove .= <<EOSQL;
+ AND
+ 	override = 'N'
+ EOSQL
+ 	}
+ 
  
  	my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword);