ASPN#78116 -- Personen zonder email niet meenemen in prs import

svn path=/Customer/trunk/; revision=60466

ASPN/aspn.sql

@@ -88,6 +88,12 @@ BEGIN
                        'SamAccountName;GivenName;Surname;DisplayName;EmailAddress;Department;EmployeeNumber;Title;HomePhone;Office;MobilePhone%'
                        );
 
+-- Soms komen er personen binnen zonder email, die mogen niet mee.
+DELETE FROM fac_imp_perslid
+WHERE prs_perslid_email IS NULL;
+
+COMMIT;
+
 -- Afdelingscode uit de string met afdelingnaam halen.
 UPDATE fac_imp_perslid
 SET prs_afdeling_naam = REGEXP_SUBSTR (prs_afdeling_naam,
@@ -154,18 +160,20 @@ CREATE OR REPLACE PROCEDURE aspn_update_perslid (
   CURSOR c_del
   IS
    SELECT p.prs_perslid_key, p.prs_perslid_email
-        FROM fac_imp_perslid i, prs_perslid p
-       WHERE UPPER (p.prs_perslid_email) = UPPER (i.prs_perslid_email(+))
-         AND p.prs_perslid_email IS NOT NULL
-         AND i.prs_perslid_email IS NULL
-         AND p.prs_perslid_verwijder IS NULL
-         AND p.prs_perslid_oslogin IS NULL;
+     FROM prs_perslid p
+    WHERE   p.prs_perslid_verwijder IS NULL
+        AND p.prs_perslid_oslogin IS NULL
+        AND NOT EXISTS
+                (SELECT 'x'
+                    FROM fac_imp_perslid i
+                    WHERE UPPER(p.prs_perslid_email) = UPPER(i.prs_perslid_email));
     
   CURSOR c1
   IS
     SELECT p.prs_perslid_key
      FROM prs_perslid p
     WHERE     p.prs_perslid_oslogin IS NULL
+    AND p.prs_perslid_oslogin NOT LIKE '%_%'
           AND NOT EXISTS
                   (SELECT 'x'
                      FROM fac_gebruikersgroep f