move RFID_SID into borrower_attributes

diff --git a/lib/LDAP/Koha.pm b/lib/LDAP/Koha.pm
index b497c2f..c1acce5 100644 (file)
--- a/lib/LDAP/Koha.pm
+++ b/lib/LDAP/Koha.pm
@@ -46,7 +46,7 @@ my $ldap_sql_mapping = {
        'objectGUID'    => 'borrowernumber',
        'displayName'   => 'surname',
        'sn'            => 'surname',
-       'pager'         => 'rfid_sid',
+       'pager'         => 'a.attribute',       # was: rfid_sid
 };
 
 sub __sql_column {

diff --git a/sql/hreduperson.sql b/sql/hreduperson.sql
index 568e5f5..b3cb5b3 100644 (file)
--- a/sql/hreduperson.sql
+++ b/sql/hreduperson.sql
@@ -12,13 +12,16 @@ select
        concat(firstname,' ',surname)                   as cn,
 
        -- SAFEQ specific mappings from UMgr-LDAP.conf
-       borrowernumber                                  as objectGUID,
+       b.borrowernumber                                        as objectGUID,
        surname                                         as displayName,
-       rfid_sid                                        as pager,
+       a.attribute                                     as pager,
        email                                           as mail,
        categorycode                                    as memberOf,
        categorycode                                    as ou,
        categorycode                                    as department,
-       concat('/home/',borrowernumber)                 as homeDirectory
-from borrowers
+       concat('/home/',b.borrowernumber)                       as homeDirectory
+from borrowers b
+left join borrower_attributes a on b.borrowernumber = a.borrowernumber and code='RFID_SID'
+
+