FSN#18275

svn path=/Database/trunk/; revision=10396
2010-09-07 08:53:00 +00:00
parent a5b09562ba
commit b5f7a0eeea
9 changed files with 4666 additions and 2640 deletions
--- a/ADM/.gitignore
+++ b/ADM/.gitignore
--- a/ADM/ADM_PAC.SRC
+++ b/ADM/ADM_PAC.SRC
@@ -0,0 +1,54 @@
+/*  $Revision: 1 $
+ *  $Modtime: 7-09-10 9:13 $
+ */
+
+CREATE OR REPLACE PACKAGE adm
+AS
+   PROCEDURE systrackscript (n IN VARCHAR2, r IN VARCHAR2, force IN NUMBER);
+END adm;
+/
+
+CREATE OR REPLACE PACKAGE BODY adm
+AS
+   PROCEDURE systrackscript (n IN VARCHAR2, r IN VARCHAR2, force IN NUMBER)
+   AS
+      revisionnr VARCHAR2 (60);
+      scriptname VARCHAR2 (60);
+      d1 adm_tracking.adm_tracking_name%TYPE;
+      d2 adm_tracking.adm_tracking_revision%TYPE;
+   BEGIN
+      -- Als force = 1 dan wordt onvoorwaardelijk getrackt, anders
+      -- wordt niet getrackt als deze (n,r) al eerder werd getrackt
+      revisionnr := REPLACE (r, '$', '');
+      revisionnr := RTRIM (REPLACE (revisionnr, 'Revision: ', ''));
+      scriptname := REPLACE (n, '$', '');
+      scriptname := RTRIM (REPLACE (scriptname, 'Workfile: ', ''));
+
+      IF force = 1
+      THEN
+         INSERT INTO adm_tracking (adm_tracking_name, adm_tracking_revision
+                                  )
+           VALUES   (scriptname, revisionnr
+                    );
+      ELSE
+         BEGIN
+            UPDATE   adm_tracking
+               SET   adm_tracking_date = SYSDATE, adm_tracking_osuser = SYS_CONTEXT ('USERENV', 'OS_USER')
+             WHERE   UPPER (adm_tracking_name) = UPPER (scriptname)
+                     AND UPPER (adm_tracking_revision) = UPPER (revisionnr);
+
+            IF SQL%ROWCOUNT = 0
+            THEN
+               INSERT INTO adm_tracking (adm_tracking_name, adm_tracking_revision
+                                        )
+                 VALUES   (scriptname, revisionnr
+                          );
+            END IF;
+         END;
+      END IF;
+   END;
+   
+END adm;
+/
+
+REGISTERRUN('$Workfile: ADM_PAC.SRC $','$Revision: 1 $')
--- a/ADM/ADM_TAB.SRC
+++ b/ADM/ADM_TAB.SRC
@@ -0,0 +1,12 @@
+/*
+ * $Revision: 1 $
+ * $Modtime: 6-09-10 15:49 $
+ */
+
+CREATE_TABLE(adm_tracking, 0)
+(
+   adm_tracking_name VARCHAR2 (60),
+   adm_tracking_revision VARCHAR2 (60),
+   adm_tracking_date DATE DEFAULT SYSDATE,
+   adm_tracking_osuser VARCHAR2 (60) DEFAULT SYS_CONTEXT('USERENV','OS_USER')
+);
--- a/CARE.SRC
+++ b/CARE.SRC
@@ -4,10 +4,9 @@
 -- Copyright 2010 SG|facilitor bv.
 -- All rights reserved!
 /*
- * $Revision: 1 $
- * $Modtime: 21-07-10 19:28 $
+ * $Revision: 2 $
+ * $Modtime: 7-09-10 10:58 $
 */
-
 #include "modules.h"
 #include "comsql.h"

@@ -29,19 +28,17 @@ PROMPT

 SET LINESIZE 500
 SET ECHO ON
