fix for new database format

diff --git a/Changes b/Changes
index 3e07c7f21c0d8b594d8adbce093919c134b17b08..214a84d0a37cd70ffd2b6d7ff92c75252f862862 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+28Feb03=======================================================================
+1. Charlie K1XX fixed the sh/iso, sh/reg and sh/node commands
 25Feb03=======================================================================
 1. backported switch processing for PC sentences
 24Feb03=======================================================================

diff --git a/cmd/show/isolate.pl b/cmd/show/isolate.pl
index 35eb822a2920f5341a15ec57b262b2f8116fbfa3..2bc943764835b180851010f1307507d936eb0caa 100644 (file)
--- a/cmd/show/isolate.pl
+++ b/cmd/show/isolate.pl
@@ -16,8 +16,8 @@ my @out;
 use DB_File;
 
 my ($action, $count, $key, $data) = (0,0,0,0);
-for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
-       if ($data =~ m{isolate\s*=>}) {
+for ($action = DXUser::R_FIRST, $count=0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
+       if ($data =~ m{isolate}) {
                my $u = DXUser->get_current($key);
                if ($u && $u->isolate) {
                        push @out, $key;

diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl
index c1a53f0e87d3f03528bb9474531e880368af6f95..178686c3b987e0565dc488133b789906537f611c 100644 (file)
--- a/cmd/show/lockout.pl
+++ b/cmd/show/lockout.pl
@@ -17,14 +17,14 @@ use DB_File;
 
 if ($line) {
        $line =~ s/[^\w\-\/]+//g;
-       $line = "^\U\Q$line";
+       $line = "\U\Q$line";
 }
 
 return (1, $self->msg('lockoutuse')) unless $line;
 
 my ($action, $count, $key, $data) = (0,0,0,0);
 for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
-       if ($data =~ m{lockout =>}) {
+       if ($data =~ m{lockout}) {
                if ($line eq 'ALL' || $key =~ /$line/) {
                        my $ur = DXUser->get_current($key);
                        if ($ur && $ur->lockout) {

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index ebc468d1cf2a44a2f9fc6e05187de03d7f4daae5..340b24344f6f541817c6bc89890c73e80d4dd5e2 100644 (file)
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -22,7 +22,7 @@ if ($line) {
 
 my ($action, $count, $key, $data) = (0,0,0,0);
 for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
-       if ($data =~ m{registered =>}) {                                        
+       if ($data =~ m{registered}) {                                   
                if (!$line || ($line && $key =~ /$line/)) {
                        my $u = DXUser->get_current($key);
                        if ($u && $u->registered) {