From 31517ab807eab4dfc54ceedf041c06c509cabf42 Mon Sep 17 00:00:00 2001
From: Robin Stoker <robin.stoker@aareon.nl>
Date: Tue, 23 Jan 2018 11:49:37 +0000
Subject: [PATCH] VEST#41990 -- Afvangen HEX

svn path=/Customer/trunk/; revision=36680
---
 VEST/vest.sql | 62 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/VEST/vest.sql b/VEST/vest.sql
index bed3a3418..561241a20 100644
--- a/VEST/vest.sql
+++ b/VEST/vest.sql
@@ -28,22 +28,64 @@ AS
    oracle_err_mes            VARCHAR2 (200);
    v_errormsg                VARCHAR2 (400);
    v_errorhint               VARCHAR2 (400);
+   v_newline                 FAC_IMP_FILE.FAC_IMP_FILE_LINE%TYPE;
 BEGIN
-   
+
+   BEGIN
+      SELECT fac_imp_file_line
+        INTO v_newline
+        FROM fac_imp_file
+       WHERE fac_import_key = p_import_key
+         AND fac_imp_file_index = 1;
+
+      IF v_newline LIKE
+                  CHR (TO_NUMBER ('EF', 'xx'))
+               || CHR (TO_NUMBER ('BB', 'xx'))
+               || CHR (TO_NUMBER ('BF', 'xx'))
+               || '%'
+      THEN
+         -- EF BB BF aangetroffen
+         fac.imp_writelog (p_import_key,
+                           'W',
+                           'Byte Order Mark aangetroffen',
+                           'Bestand heeft onbehandeld UTF-8 formaat.'
+                          );
+         v_newline := SUBSTR (v_newline, 4);
+      END IF;
+
+      -- Verwijder de dubbele quotes
+      v_newline := REPLACE (v_newline, '"');
+
+      UPDATE fac_imp_file
+         SET fac_imp_file_line = v_newline
+       WHERE fac_import_key = p_import_key
+         AND fac_imp_file_index = 1;
+
+
+   EXCEPTION WHEN OTHERS
+   THEN
+      fac.imp_writelog (p_import_key,
+                        'E',
+                        'Fout bij controle op Byte Order Mark',
+                        ''
+                       );
+   END;
+
+
    v_errorhint := 'Generieke update';
    -- de sequence array staat beschreven in PRS_PAC.SRC bij de prs.import_perslid proc
    prs.import_perslid (p_import_key,
                        '13;14;15;16;0;0;6;1;3;2;' ||
-                       '0;0;0;0;9;10;11;5;0;12;' || 
+                       '0;0;0;0;9;10;11;5;0;12;' ||
                        '7;4;0;8;0;0;0;0;0;0;'||
                        '0;0;0;0;0;0;0;0;0;0;'||
-                       '0;0;0;0;0;0',                       
-                       '"Achternaam";"Voornaam";"Tussenvoegsel";"SamAccountName";"Email";"Afdeling";"Functie";"Titel/Aanhef";"Geslacht";"Telefoonnummer";"Mobiel nummer";"Personeelsnummer";"Locatie";"Gebouw";"Verdieping";"Ruimte"'
+                       '0;0;0;0;0;0',
+                       'Achternaam;Voornaam;Tussenvoegsel;SamAccountName;Email;Afdeling;Functie;Titel/Aanhef;Geslacht;Telefoonnummer;Mobiel nummer;Personeelsnummer;Locatie;Gebouw;Verdieping;Ruimte%'
                        );
-                       
+
 UPDATE fac_imp_perslid
 SET alg_locatie_code = (
-SELECT a.alg_locatie_code 
+SELECT a.alg_locatie_code
 FROM alg_locatie a
 WHERE fac_imp_perslid.alg_locatie_code = a.alg_locatie_omschrijving);
 
@@ -52,7 +94,7 @@ SET prs_afdeling_naam = (
 SELECT p.prs_afdeling_naam
 FROM prs_afdeling p
 WHERE fac_imp_perslid.prs_afdeling_naam = substr (p.prs_afdeling_omschrijving, 1, 15))
-WHERE fac_imp_perslid.prs_afdeling_naam NOT IN (SELECT p.prs_afdeling_naam FROM prs_afdeling p);          
+WHERE fac_imp_perslid.prs_afdeling_naam NOT IN (SELECT p.prs_afdeling_naam FROM prs_afdeling p);
 
 DELETE FROM fac_imp_perslid
 WHERE alg_locatie_code NOT IN (SELECT alg_locatie_code FROM alg_locatie);
@@ -81,9 +123,9 @@ CREATE OR REPLACE PROCEDURE vest_update_perslid (
          AND p.prs_perslid_oslogin IS NOT NULL
          AND i.prs_perslid_oslogin IS NULL
          AND p.prs_perslid_verwijder IS NULL
-         AND p.prs_perslid_oslogin NOT LIKE '%_%'
+         AND substr (p.prs_perslid_oslogin, 1, 1) != '_'
       ORDER BY 2;
-  
+
   v_count           NUMBER;
 
 BEGIN
@@ -115,7 +157,7 @@ BEGIN
        prs.delete_perslid (p_import_key, rec.prs_perslid_key);
      END;
   END LOOP;
-  
+
 END vest_update_perslid;
 /