-#include "care_vie.src"
-#include "care_pac.src"
-#include "care_ini.src"
+#include "care\care_vie.src"
+#include "care\care_pac.src"
+#include "care\care_ini.src"

 COMMIT;

 ///////////////////////////// finally compile all views, triggers etc acc to the latest state ///////
 BEGIN DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE); END;
 /
-/*
--BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, '$Revision: 1 $', NULL); END;
--/
-*/
+REGISTERONCE('$Workfile: CARE.SRC $','$Revision: 2 $')
+
 COMMIT;
 ///////////////////////////// Report invalid objects, if any ///////
 SET ECHO OFF
@@ -49,9 +46,10 @@ SET LINESIZE 120
 PROMPT List of all invalid objects after Facilitor Care-Webb upgrade:
 SELECT _VERSION||' Warning: ' || object_type || ' ' || object_name || ' is ' || status
  FROM user_objects
-WHERE object_type IN ('VIEW', 'TRIGGER', 'PACKAGE', 'PROCEDURE', 'FUNCTION', 'PACKAGE BODY')
-AND status <> 'VALID'
-ORDER BY object_name;
+ WHERE object_type IN ('VIEW', 'TRIGGER', 'PACKAGE', 'PROCEDURE', 'FUNCTION', 'PACKAGE BODY')
+   AND status <> 'VALID'
+   AND UPPER(object_name) LIKE 'CARE%'
+ ORDER BY object_name;

 SELECT 'Care-Webb/' || USER || ' is now ' || fac.getdbversion() FROM DUAL;
 PROMPT De upgrade is gereed, controleer de LST-files.
--- a/CARE/CARE_INI.SRC
+++ b/CARE/CARE_INI.SRC
@@ -1,8 +1,8 @@
 #ifdef CARE
 /* CARE_INI.SRC
 *
- * $Revision: 1 $
- * $Modtime: 3-08-10 16:09 $
+ * $Revision: 2 $
+ * $Modtime: 7-09-10 10:00 $
 */

 _FAC_MODULE('CARE','Care-Webb')
@@ -17,19 +17,6 @@ _FAC_MODULE('CARE','Care-Webb')
 ----            |------ Client (Clienten)


-- De gegevens voor het interne (default) 'CARE'-bedrijf (key=2)
-
-- Bedrijfsnaam
-UPDATE prs_bedrijf SET prs_bedrijf_naam = '&Bedrijfsnaam' WHERE prs_bedrijf_key = 2;
-- WZA code
-UPDATE prs_bedrijf SET prs_leverancier_nr = '&WZAcode' WHERE prs_bedrijf_key = 2;
-- Uitvoerende uit zetten
-UPDATE prs_bedrijf SET prs_bedrijf_uitvoerende = NULL WHERE prs_bedrijf_key = 2;
-
-
-- De default afdeling 'Onbekend' (key=1) onder het bedrijf hernoemen naar Adm - Administratie
-UPDATE prs_afdeling SET prs_afdeling_naam = 'Adm', prs_afdeling_omschrijving = 'Administratie'
-WHERE prs_afdeling_key = 1;

 -- Nieuwe afdeling 'HV-medewrk'
 INSERT INTO prs_afdeling (prs_afdeling_key, prs_bedrijf_key, prs_afdeling_naam, prs_afdeling_omschrijving)
@@ -829,7 +816,26 @@ WHERE EXISTS
    AND mi.fac_menuitems_groep IN (0,1)
    );

+-- De gegevens voor het interne (default) 'CARE'-bedrijf (key=2)
+-- Bedrijfsnaam
+UPDATE prs_bedrijf SET prs_bedrijf_naam = '&Bedrijfsnaam' WHERE prs_bedrijf_key = 2;
+-- WZA code
+UPDATE prs_bedrijf SET prs_leverancier_nr = '&WZAcode' WHERE prs_bedrijf_key = 2;
+-- Uitvoerende uit zetten
+UPDATE prs_bedrijf SET prs_bedrijf_uitvoerende = NULL WHERE prs_bedrijf_key = 2;


