consistent w/ previous opac, default to barcode login and jump to username only if...

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 7ddec2e..d215ffd 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -228,15 +228,17 @@ sub load_login {
                'open-ils.auth.authenticate.init', $username);
 
     my $args = {       
-        username => $username, 
+        barcode => $username, 
         password => md5_hex($seed . md5_hex($password)), 
         type => ($persist) ? 'persist' : 'opac' 
     };
 
     my $bc_regex = $ctx->{get_org_setting}->($org_unit, 'opac.barcode_regex');
 
-    $args->{barcode} = delete $args->{username} 
-        if $bc_regex and $username =~ /$bc_regex/;
+    $args->{username} = delete $args->{barcode} 
+        if $bc_regex and !($username =~ /$bc_regex/);
+
+    $self->apache->log->warn("regex = $bc_regex; username = $username; " .  ($username =~ /$bc_regex/));
 
        my $response = $U->simplereq(
         'open-ils.auth', 'open-ils.auth.authenticate.complete', $args);