Diverse aanpassingen t.b.v. BIS

svn path=/Database/trunk/; revision=6369
This commit is contained in:
Bert in het Veld
1998-11-27 08:09:48 +00:00
parent 02e3c804c7
commit e0481b8fba
2 changed files with 8 additions and 69 deletions

View File

@@ -279,7 +279,7 @@ CREATE OR REPLACE PACKAGE BODY cad AS
DELETE FROM cad_slnkstruct
WHERE cad_slnkstruct_sessionid = Session_Id
AND cad_slnkstruct_entry <> 'FAC_MODULE'
OR cad_slnkstruct_entry <> 'SYNC';
AND cad_slnkstruct_entry <> 'SYNC';
COMMIT;
EXCEPTION
WHEN NO_DATA_FOUND THEN
@@ -310,19 +310,19 @@ CREATE OR REPLACE PACKAGE BODY cad AS
FROM cad_slnkstruct
WHERE cad_slnkstruct_sessionid = Session_Id
AND cad_slnkstruct_entry <> 'FAC_MODULE'
OR cad_slnkstruct_entry <> 'SYNC';
AND cad_slnkstruct_entry <> 'SYNC';
IF aantal > 1 THEN
DELETE FROM cad_slnkstruct
WHERE cad_slnkstruct_seqnr = 1
AND cad_slnkstruct_sessionid = Session_Id
AND cad_slnkstruct_entry <> 'FAC_MODULE'
OR cad_slnkstruct_entry <> 'SYNC';
AND cad_slnkstruct_entry <> 'SYNC';
COMMIT;
UPDATE cad_slnkstruct
SET cad_slnkstruct_seqnr = cad_slnkstruct_seqnr - 1
WHERE cad_slnkstruct_sessionid = Session_Id
AND cad_slnkstruct_entry <> 'FAC_MODULE'
OR cad_slnkstruct_entry <> 'SYNC';
AND cad_slnkstruct_entry <> 'SYNC';
COMMIT;
END IF;
EXCEPTION
@@ -428,7 +428,7 @@ CREATE OR REPLACE PACKAGE BODY cad AS
WHERE bis_boring_key = LPNKey;
/* als het een veld betreft dan oppervlakte aanpassen in tabel bis_veld */
SELECT bis_veld_key INTO VeldKey
FROM bis_boring_boringtype
FROM bis_boring
WHERE bis_boring_key = LPNKey;
IF VeldKey IS NOT NULL THEN
/* lees oppervlakte uit */
@@ -456,61 +456,6 @@ CREATE OR REPLACE PACKAGE BODY cad AS
SET bis_ontgravingsvak_volume = Volume,
bis_ontgravingsvak_diepte = Diepte
WHERE bis_ontgravingsvak_key = LPNKey;
/* "Onthoofden" van trajecten */
/*
DECLARE
CURSOR TrajectKleinerDiepte IS
SELECT CAD_S.cad_slnkstruct_valint, BIS_BT.bis_traject_key
FROM cad_slnkstruct CAD_S, bis_v_boring_trajecten BIS_BT
WHERE CAD_S.cad_slnkstruct_sessionid = Session_Id
AND CAD_S.cad_slnkstruct_entry = 'LPNKEYINSO'
AND CAD_S.cad_slnkstruct_valint = BIS_BT.bis_boring_key
AND BIS_BT.bis_traject_begindiepte < Diepte;
BEGIN
UPDATE bis_traject
SET bis_traject_einddatum = Datum
WHERE bis_traject_key IN
(SELECT * FROM TrajectKleinerDiepte)
AND bis_traject_einddatum IS NULL);
END;
DECLARE
CURSOR TrajectOverlap IS
SELECT CAD_S.cad_slnkstruct_valint, BIS_BT.bis_traject_key
FROM cad_slnkstruct CAD_S, bis_v_boring_trajecten BIS_BT
WHERE CAD_S.cad_slnkstruct_sessionid = Session_Id
AND CAD_S.cad_slnkstruct_entry = 'LPNKEYINSO'
AND CAD_S.cad_slnkstruct_valint = BIS_BT.bis_boring_key
AND BIS_BT.bis_traject_begindiepte < Diepte
AND BIS_BT.bis_traject_einddiepte > Diepte;
BEGIN
FOR TrajectOverlapRec IN TrajectOverlap LOOP
/* Maak kopie van bestaand traject en... */
/*
SELECT bis_s_bis_traject_key.nextval INTO Nieuwe_key FROM DUAL;
INSERT INTO bis_traject(bis_boring_boringtype_key, bis_traject_einddiepte, bis_traject_begindatum,
bis_traject_humus, bis_traject_lutum, bis_traject_ph, bis_traject_ec, bis_traject_opmerkingen)
SELECT bis_boring_boringtype_key, bis_traject_einddiepte, bis_traject_begindatum,
bis_traject_humus, bis_traject_lutum, bis_traject_ph, bis_traject_ec, bis_traject_opmerkingen
FROM bis_traject
WHERE bis_traject_key = TrajectOverlapRec.bis_traject_key;
/* ...maak begindiepte gelijk aan diepte van ontgravingsvak */
UPDATE bis_traject
SET bis_traject_begindiepte = Diepte
WHERE bis_traject_key = Nieuwe_key
AND bis_traject_einddatum IS NULL;
COMMIT;
END LOOP;
/* "Set" verwijderdatum van het traject dat met diepte ontgravingsvak overlapt. */
UPDATE bis_traject
SET bis_traject_einddatum = Datum
WHERE bis_traject_key IN
(SELECT * FROM TrajectOverlap)
AND bis_traject_einddatum IS NULL;
END;
/* Als boringtype = 'GROND' dan ook bodemprofiel verwijderen als het binnen ontgravingsvak valt */
*/
END IF;
cad_SLNKSTRUCTinsertVALSTR(Session_Id, 'SYNC', 1, 'AUTOCAD', 1); /* ORACLE is klaar */
END cad_SLNKpostdraw;
@@ -543,7 +488,7 @@ CREATE OR REPLACE PACKAGE BODY cad AS
UPDATE bis_veld
SET bis_veld_oppervlakte = NULL
WHERE bis_veld_key IN
(SELECT bis_veld_key FROM bis_boring_boringtype
(SELECT bis_veld_key FROM bis_boring
WHERE bis_boring_key = LPNKey);
END IF;
COMMIT;
@@ -597,7 +542,7 @@ CREATE OR REPLACE PACKAGE BODY cad AS
IF LPNName = 'LPN_BIS_BORING' THEN
/* als het een veld betreft dan oppervlakte aanpassen in tabel bis_veld */
SELECT bis_veld_key INTO VeldKey
FROM bis_boring_boringtype
FROM bis_boring
WHERE bis_boring_key = LPNKey;
IF VeldKey IS NOT NULL THEN
/* lees oppervlakte uit */

View File

@@ -94,13 +94,7 @@ CREATE_VIEW(cad_v_alg_ruimte, CAD_PRIVILEGE)
alg_verdieping_key
FROM alg_v_aanwezigruimte;
CREATE_VIEW(cad_v_alg_terreinsector, CAD_PRIVILEGE)
(alg_terreinsector_key,
alg_terreinsector_code) AS
SELECT alg_terreinsector_key,
alg_terreinsector_code
FROM alg_v_aanwezigterreinsector;
/* View met ALLE tekeningen, ongeacht de autorisatie; minimale kolommen, gebruikt in CAD_PAC.SRC */
CREATE_VIEW(cad_v_cad_tekening, CAD_PRIVILEGE) AS
SELECT ins_discipline_key,