+-- De default afdeling 'Onbekend' (key=1) onder het bedrijf hernoemen naar Adm - Administratie
+UPDATE prs_afdeling SET prs_afdeling_naam = 'Adm', prs_afdeling_omschrijving = 'Administratie'
+WHERE prs_afdeling_key = 1;
+
+-- Een insert in fac_qlikview t.b.v. de Analyzer-autorisatie in Qlikview-file 'fclt_care'
+INSERT INTO fac_qlikview (fac_qlikview_omschrijving, fac_qlikview_qvw_name, fac_functie_key)
+SELECT 'Beschikkingen', 'fclt_care', fac_functie_key
+FROM fac_functie
+WHERE fac_functie_code = 'WEB_MLDBAC'
+
+
+REGISTERONCE('$Workfile: CARE_INI.SRC $','$Revision: 2 $')

 #endif // CARE
--- a/CARE/CARE_VIE.SRC
+++ b/CARE/CARE_VIE.SRC
--- a/COMSQL.H
+++ b/COMSQL.H
@@ -2,8 +2,8 @@
 #define _COMSQL_H
 /*
 *  COMSQL.H
- *  $Revision: 109 $
- *  $Modtime: 24-06-10 16:35 $
+ *  $Revision: 110 $
+ *  $Modtime: 7-09-10 10:08 $
 */

 /*
@@ -11,94 +11,25 @@
 * - gebruik ~ waar een \n gewenst is (zie bv. CREATE_TABLE())
 */

-
-/*
- * In principe moeten alle tabellen en views aangemaakt worden met
- * CREATE_TABLE() resp. CREATE_VIEW() om ook het toekennen van geschikte
- * roles af te dwingen (uitzondering is table fac_privilege)
- *
- * (S)elect, (I)nsert, (D)elete, (U)pdate
- *
- * level small full archive
- * ----- ----- ---- -------
- *   1    SIDU SIDU  SIDU   ; bv. tijdelijke tabellen
- *   2    S    SIDU  SIDU   ; normale tabellen
- *   3    S    S     SIDU   ; bibliotheek tabellen
- *   4    -    -     -      ; tabellen die niet mogen worden ingezien
- *
- * Since 4.60, privileges are not used any more, so these are really dummies.
- */
 #define STRINGIZE(a) #@a

+/* The minimum required software version */
 #define _VERSIONMAJ 5
-#define _VERSIONMIN 00
-#define _VERSIONPATCH STRINGIZE(5)
+#define _VERSIONMIN 0
+#define _VERSIONPATCH STRINGIZE(9)
 #define _VERSIONCODE 500
-#define _VERSION '5.00.5'
-#define _RECREATESCRIPT recre500
+#define _VERSION '5.00.9'

-#define BASIS_PRIVILEGE       0
-#define NORMAAL_PRIVILEGE     0
-#define BIBLIOTHEEK_PRIVILEGE 0
+/* The database schema version; must increase with every release */
+#define _DBVERSION 6
+#define _RECREATESCRIPT recre6

-#define ALG_MODULE_OFFSET           0
-#define ALG_BASIS_PRIVILEGE         BASIS_PRIVILEGE
-#define ALG_NORMAAL_PRIVILEGE       NORMAAL_PRIVILEGE
-#define ALG_BIBLIOTHEEK_PRIVILEGE   BIBLIOTHEEK_PRIVILEGE
+#define REGISTERONCE(f, r) \
+BEGIN adm.systrackscript(f, r, 0); END;~/

-#define FAC_MODULE_OFFSET           ALG_MODULE_OFFSET
-#define FAC_BASIS_PRIVILEGE         BASIS_PRIVILEGE
-#define FAC_NORMAAL_PRIVILEGE       NORMAAL_PRIVILEGE
-#define FAC_BIBLIOTHEEK_PRIVILEGE   BIBLIOTHEEK_PRIVILEGE
+#define REGISTERRUN(f, r) \
+BEGIN adm.systrackscript(f, r, 1); END;~/

