#2060

svn path=/Database/trunk/; revision=6325

CAD/CAD_PAC.SRC

@@ -2,6 +2,7 @@
 
 /*  REVISIONS:  
  *
+ * 06-10-1998 PF  #2060 get_tekeningnaam werkt nu ook voor terreinen
  *  --- 01.40 ---
  *  --- 01.39 ---
  * 22-07-1998 KTH - diverse -- vervangen door slash-sterretje/sterretje-slash
@@ -95,21 +96,33 @@ CREATE OR REPLACE PACKAGE BODY cad AS
     IF (locatie_key    IS NOT NULL AND
         verdieping_key IS NOT NULL AND
         discipline_key IS NOT NULL) THEN
-    BEGIN
+     BEGIN
       SELECT cad_tekening_filenaam
         INTO tekeningnaam
-      FROM cad_v_cad_tekening  /* ja deze! */
+        FROM cad_v_cad_tekening  
        WHERE alg_locatie_key = locatie_key
          AND alg_verdieping_key = verdieping_key
-       AND ins_discipline_key = discipline_key;
+         AND ins_discipline_key = discipline_key;
       RETURN tekeningnaam;
-    EXCEPTION
+     EXCEPTION
       WHEN NO_DATA_FOUND THEN
-        /* raise_application_error(-20000, 'ins_m166'); */
         RETURN NULL;
-    END;
-    ELSE
-      RETURN NULL;
+     END;
+    ELSIF (locatie_key    IS NOT NULL AND
+        verdieping_key IS NULL AND
+        discipline_key IS NOT NULL) THEN
+     BEGIN
+      SELECT cad_tekening_filenaam
+        INTO tekeningnaam
+        FROM cad_v_cad_tekening  
+       WHERE alg_locatie_key = locatie_key
+         AND alg_verdieping_key IS NULL
+         AND ins_discipline_key = discipline_key;
+      RETURN tekeningnaam;
+     EXCEPTION
+      WHEN NO_DATA_FOUND THEN
+        RETURN NULL;
+     END;
     END IF;
   END cad_f_deel_get_tekeningnaam;