From 97e67517c6666fa7578814bfb5b692d88f7c7f1c Mon Sep 17 00:00:00 2001
From: Arthur Egberink <arthur.egberink@aareon.nl>
Date: Wed, 2 Nov 2016 10:29:26 +0000
Subject: [PATCH] AAAR#38286  -- Catering import niet gedraaid

svn path=/Customer/trunk/; revision=31321
---
 AA/AAAR/aaar.sql | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/AA/AAAR/aaar.sql b/AA/AAAR/aaar.sql
index 704d9c4f0..c7947537f 100644
--- a/AA/AAAR/aaar.sql
+++ b/AA/AAAR/aaar.sql
@@ -1,14 +1,25 @@
--- Script containing customer specific configuration sql statements for aaar: Arcadis Aqumen Facility Management
--- (c) 2005-2007 Dijkoraad IT bv
--- $Revision$
+--
 -- $Id$
 --
--- Support: +31 53 4800700
+-- Script containing customer specific configuration sql statements for aaar: Arcadis Aqumen Facility Management
 
 @aaxx.sql;
 
-SPOOL xaaar.lst
+DEFINE thisfile = 'aaar.sql'
+DEFINE dbuser   = '^AAAR'
+DEFINE custid   = 'AAAR'
+DEFINE custvers = 7
+
 SET ECHO ON
+SET DEFINE ON
+COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
+WHENEVER SQLERROR EXIT;
+SELECT adm.scriptspoolfile('&dbuser', '&thisfile') AS fcltlogfile FROM DUAL;
+WHENEVER SQLERROR CONTINUE;
+SPOOL &fcltlogfile
+SET DEFINE OFF
+
+------ payload begin ------
 
 -- script om dagelijks terugkerende scripts aan te roepen.
 CREATE OR REPLACE PROCEDURE aaar_select_daily_task (p_applname   IN   VARCHAR2, p_applrun    IN   VARCHAR2)
@@ -200,6 +211,7 @@ BEGIN
                    WHERE mld_alg_locatie_key = rec.alg_locatie_key
                      AND mld_alg_onroerendgoed_keys = rec.alg_gebouw_key
                      AND mld_stdmelding_key = v_mld_stdmelding_key
+                     AND prs_perslid_key = v_aanvrager
                      AND v_date BETWEEN mld_melding_datum
                                     AND  mld_melding_einddatum + 1;
                EXCEPTION
@@ -440,15 +452,17 @@ AS
 SELECT * FROM aaxx_v_rap_infobord;
 
 
-BEGIN adm.systrackscriptId('$Id$', 0); END;
+------ payload end   ------
+
+SET DEFINE ON
+BEGIN fac.registercustversion('&custid', '&custvers'); END;
 /
-
-
-BEGIN fac.registercustversion('AAAR', 6); END;
+SET DEFINE OFF
+BEGIN adm.systrackscriptId ('$Id$', 0); END;
 /
 
 COMMIT;
-
+SET ECHO OFF
 SPOOL OFF
-
-
+SET DEFINE ON
+PROMPT Logfile of this upgrade is: &fcltlogfile