-#define INS_MODULE_OFFSET          10
-#define INS_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define INS_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define INS_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define PRS_MODULE_OFFSET          20
-#define PRS_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define PRS_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define PRS_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define MLD_MODULE_OFFSET          30
-#define MLD_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define MLD_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define MLD_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define RES_MODULE_OFFSET          70
-#define RES_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define RES_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define RES_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define BEZ_MODULE_OFFSET          80
-#define BEZ_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define BEZ_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define BEZ_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define WEB_MODULE_OFFSET          90
-#define WEB_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define WEB_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define WEB_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define CNT_MODULE_OFFSET          100
-#define CNT_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define CNT_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define CNT_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define BES_MODULE_OFFSET          110
-#define BES_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define BES_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define BES_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-#define SCH_MODULE_OFFSET          120
-#define SCH_BASIS_PRIVILEGE        BASIS_PRIVILEGE
-#define SCH_NORMAAL_PRIVILEGE      NORMAAL_PRIVILEGE
-#define SCH_BIBLIOTHEEK_PRIVILEGE  BIBLIOTHEEK_PRIVILEGE
-
-
-#define _LEFT_JOIN(table,where) \
-, table

 #define SET_VERWIJDER_CHILDREN(child_table, parent_key, parent_verwijder,      \
        child_verwijder, table)                                                \
@@ -152,10 +83,6 @@
 #define _SPOOL(x) \
 SPOOL x

-#define _ORACLE(x) x
-#define _ORACLE1(x) x,
-#define _MSSQL(x)
-
 #define _EQ_OLD(x,y) \
 x = :old.y

@@ -164,10 +91,6 @@ PROMPT x
 #define PROMPT2(x,y) \
 PROMPT x,y

-#define _SET_SQLS(x)
-#define _SET_ORACLE(x) \
-SET x
-
 #define _INTO_VAR(x) \
 INTO x

@@ -757,7 +680,7 @@ CEIL
 #define UPD_FAC_FUNCTIE2(c, o, m, l, d, i) UPDATE fac_functie SET fac_functie_omschrijving=0,fac_functie_module=m,fac_functie_min_level=l, fac_functie_discipline=d, fac_functie_info=i) WHERE fac_functie_code=c
 #define DEF_FAC_SRTNOT(c, m, o, u, g, x) INSERT INTO fac_srtnotificatie (fac_srtnotificatie_code, fac_srtnotificatie_mode, fac_srtnotificatie_oms, fac_srtnotificatie_url, fac_srtnotificatie_groep, fac_srtnotificatie_xmlnode) VALUES (c, m, o, u, g, x)

-#define DEF_MENUKOP(g, s) INSERT INTO fac_menu (fac_menu_volgnr, fac_menu_altlabel, fac_menu_altgroep) SELECT COALESCE(MAX(fac_menuitems_key),0)*100+50, s, g FROM fac_menuitems;
+#define DEF_MENUKOP(g, s) INSERT INTO fac_menu (fac_menu_volgnr, fac_menu_altlabel, fac_menu_altgroep) SELECT COALESCE(MAX(fac_menuitems_key),0)*100+50, s, g FROM fac_menuitems
 #define DEF_MENUITEM(g, l, i, m, u, s, d, f, rw, x) INSERT INTO fac_menuitems (fac_menuitems_groep, fac_menuitems_label, fac_menuitems_oms, fac_menuitems_module, fac_menuitems_url, fac_menuitems_srtdisc, fac_menuitems_disc, fac_functie_key, fac_menuitems_rw, fac_menuitems_default) SELECT g, l, i, m, u, s, d, fac_functie_key, rw, x FROM fac_functie WHERE fac_functie_code=f
 #define DEF_SETTING(m, n, d, t)INSERT INTO fac_setting (fac_setting_module ,fac_setting_name, fac_setting_default, fac_setting_description) VALUES (m, n, d, t)

