Block-Pfad-Ermittlung auf DXFMAKRO+DXFM_DIM umgestellt; Console bereinigt

Lisp/Gefaellestrecke.lsp

@@ -47,16 +47,20 @@
 (if (null *ein-ks-ein-local*) (setq *ein-ks-ein-local* nil))
 (if (null *lib-initialized*) (setq *lib-initialized* nil))
 
-;; Block-Pfad: DXFM_BLOCKS → Heuristik (3D-Bloecke benoetigt)
+;; DXFM_DIM sicher lesen (type-Guard gegen nicht-String Rueckgabewerte)
+(setq *gf-dxfm-dim* (getenv "DXFM_DIM"))
+(if (not (= (type *gf-dxfm-dim*) 'STR)) (setq *gf-dxfm-dim* "3D"))
+;; Block-Pfad: primaer aus DXFMAKRO + DXFM_DIM, dann *ssg-lisp-pfad*-Heuristik
 (if (null block-pfad)
   (setq block-pfad
     (cond
-      ((getenv "DXFM_BLOCKS")
-       (strcat (vl-string-translate "\\" "/" (getenv "DXFM_BLOCKS")) "/"))
-      ((and (boundp '*ssg-lisp-pfad*) *ssg-lisp-pfad*
+      ((and (getenv "DXFMAKRO") (= (type (getenv "DXFMAKRO")) 'STR))
+       (strcat (vl-string-right-trim "/" (vl-string-translate "\\" "/" (getenv "DXFMAKRO")))
+               "/data/ils/" *gf-dxfm-dim* "/"))
+      ((and (boundp '*ssg-lisp-pfad*) (= (type *ssg-lisp-pfad*) 'STR)
             (vl-string-search "/Lisp" *ssg-lisp-pfad*))
        (strcat (substr *ssg-lisp-pfad* 1 (vl-string-search "/Lisp" *ssg-lisp-pfad*))
-               "/data/ils/3D/"))
+               "/data/ils/" *gf-dxfm-dim* "/"))
       (t nil)
     )
   )
@@ -1241,11 +1245,11 @@
 ;; ============================================================
 ;; START
 ;; ============================================================
-(princ "\n=========================================")
 (princ "\n>>> GEFAELLESTRECKE v2.0 geladen <<<")
-(princ "\n>>> Befehl: GEFAELLESTRECKE <<<")
+(princ "\n>>> Befehl: Gefaellestrecke")
 (princ "\n    Modus 1: Manuelle Eingabe")
 (princ "\n    Modus 2: 3D-Linie")
 (princ "\n    Modus 3: Linienzug mit Gefaellebogen")
+(if block-pfad (princ (strcat "\n    Block-Pfad: " block-pfad)))
 (princ "\n=========================================")
 (princ)

Lisp/KreiselInsert.lsp

@@ -16,22 +16,25 @@
   (setq #Eckrad_LetzteNr 0)
 )
 
-;; Block-Pfad immer data/ils/2D/ (Kreisel/Eckrad Bloecke nur 2D vorhanden)
+;; DXFM_DIM sicher lesen (type-Guard gegen nicht-String Rueckgabewerte)
+(setq *ki-dxfm-dim* (getenv "DXFM_DIM"))
+(if (not (= (type *ki-dxfm-dim*) 'STR)) (setq *ki-dxfm-dim* "3D"))
+;; Block-Pfad: primaer aus DXFMAKRO + DXFM_DIM, dann *ssg-lisp-pfad*-Heuristik
 (setq block-pfad
   (cond
-    ((getenv "DXFM_DATA")
-     (strcat (vl-string-translate "\\" "/" (getenv "DXFM_DATA")) "/ils/2D/"))
-    ((and (boundp '*ssg-lisp-pfad*) *ssg-lisp-pfad*
+    ((and (getenv "DXFMAKRO") (= (type (getenv "DXFMAKRO")) 'STR))
+     (strcat (vl-string-right-trim "/" (vl-string-translate "\\" "/" (getenv "DXFMAKRO")))
+             "/data/ils/" *ki-dxfm-dim* "/"))
+    ((and (boundp '*ssg-lisp-pfad*) (= (type *ssg-lisp-pfad*) 'STR)
           (vl-string-search "/Lisp" *ssg-lisp-pfad*))
      (strcat (substr *ssg-lisp-pfad* 1 (vl-string-search "/Lisp" *ssg-lisp-pfad*))
-             "/data/ils/2D/"))
+             "/data/ils/" *ki-dxfm-dim* "/"))
     (t
      (princ "\n[KreiselInsert] WARNUNG: Block-Pfad nicht ermittelbar!")
      nil)
   )
 )
 (setq *block-path* block-pfad)
-(if block-pfad (princ (strcat "\nBlock-Pfad: " block-pfad)))
 
 ;; ssg_core laden falls noch nicht geschehen (Schutz bei direktem Laden ohne ssg-ensure)
 (if (null (car (atoms-family 1 '("SSG-CFG-OR"))))
@@ -1282,6 +1285,9 @@
   (princ)
 )
 
-(princ "\nKreiselInsert.lsp geladen (Version 7.0 - Auto-Nummerierung + Beschriftung + Attribute + Redraw + Eckrad)")
-(princ "\nBefehle: KreiselInsert, KreiselConnect, KreiselRedraw, KreiselEdit, KreiselQuick, KreiselParams, ILS_Eckrad")
+(princ "\n>>> KREISELINSERT v7.0 geladen <<<")
+(princ "\n>>> Befehle: KreiselInsert, KreiselConnect, KreiselRedraw,")
+(princ "\n             KreiselEdit, KreiselQuick, KreiselParams, ILS_Eckrad")
+(if block-pfad (princ (strcat "\n    Block-Pfad: " block-pfad)))
+(princ "\n=========================================")
 (princ)

Lisp/vf_core.lsp

@@ -11,19 +11,21 @@
 ;; ============================================================
 ;; TEIL 1: ABHAENGIGKEITEN
 ;; ============================================================
-;; Block-Pfad: 1) DXFM_BLOCKS, 2) aus *ssg-lisp-pfad* ableiten
+;; DXFM_DIM sicher lesen (type-Guard gegen nicht-String Rueckgabewerte)
+(setq *vf-dxfm-dim* (getenv "DXFM_DIM"))
+(if (not (= (type *vf-dxfm-dim*) 'STR)) (setq *vf-dxfm-dim* "3D"))
+;; Block-Pfad: primaer aus DXFMAKRO + DXFM_DIM, dann *ssg-lisp-pfad*-Heuristik
 (setq modul-pfad
   (cond
-    ((getenv "DXFM_BLOCKS")
-     (strcat (vl-string-translate "\\" "/" (getenv "DXFM_BLOCKS")) "/"))
-    ((and (boundp '*ssg-lisp-pfad*) *ssg-lisp-pfad*
+    ((and (getenv "DXFMAKRO") (= (type (getenv "DXFMAKRO")) 'STR))
+     (strcat (vl-string-right-trim "/" (vl-string-translate "\\" "/" (getenv "DXFMAKRO")))
+             "/data/ils/" *vf-dxfm-dim* "/"))
+    ((and (boundp '*ssg-lisp-pfad*) (= (type *ssg-lisp-pfad*) 'STR)
           (vl-string-search "/Lisp" *ssg-lisp-pfad*))
      (strcat (substr *ssg-lisp-pfad* 1 (vl-string-search "/Lisp" *ssg-lisp-pfad*))
-             "/data/ils/"
-             (if (getenv "DXFM_DIM") (getenv "DXFM_DIM") "2D")
-             "/"))
+             "/data/ils/" *vf-dxfm-dim* "/"))
     (t
-     (princ "\n[vf_core] WARNUNG: DXFM_BLOCKS nicht gesetzt - Block-Pfad unbekannt!")
+     (princ "\n[vf_core] WARNUNG: Block-Pfad nicht ermittelbar!")
      nil)
   )
 )
@@ -651,6 +653,7 @@
 ;; Guard: Untermodule nur beim ersten Laden von vf_core.lsp ausfuehren.
 (if (not *ssg-vf-submodule-loaded*)
   (progn
+    (princ "\n>>> VARIOFOERDERER v26.0 geladen <<<")
     ;; Lisp-Pfad ermitteln: 1) DXFM_LISP, 2) *ssg-lisp-pfad* (vom MNL gesetzt)
     (setq *vf-lisp-pfad*
       (cond
@@ -889,16 +892,13 @@
 (setq *ssg-VarioFoerderer-loaded*      t)
 (setq *ssg-EtageVarioFoerderer-loaded* t)
 
-(princ "\n=========================================")
-(princ "\n>>> VF_CORE v26.0 geladen <<<")
-(princ "\n=========================================")
-(princ "\nBefehle:")
-(princ "\n  VarioFoerderer      - Foerderanlage erstellen (Typ-Auswahl)")
-(princ "\n  FOERDERANLAGE       - Alias fuer VarioFoerderer")
-(princ "\n  ETAGEVARIOFOERDERER - Etage-Foerderanlage direkt")
-(princ "\nRegistrierte Typen:")
+(princ "\n>>> Befehle: VarioFoerderer, Foerderanlage, EtageVarioFoerderer")
+(princ "\n    Typen:")
+(setq *vf-typ-idx* 1)
 (foreach eintr *vf-typ-registry*
-  (princ (strcat "\n  " (car eintr) " - " (nth 3 eintr)))
+  (princ (strcat "\n    " (itoa *vf-typ-idx*) ".  " (car eintr) " - " (nth 3 eintr)))
+  (setq *vf-typ-idx* (1+ *vf-typ-idx*))
 )
+(if block-pfad (princ (strcat "\n    Block-Pfad: " block-pfad)))
 (princ "\n=========================================")
 (princ)