produce whole dn in SQL queries so we don't have to mungle it in code

[virtual-ldap] / lib / LDAP / Koha.pm

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index 7c2791c..e0b70bf 100644 (file)
--- a/lib/LDAP/Koha.pm
+++ b/lib/LDAP/Koha.pm
@@ -131,12 +131,12 @@ sub _dn_attributes {
        my $dn = delete( $row->{dn} ) || die "no dn in ",dump( $row );
 
        # this does some sanity cleanup for our data
-       my $base_as_domain = $base;
-       $base_as_domain =~ s{dn=}{.};
-       $base_as_domain =~ s{^\.}{@};
-       $dn =~ s{$base_as_domain$}{};
-
-       $dn .= ',' . $base unless $dn =~ m{,}; # add base if none present
+#      my $base_as_domain = $base;
+#      $base_as_domain =~ s{dn=}{.};
+#      $base_as_domain =~ s{^\.}{@};
+#      $dn =~ s{$base_as_domain$}{};
+#
+#      $dn .= ',' . $base unless $dn =~ m{,}; # add base if none present
 
        return ($dn, $row);
 }
@@ -247,8 +247,10 @@ sub search {
 
                }
 
-               warn "### last entry ",$entry->dump( \*STDERR );
-               push @entries, $entry;
+               if ( $entry ) {
+                       warn "### last entry ",$entry->dump( \*STDERR );
+                       push @entries, $entry;
+               }
 
        } else {
                warn "UNKNOWN request: ",dump( $reqData );