@@ -830,14 +753,6 @@ _ORACLE(END)
 SQL_SPOOL(START n.m) ~\
 END_MODULE(m)

-#define UPDATE_VERSION(n, r) \
-UPDATE fac_module SET fac_module_version=n; ~\
-UPDATE fac_version \
-SET fac_version_major = _VERSIONMAJ, \
-    fac_version_minor = _VERSIONMIN, \
-    fac_version_patch = _VERSIONPATCH, \
-    fac_version_revision = r
-
 #define __T__USER_OBJECTS__OBJECT_TYPE__TYPE \
 VARCHAR2(50)

--- a/FCLT.SRC
+++ b/FCLT.SRC
@@ -4,10 +4,9 @@
 -- Copyright 1996-2010 SG|facilitor bv.
 -- All rights reserved!
 /*
- * $Revision: 60 $
- * $Modtime: 10-02-10 18:33 $
+ * $Revision: 61 $
+ * $Modtime: 7-09-10 10:53 $
 */
-
 #include "modules.h"
 #include "comsql.h"

@@ -24,152 +23,147 @@ PROMPT is gebruikt om de Facilitor(r) _VERSION omgeving in Oracle aan te
 PROMPT maken.
 PROMPT
 PROMPT Dit script is gerund in user:
-SHOW USER _GO
+SHOW USER
 PROMPT
 PROMPT

 SET LINESIZE 500
 SET ECHO ON
+#include "adm\adm_tab.src"
+#include "adm\adm_pac.src"

 /* TABLES */
-#include "fac_tab.src"
-#include "alg_tab.src"
-#include "ins_tab.src"
-#include "prs_tab.src"
-#include "mld_tab.src"
-#include "mrk_tab.src"
-#include "cad_tab.src"
-#include "res_tab.src"
-#include "bez_tab.src"
-#include "web_tab.src"
-#include "cnt_tab.src"
-#include "bes_tab.src"
-#include "pra_tab.src"
-#include "sch_tab.src"
-#include "fin_tab.src"
-#include "prj_tab.src"
-#include "msg_tab.src"
+#include "fac\fac_tab.src"
+#include "alg\alg_tab.src"
+#include "ins\ins_tab.src"
+#include "prs\prs_tab.src"
+#include "mld\mld_tab.src"
+#include "mrk\mrk_tab.src"
+#include "cad\cad_tab.src"
+#include "res\res_tab.src"
+#include "bez\bez_tab.src"
+#include "web\web_tab.src"
+#include "cnt\cnt_tab.src"
+#include "bes\bes_tab.src"
+#include "sch\sch_tab.src"
+#include "fin\fin_tab.src"
+#include "prj\prj_tab.src"
+#include "msg\msg_tab.src"

 /* SEQUENCES */
-#include "fac_seq.src"
-#include "alg_seq.src"
-#include "ins_seq.src"
-#include "prs_seq.src"
-#include "mld_seq.src"
-#include "mrk_seq.src"
-#include "cad_seq.src"
-#include "res_seq.src"
-#include "bez_seq.src"
-#include "web_seq.src"
-#include "cnt_seq.src"
-#include "bes_seq.src"
-#include "pra_seq.src"
-#include "sch_seq.src"
-#include "fin_seq.src"
-#include "prj_seq.src"
-#include "msg_seq.src"
+#include "fac\fac_seq.src"
+#include "alg\alg_seq.src"
+#include "ins\ins_seq.src"
+#include "prs\prs_seq.src"
+#include "mld\mld_seq.src"
+#include "mrk\mrk_seq.src"
+#include "cad\cad_seq.src"
+#include "res\res_seq.src"
+#include "bez\bez_seq.src"
+#include "web\web_seq.src"
+#include "cnt\cnt_seq.src"
+#include "bes\bes_seq.src"
+#include "sch\sch_seq.src"
+#include "fin\fin_seq.src"
+#include "prj\prj_seq.src"
+#include "msg\msg_seq.src"

 /* VIEWS */
