[Netpass-devel] NetPass/lib/NetPass DB.pm,1.33,1.34

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

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

Modified Files:
	DB.pm 
Log Message:
gui config lock management

Index: DB.pm
===================================================================
RCS file: /cvsroot/netpass/NetPass/lib/NetPass/DB.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- DB.pm	25 Apr 2005 05:44:55 -0000	1.33
+++ DB.pm	25 Apr 2005 19:15:00 -0000	1.34
@@ -2454,14 +2454,14 @@
     return "invalid parameters (rev)" unless ($r >= 0);
     return "invalid parameters (user)" unless ($u ne "");
 
-    my $sql = "SELECT xlock, rev FROM config WHERE xlock = 1";
+    my $sql = "SELECT xlock, rev, user FROM config WHERE xlock = 1";
     my $rv  = $self->dbh->selectall_arrayref($sql);
     return "db failure ".$self->dbh->errstr unless (ref($rv) eq "ARRAY");
 
     if ($#{$rv} > -1) {
-	    return "lock failed alreadyLockedRev=".$rv->[0]->[1];
+	    return "lock failed alreadyLocked rev=".$rv->[0]->[1]. " user=".$rv->[0]->[2];
     }
-    $sql = "UPDATE config SET xlock = 1 WHERE rev = ".$self->dbh->quote($r);
+    $sql = "UPDATE config SET xlock = 1, user = ".$self->dbh->quote($u)." WHERE rev = ".$self->dbh->quote($r);
     $rv  = $self->dbh->do($sql);
 
     if (!defined($rv)) {