X-Git-Url: http://git.rot13.org/?p=virtual-ldap;a=blobdiff_plain;f=lib%2FLDAP%2FKoha.pm;h=b0c726c6b815618f99a87d4dc40ce568f42f5bf7;hp=e0b70bf09b42216506ddb1faac64a5b856ebc991;hb=2976b06f151c8fceb0fe00c1046a287f72998fd9;hpb=5bb14e63038006514db929f1469080d318f8b832

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index e0b70bf..b0c726c 100644
--- a/lib/LDAP/Koha.pm
+++ b/lib/LDAP/Koha.pm
@@ -15,6 +15,8 @@ use File::Slurp;
 
 use Data::Dump qw/dump/;
 
+my $debug = 0; # XXX very slow
+
 # XXX test with:
 #
 # ldapsearch -h localhost -p 2389 -b dc=ffzg,dc=hr -x 'otherPager=200903160021'
@@ -43,10 +45,10 @@ my $dbh = DBI->connect($dsn . $database, $user,$passwd, { RaiseError => 1, AutoC
 
 my $ldap_sql_mapping = {
 	'uid'		=> 'userid',
-	'objectGUID'	=> 'borrowernumber',
+	'objectGUID'	=> 'b.borrowernumber',
 	'displayName'	=> 'surname',
 	'sn'		=> 'surname',
-	'pager'		=> 'rfid_sid',
+	'pager'		=> 'a.attribute',	# was: rfid_sid
 };
 
 sub __sql_column {
@@ -120,13 +122,13 @@ sub __ldap_search_to_sql {
 sub _dn_attributes {
 	my ($row,$base) = @_;
 
-	warn "## row = ",dump( $row );
+	warn "## row = ",dump( $row ) if $debug;
 
 	die "no objectClass column in ",dump( $row ) unless defined $row->{objectClass};
 
 	$row->{objectClass} = [ split(/\s+/, $row->{objectClass}) ] if $row->{objectClass} =~ m{\n};
 
-	warn "## row = ",dump( $row );
+	warn "## row = ",dump( $row ) if $debug;
 
 	my $dn = delete( $row->{dn} ) || die "no dn in ",dump( $row );
 
@@ -202,7 +204,7 @@ sub search {
 		my $sql
 			= $sql_select
 			. $sql_where
-			. ( $objectclass =~ m{person}i ? " LIMIT $max_results" : '' ) # add limit just for persons
+#			. ( $objectclass =~ m{person}i ? " LIMIT $max_results" : '' ) # add limit just for persons
 			;
 
 		warn "# SQL:\n$sql\n# DATA: ",dump( @values );
@@ -229,6 +231,8 @@ sub search {
 					undef $entry;
 				}
 
+				$dn =~ s{@[^,]+}{};
+
 				$entry = Net::LDAP::Entry->new;
 				$entry->dn( $dn );