-#include "fac_vie.src"
-#include "alg_vie.src"
-#include "ins_vie.src"
-#include "prs_vie.src"
-#include "mld_vie.src"
-#include "mrk_vie.src"
-#include "cad_vie.src"
-#include "res_vie.src"
-#include "bez_vie.src"
-#include "web_vie.src"
-#include "cnt_vie.src"
-#include "bes_vie.src"
-#include "pra_vie.src"
-#include "sch_vie.src"
-#include "fin_vie.src"
-#include "prj_vie.src"
-#include "msg_vie.src"
+#include "fac\fac_vie.src"
+#include "alg\alg_vie.src"
+#include "ins\ins_vie.src"
+#include "prs\prs_vie.src"
+#include "mld\mld_vie.src"
+#include "mrk\mrk_vie.src"
+#include "cad\cad_vie.src"
+#include "res\res_vie.src"
+#include "bez\bez_vie.src"
+#include "web\web_vie.src"
+#include "cnt\cnt_vie.src"
+#include "bes\bes_vie.src"
+#include "sch\sch_vie.src"
+#include "fin\fin_vie.src"
+#include "prj\prj_vie.src"
+#include "msg\msg_vie.src"

-#include "cnt_pac.src" 
-#include "mld_pac.src" 
-#include "mrk_pac.src" 
-#include "fac_pac.src"
-#include "ins_pac.src"
-#include "prs_pac.src"
-#include "cad_pac.src"
-#include "res_pac.src"
-#include "bez_pac.src"
-#include "web_pac.src"
-#include "bes_pac.src"
-#include "pra_pac.src"
-#include "sch_pac.src"
-#include "fin_pac.src"
-#include "prj_pac.src"
-#include "msg_pac.src"
+#include "cnt\cnt_pac.src"
+#include "mld\mld_pac.src"
+#include "mrk\mrk_pac.src"
+#include "fac\fac_pac.src"
+#include "ins\ins_pac.src"
+#include "prs\prs_pac.src"
+#include "cad\cad_pac.src"
+#include "res\res_pac.src"
+#include "bez\bez_pac.src"
+#include "web\web_pac.src"
+#include "bes\bes_pac.src"
+#include "sch\sch_pac.src"
+#include "fin\fin_pac.src"
+#include "prj\prj_pac.src"
+#include "msg\msg_pac.src"

 /* INDICES */
-#include "fac_ind.src"
-#include "alg_ind.src"
-#include "ins_ind.src"
-#include "prs_ind.src"
-#include "mld_ind.src"
-#include "mrk_ind.src"
-#include "cad_ind.src"
-#include "res_ind.src"
-#include "bez_ind.src"
-#include "web_ind.src"
-#include "cnt_ind.src"
-#include "bes_ind.src"
-#include "pra_ind.src"
-#include "sch_ind.src"
-#include "fin_ind.src"
-#include "prj_ind.src"
-#include "msg_ind.src"
+#include "fac\fac_ind.src"
+#include "alg\alg_ind.src"
+#include "ins\ins_ind.src"
+#include "prs\prs_ind.src"
+#include "mld\mld_ind.src"
+#include "mrk\mrk_ind.src"
+#include "cad\cad_ind.src"
+#include "res\res_ind.src"
+#include "bez\bez_ind.src"
+#include "web\web_ind.src"
+#include "cnt\cnt_ind.src"
+#include "bes\bes_ind.src"
+#include "sch\sch_ind.src"
+#include "fin\fin_ind.src"
+#include "prj\prj_ind.src"
+#include "msg\msg_ind.src"

 /* TRIGGERS */
