[Netpass-devel] NetPass/lib/NetPass Config.pm,1.51,1.52 DB.pm,1.52,1.53

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/lib/NetPass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18199/lib/NetPass

Modified Files:
	Config.pm DB.pm 
Log Message:
bug fixes

Index: Config.pm
===================================================================
RCS file: /cvsroot/netpass/NetPass/lib/NetPass/Config.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Config.pm	23 Jun 2005 20:21:07 -0000	1.51
+++ Config.pm	16 Aug 2005 15:50:09 -0000	1.52
@@ -1282,12 +1282,6 @@
 		$self->{'cfg'}->obj('network')->obj($network)->switches({});
 	}
 
-	if ($bsw) {
-		$self->{'cfg'}->obj('network')->obj($network)->obj('switches')->bsw($bsw);
-	} else {
-		$self->{'cfg'}->obj('network')->obj($network)->obj('switches')->bsw($bsw);
-	}
-
 	my $sa = [];
 	if (ref($switches) eq "ARRAY") {
 		$sa = $switches;
@@ -1300,6 +1294,12 @@
 	}
 	$self->{'cfg'}->obj('network')->obj($network)->switches(\%s);
 
+	if ($bsw) {
+		$self->{'cfg'}->obj('network')->obj($network)->obj('switches')->bsw($bsw);
+	} else {
+		$self->{'cfg'}->obj('network')->obj($network)->obj('switches')->delete('bsw');
+	}
+
 	return 0;
 }
 

Index: DB.pm
===================================================================
RCS file: /cvsroot/netpass/NetPass/lib/NetPass/DB.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- DB.pm	10 Aug 2005 19:52:15 -0000	1.52
+++ DB.pm	16 Aug 2005 15:50:09 -0000	1.53
@@ -770,7 +770,7 @@
 
     my $sth = $self->{'dbh'}->do($sql);
     if ( !defined($sth) ) {
-	_log "ERROR", "failed to 'do': ".$self->{'dbh'}->errstr."\n";
+	_log "ERROR", "failed to 'do' ($sql): ".$self->{'dbh'}->errstr."\n";
 	return 0;
     }
     return 1;
@@ -2807,7 +2807,7 @@
 
 =head2 clearRegister( )
 
-Delete all data from the register data.
+Delete all data from the register and results tables.
 
 RETURNS
 
@@ -2822,8 +2822,14 @@
 
 	my $rv = $self->{'dbh'}->do('DELETE FROM register');
 	if (!defined($rv)) {
-		_log("ERROR", "db failure ".$self->{'dbh'}->errstr);
-		return "db failure ".$self->{'dbh'}->errstr;
+		_log("ERROR", "db failure (register) ".$self->{'dbh'}->errstr);
+		return "db failure (register) ".$self->{'dbh'}->errstr;
+	}
+
+	$rv = $self->{'dbh'}->do('DELETE FROM results');
+	if (!defined($rv)) {
+		_log("ERROR", "db failure (results) ".$self->{'dbh'}->errstr);
+		return "db failure (results) ".$self->{'dbh'}->errstr;
 	}
 	return 1;
 }