-#include "fac_tri.src"
-#include "alg_tri.src"
-#include "ins_tri.src"
-#include "prs_tri.src"
-#include "cnt_tri.src"
-#include "mld_tri.src"
-#include "mrk_tri.src"
-#include "cad_tri.src"
-#include "res_tri.src"
-#include "bez_tri.src"
-#include "web_tri.src"
-#include "bes_tri.src"
-#include "pra_tri.src"
-#include "sch_tri.src"
-#include "fin_tri.src"
-#include "prj_tri.src"
-#include "msg_tri.src"
+#include "fac\fac_tri.src"
+#include "alg\alg_tri.src"
+#include "ins\ins_tri.src"
+#include "prs\prs_tri.src"
+#include "cnt\cnt_tri.src"
+#include "mld\mld_tri.src"
+#include "mrk\mrk_tri.src"
+#include "cad\cad_tri.src"
+#include "res\res_tri.src"
+#include "bez\bez_tri.src"
+#include "web\web_tri.src"
+#include "bes\bes_tri.src"
+#include "sch\sch_tri.src"
+#include "fin\fin_tri.src"
+#include "prj\prj_tri.src"
+#include "msg\msg_tri.src"

 /* INITIALISATIES */
-#include "fac_ini.src"
-#include "alg_ini.src"
-#include "ins_ini.src"
-#include "prs_ini.src"
-#include "mld_ini.src"
-#include "mrk_ini.src"
-#include "cad_ini.src"
-#include "res_ini.src"
-#include "bez_ini.src"
-#include "web_ini.src"
-#include "cnt_ini.src"
-#include "bes_ini.src"
-#include "pra_ini.src"
-#include "sch_ini.src"
-#include "fin_ini.src"
-#include "prj_ini.src"
-#include "msg_ini.src"
+#include "fac\fac_ini.src"
+#include "alg\alg_ini.src"
+#include "ins\ins_ini.src"
+#include "prs\prs_ini.src"
+#include "mld\mld_ini.src"
+#include "mrk\mrk_ini.src"
+#include "cad\cad_ini.src"
+#include "res\res_ini.src"
+#include "bez\bez_ini.src"
+#include "web\web_ini.src"
+#include "cnt\cnt_ini.src"
+#include "bes\bes_ini.src"
+#include "sch\sch_ini.src"
+#include "fin\fin_ini.src"
+#include "prj\prj_ini.src"
+#include "msg\msg_ini.src"
 COMMIT;

 ///////////////////////////// finally compile all views, triggers etc acc to the latest state ///////
-[skip]
 BEGIN DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE); END;
 /
-BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, '$Revision: 60 $', NULL); END;
+BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBVERSION, NULL); END;
 /
-[/skip]
+REGISTERONCE('$Workfile: FCLT.SRC $','$Revision: 61 $')
+
 COMMIT;
 ///////////////////////////// Report invalid objects, if any ///////
 SET ECHO OFF
--- a/_UP/recreate.src
+++ b/_UP/recreate.src
@@ -2,9 +2,6 @@
 -- Recreate script van Facilitor
 --
 /*
- * This script is precompiled so #if(n)def MS_SQL can be used to distinguish between
- * SQL Server and Oracle specific statements.
- *
 * C-style comment is removed from the result
 */
 #include "modules.h"
@@ -20,10 +17,10 @@ SET DEFINE OFF
 PROMPT ***********************************************************************
 PROMPT
 PROMPT RECREATE SCRIPT van Facilitor
-PROMPT $Revision: 5 $
-PROMPT $Modtime: 5-11-09 19:20 $
+PROMPT $Revision: 6 $
+PROMPT $Modtime: 7-09-10 11:07 $
 PROMPT
-PROMPT Re-creeert alle algemene views, triggers etc van een Faciltor schema
+PROMPT Re-creeert alle algemene views, triggers etc van Faciltor schema _DBVERSION
 PROMPT
 PROMPT Het wordt aangeraden om deze upgrade te draaien op een moment dat er
 PROMPT geen gebruikers bezig zijn met de applicatie.
@@ -46,61 +43,62 @@ SPOOL xrecreate.LST
 /////////////////////////////////////////////////////////////////////////////////////////////////

 // Recreation all views
-#include "fac_vie.src"
-#include "alg_vie.src"
-#include "ins_vie.src"
-#include "prs_vie.src"
-#include "mld_vie.src"
-#include "cad_vie.src"
-#include "res_vie.src"
-#include "bez_vie.src"
-#include "web_vie.src"
-#include "cnt_vie.src"
-#include "bes_vie.src"
-#include "pra_vie.src"
-#include "mrk_vie.src"
-#include "sch_vie.src"
-#include "fin_vie.src"
-#include "prj_vie.src"
+#include "fac\fac_vie.src"
+#include "alg\alg_vie.src"
+#include "ins\ins_vie.src"
+#include "prs\prs_vie.src"
+#include "mld\mld_vie.src"
+#include "cad\cad_vie.src"
+#include "res\res_vie.src"
+#include "bez\bez_vie.src"
+#include "web\web_vie.src"
+#include "cnt\cnt_vie.src"
+#include "bes\bes_vie.src"
+#include "pra\pra_vie.src"
+#include "mrk\mrk_vie.src"
+#include "sch\sch_vie.src"
+#include "fin\fin_vie.src"
+#include "prj\prj_vie.src"

 // Recreation all packages
-#include "cnt_pac.src"
-#include "mld_pac.src"
-#include "fac_pac.src"
-#include "ins_pac.src"
-#include "prs_pac.src"
-#include "cad_pac.src"
-#include "res_pac.src"
-#include "bez_pac.src"
-#include "web_pac.src"
-#include "bes_pac.src"
-#include "pra_pac.src"
-#include "mrk_pac.src"
-#include "sch_pac.src"
-#include "fin_pac.src"
-#include "prj_pac.src"
+#include "adm\adm_pac.src"
+#include "cnt\cnt_pac.src"
+#include "mld\mld_pac.src"
+#include "fac\fac_pac.src"
+#include "ins\ins_pac.src"
+#include "prs\prs_pac.src"
+#include "cad\cad_pac.src"
+#include "res\res_pac.src"
+#include "bez\bez_pac.src"
+#include "web\web_pac.src"
+#include "bes\bes_pac.src"
+#include "pra\pra_pac.src"
+#include "mrk\mrk_pac.src"
+#include "sch\sch_pac.src"
+#include "fin\fin_pac.src"
+#include "prj\prj_pac.src"

 // Recreation all triggers
-#include "fac_tri.src"
-#include "alg_tri.src"
-#include "ins_tri.src"
-#include "prs_tri.src"
-#include "cnt_tri.src"
-#include "mld_tri.src"
-#ifndef MS_SQL
-#include "cad_tri.src"
-#endif
-#include "res_tri.src"
-#include "bez_tri.src"
-#include "web_tri.src"
-#include "bes_tri.src"
-#include "pra_tri.src"
-#include "mrk_tri.src"
-#include "sch_tri.src"
-#include "fin_tri.src"
-#include "prj_tri.src"
+#include "fac\fac_tri.src"
+#include "alg\alg_tri.src"
+#include "ins\ins_tri.src"
+#include "prs\prs_tri.src"
+#include "cnt\cnt_tri.src"
+#include "mld\mld_tri.src"
+#include "cad\cad_tri.src"
+#include "res\res_tri.src"
+#include "bez\bez_tri.src"
+#include "web\web_tri.src"
+#include "bes\bes_tri.src"
+#include "pra\pra_tri.src"
+#include "mrk\mrk_tri.src"
+#include "sch\sch_tri.src"
+#include "fin\fin_tri.src"
+#include "prj\prj_tri.src"
+
+REGISTERONCE('$Workfile: recreate.src $','$Revision: 6 $')

 SPOOL OFF
 SET DEFINE ON
 SET ECHO OFF
-PROMPT De recreate is gereed.. Controleer de LST-file.
+PROMPT De recreate is gereed.. Controleer de LST-file.