@enervance/insight-cim-model 0.0.54 → 0.0.57

package/dist/converter/integral7/converter-i7.js

@@ -141,7 +141,7 @@ class ConverterI7 {
         this.exportFrames = new Map();
         this.exportFramesBoundary = new Map();
         this.cimModelDefault = new INTEGRALModel_1.INTEGRALModel();
-        this.availableTableNames = [];
+        this.availableTableNames = new Map();
         this.integralID2Type = new Map();
         this.coordinateSystem = 'EPSG:4326';
         this.integralID2UUID = new Map();
@@ -396,6 +396,10 @@ class ConverterI7 {
                 yield this.convertSVC(cimModel, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertSVC`);
             }
+            startTime = perf_hooks_1.performance.now();
+            if (standortIDs.length)
+                yield this.convertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
+            logExecutionTime(this.logger, startTime, `convertSchaltanlagen(${standortIDs.length})`);
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks_1.performance.now();
                 yield this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
@@ -431,60 +435,62 @@ class ConverterI7 {
             logExecutionTime(this.logger, startTime, `convertNetzvarianten`);
             for (const key of integral7Modell.i7SchemaID2UUID.keys()) {
                 startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                const convertAll = yield this.convertSchemaStandorte(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
                 logExecutionTime(this.logger, startTime, `convertSchemaStandorte`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
-                startTime = perf_hooks_1.performance.now();
-                logExecutionTime(this.logger, startTime, `convertSchemaHgueKnotenSo`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlage`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlagenAbschnitte`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSammelschienenAbschnitte`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaSchaltfeldElemente`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaQuerkupplungen`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaLaengskupplungen`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaTransformatoren2W(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren2W`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaTransformatoren3W(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren3W`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaQuerzweige(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaQuerzweige`);
-                startTime = perf_hooks_1.performance.now();
-                logExecutionTime(this.logger, startTime, `convertSchemaSternpunktSchiene`);
-                startTime = perf_hooks_1.performance.now();
-                logExecutionTime(this.logger, startTime, `convertSchemaSternpunktKnoten`);
-                startTime = perf_hooks_1.performance.now();
-                yield this.convertSchemaLeitungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
-                logExecutionTime(this.logger, startTime, `convertSchemaLeitungen`);
-                integral7Modell.integralLaengskupplungen.clear();
-                integral7Modell.integralHgueLeitungen.clear();
-                integral7Modell.i7ID2UUID.clear();
-                integral7Modell.i7SchemaID2Type.clear();
+                if (convertAll) {
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaKnotenSo(cimModel, integral7Modell, knotenSoIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaKnotenSo`);
+                    startTime = perf_hooks_1.performance.now();
+                    logExecutionTime(this.logger, startTime, `convertSchemaHgueKnotenSo`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaSchaltanlage(cimModel, integral7Modell, schaltanlagenIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlage`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaSchaltanlagenAbschnitte`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaSammelschienenAbschnitte(cimModel, integral7Modell, schaltanlagenAbschnittIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaSammelschienenAbschnitte`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaSchaltfeldElemente(cimModel, integral7Modell, schaltfeldIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaSchaltfeldElemente`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaQuerkupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaQuerkupplungen`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaLaengskupplungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaLaengskupplungen`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaTransformatoren2W(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren2W`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaTransformatoren3W(cimModel, integral7Modell, standortIDs, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaTransformatoren3W`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaQuerzweige(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaQuerzweige`);
+                    startTime = perf_hooks_1.performance.now();
+                    logExecutionTime(this.logger, startTime, `convertSchemaSternpunktSchiene`);
+                    startTime = perf_hooks_1.performance.now();
+                    logExecutionTime(this.logger, startTime, `convertSchemaSternpunktKnoten`);
+                    startTime = perf_hooks_1.performance.now();
+                    yield this.convertSchemaLeitungen(cimModel, integral7Modell, key, constants_1.NsgConstants.onlyEingeblendet);
+                    logExecutionTime(this.logger, startTime, `convertSchemaLeitungen`);
+                    integral7Modell.integralLaengskupplungen.clear();
+                    integral7Modell.integralHgueLeitungen.clear();
+                    integral7Modell.i7ID2UUID.clear();
+                    integral7Modell.i7SchemaID2Type.clear();
+                    integral7Modell.integralNSGSchaltanlage.clear();
+                    integral7Modell.integralNSGSchaltfeld.clear();
+                    integral7Modell.integralNSGSAAbschnitt.clear();
+                    integral7Modell.integralNSGSsab.clear();
+                    integral7Modell.integralNSGStpSchiene.clear();
+                    integral7Modell.integralNSGStpKnoten.clear();
+                    integral7Modell.integralNSGTrafos.clear();
+                    integral7Modell.integralNSGQuerzweig.clear();
+                }
                 integral7Modell.integralNSGStandorte.clear();
-                integral7Modell.integralNSGSchaltanlage.clear();
-                integral7Modell.integralNSGSchaltfeld.clear();
-                integral7Modell.integralNSGSAAbschnitt.clear();
-                integral7Modell.integralNSGSsab.clear();
-                integral7Modell.integralNSGStpSchiene.clear();
-                integral7Modell.integralNSGStpKnoten.clear();
-                integral7Modell.integralNSGTrafos.clear();
-                integral7Modell.integralNSGQuerzweig.clear();
                 integral7Modell.placedCIMObjectsForDLProfil.clear();
             }
         });
@@ -507,7 +513,6 @@ class ConverterI7 {
                         }
                     }
                     else {
-                        console.log(`Terminal without connection ${terminalUUID}`);
                     }
                 }
             }
@@ -526,7 +531,6 @@ class ConverterI7 {
                         }
                     }
                     else {
-                        console.log(`Terminal without connection ${terminalUUID}`);
                     }
                 }
             }
@@ -545,7 +549,6 @@ class ConverterI7 {
                         }
                     }
                     else {
-                        console.log(`Terminal without connection ${terminalUUID}`);
                     }
                 }
             }
@@ -634,7 +637,7 @@ class ConverterI7 {
     convertNetzvarianten(cimModel, integral7) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NETZVARIANTEN)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NETZVARIANTEN, [2]));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NETZVARIANTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NETZVARIANTEN), [2]));
                 for (const i7Data of result) {
                     const diagram = new Diagram_1.Diagram(utils_1.getUUID(i7Data.guid), i7Data.name, String(i7Data.id));
                     diagram.orientation = OrientationKind_1.OrientationKind.negative;
@@ -650,8 +653,9 @@ class ConverterI7 {
     }
     convertSchemaStandorte(cimModel, integral7, standortIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let retVal = false;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STANDORT) && standortIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STANDORT), standortIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_STANDORT);
@@ -661,16 +665,20 @@ class ConverterI7 {
                         integral7.integralNSGStandorte.set(i7Data.id, standort.standortNsg);
                     }
                 }
+                if (filteredResults.length > 0) {
+                    retVal = true;
+                }
             }
             else {
                 this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.NSG_STANDORT} ist nicht vorhanden.`);
             }
+            return retVal;
         });
     }
     convertSchemaKnotenSo(cimModel, integral7, knotenSoIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) && knotenSoIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_SO, knotenSoIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO), knotenSoIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO);
@@ -687,7 +695,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE) && nsgStandortIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_HGUE, nsgStandortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_KNOTEN_HGUE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE), nsgStandortIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_KNOTEN_HGUE);
@@ -703,7 +711,7 @@ class ConverterI7 {
     convertSchemaSchaltanlage(cimModel, integral7, saIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE) && saIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, saIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE), saIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGE);
@@ -722,7 +730,7 @@ class ConverterI7 {
     convertSchemaSchaltanlagenAbschnitte(cimModel, integral7, schaltanlagenabschnittIDs, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT) && schaltanlagenabschnittIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, schaltanlagenabschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT), schaltanlagenabschnittIDs));
                 const filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(result, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_SCHALTANLAGENABSCHNITT);
@@ -786,41 +794,40 @@ class ConverterI7 {
             for (const queryResult of filteredResults) {
                 const nsgSa = integral7.integralNSGSchaltanlage.get(queryResult.nsgsa);
                 const nsgSo = integral7.integralNSGStandorte.get(nsgSa.nsgsoid);
-                if (nsgSo === undefined) {
-                    continue;
-                }
-                const leftOffset = queryResult.nslots * constants_1.NsgConstants.HORIZONTAL_OFFSET;
-                const topOffset = queryResult.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
-                const ssabLength = queryResult.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
-                let pointTopLeft = new DiagramObjectPoint_1.DiagramObjectPoint(leftOffset, topOffset, 1);
-                let pointBottomRight = new DiagramObjectPoint_1.DiagramObjectPoint(leftOffset + ssabLength, topOffset, 2);
-                let saaShiftOffset = 0;
-                for (const tempNsgSaa of nsgSa.saabNsg) {
-                    saaShiftOffset = saaShiftOffset < (tempNsgSaa.nslots + tempNsgSaa.laenge) ? (tempNsgSaa.nslots + tempNsgSaa.laenge) : saaShiftOffset;
-                }
-                const points = [];
-                points.push(pointTopLeft, pointBottomRight);
-                for (const p of points) {
-                    util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * nsgSa.ausrichtung);
-                    p.xPosition += nsgSo.xrel + nsgSa.xrel + (nsgSa.ausrichtung === 2 ? saaShiftOffset * constants_1.NsgConstants.HORIZONTAL_OFFSET : 0);
-                    p.yPosition += nsgSo.yrel + nsgSa.yrel + (nsgSa.ausrichtung === 3 ? saaShiftOffset * constants_1.NsgConstants.HORIZONTAL_OFFSET : 0);
-                }
-                integral7.integralNSGSsab.set(queryResult.idSSAB, queryResult);
-                const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'SSAB Diagram');
-                diagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
-                utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
-                const cnUUID = this.integralID2UUID.get(queryResult.idSSAB);
-                const connectivityNode = cimModel.getConnectivityNode(cnUUID);
-                diagramObject.setIdentifiedObject(connectivityNode);
-                const diagramUUID = integral7.i7SchemaID2UUID.get(nsgSa.variantennr);
-                const diagram = cimModel.getDiagram(diagramUUID);
-                if (diagram) {
-                    diagramObject.setDiagram(diagram);
-                    diagram.addDiagramObject(diagramObject);
-                    integral7.placedCIMObjectsForDLProfil.set(cnUUID, diagramObject);
-                }
-                else {
-                    this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                if (nsgSa !== undefined && nsgSo !== undefined) {
+                    const leftOffset = queryResult.nslots * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                    const topOffset = queryResult.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
+                    const ssabLength = queryResult.laenge * constants_1.NsgConstants.HORIZONTAL_OFFSET;
+                    let pointTopLeft = new DiagramObjectPoint_1.DiagramObjectPoint(leftOffset, topOffset, 1);
+                    let pointBottomRight = new DiagramObjectPoint_1.DiagramObjectPoint(leftOffset + ssabLength, topOffset, 2);
+                    let saaShiftOffset = 0;
+                    for (const tempNsgSaa of nsgSa.saabNsg) {
+                        saaShiftOffset = saaShiftOffset < (tempNsgSaa.nslots + tempNsgSaa.laenge) ? (tempNsgSaa.nslots + tempNsgSaa.laenge) : saaShiftOffset;
+                    }
+                    const points = [];
+                    points.push(pointTopLeft, pointBottomRight);
+                    for (const p of points) {
+                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * nsgSa.ausrichtung);
+                        p.xPosition += nsgSo.xrel + nsgSa.xrel + (nsgSa.ausrichtung === 2 ? saaShiftOffset * constants_1.NsgConstants.HORIZONTAL_OFFSET : 0);
+                        p.yPosition += nsgSo.yrel + nsgSa.yrel + (nsgSa.ausrichtung === 3 ? saaShiftOffset * constants_1.NsgConstants.HORIZONTAL_OFFSET : 0);
+                    }
+                    integral7.integralNSGSsab.set(queryResult.idSSAB, queryResult);
+                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'SSAB Diagram');
+                    diagramObject.rotation = util_functions_1.DLUtilFunctions.getRotationBasedOnNsgSa(nsgSa.ausrichtung);
+                    utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
+                    const cnUUID = this.integralID2UUID.get(queryResult.idSSAB);
+                    const connectivityNode = cimModel.getConnectivityNode(cnUUID);
+                    diagramObject.setIdentifiedObject(connectivityNode);
+                    const diagramUUID = integral7.i7SchemaID2UUID.get(nsgSa.variantennr);
+                    const diagram = cimModel.getDiagram(diagramUUID);
+                    if (diagram) {
+                        diagramObject.setDiagram(diagram);
+                        diagram.addDiagramObject(diagramObject);
+                        integral7.placedCIMObjectsForDLProfil.set(cnUUID, diagramObject);
+                    }
+                    else {
+                        this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                    }
                 }
             }
         });
@@ -836,8 +843,9 @@ class ConverterI7 {
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, schaltfeldIDs));
-                const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, schaltfeldIDs));
+                const resultsNsgSchaltfeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_SCHALTFELD), schaltfeldIDs));
                 const filteredResultsNsgSchaltfeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgSchaltfeld, variantenNr, onlyEingeblendet);
+                let tmpcnt = 0;
                 for (const i7Data of filteredResultsNsgSchaltfeld) {
                     const nsgSaa = integral7.integralNSGSAAbschnitt.get(i7Data.nsgsaa);
                     const nsgSa = integral7.integralNSGSchaltanlage.get(nsgSaa.nsgsaid);
@@ -866,53 +874,57 @@ class ConverterI7 {
                     const xPos = schaltfeldLeftOffset + (constants_1.NsgConstants.HORIZONTAL_OFFSET / 2);
                     let lastNode = undefined;
                     for (const node of onSSabNodes) {
-                        const ssabYPos = integral7.integralNSGSsab.get(node.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET;
-                        let yStackPos = 1;
-                        let prevNode = null;
-                        let crtNode = node;
-                        while (crtNode) {
-                            if (nodePointMap.get(crtNode.id) === undefined) {
-                                let yPos = ssabYPos;
-                                if (crtNode === node) {
-                                    yPos += shiftFromBusbar ? (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET : 0;
-                                }
-                                else {
-                                    const ssabOffset = schaltfeldDeltaausrichtung === 0 ? 0 : maxSSabPos;
-                                    yPos = ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (yStackPos) + ssabOffset) * constants_1.NsgConstants.VERTICAL_OFFSET;
-                                    yStackPos += 1;
-                                }
-                                nodePointMap.set(crtNode.id, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos, schaltfeldDeltaausrichtung * 180));
-                                const aKnotenUUID = this.integralID2UUID.get(crtNode.aknoten);
-                                if (!integral7.placedCIMObjectsForDLProfil.has(aKnotenUUID) && !nodePointMap.has(crtNode.aknoten)) {
-                                    let prevNodeY = (prevNode !== null && nodePointMap.get(prevNode.id) !== undefined) ? nodePointMap.get(prevNode.id).diagramObjectPoints[0].yPosition : 0;
-                                    let yPosAKnoten;
-                                    if (prevNode === node) {
-                                        yPosAKnoten = yPos - ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET) / 2;
+                        let tmp_node = integral7.integralNSGSsab.get(node.aknoten);
+                        if (tmp_node !== undefined) {
+                            const ssabYPos = tmp_node ? tmp_node.posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET : undefined;
+                            let yStackPos = 1;
+                            let prevNode = null;
+                            let crtNode = node;
+                            while (crtNode) {
+                                if (nodePointMap.get(crtNode.id) === undefined) {
+                                    let yPos = ssabYPos;
+                                    if (crtNode === node) {
+                                        yPos += shiftFromBusbar ? (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET : 0;
                                     }
                                     else {
-                                        yPosAKnoten = (yPos - prevNodeY) / 2 + prevNodeY;
+                                        const ssabOffset = schaltfeldDeltaausrichtung === 0 ? 0 : maxSSabPos;
+                                        yPos = ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (yStackPos) + ssabOffset) * constants_1.NsgConstants.VERTICAL_OFFSET;
+                                        yStackPos += 1;
+                                    }
+                                    nodePointMap.set(crtNode.id, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos, schaltfeldDeltaausrichtung * 180));
+                                    const aKnotenUUID = this.integralID2UUID.get(crtNode.aknoten);
+                                    if (!integral7.placedCIMObjectsForDLProfil.has(aKnotenUUID) && !nodePointMap.has(crtNode.aknoten)) {
+                                        let prevNodeY = (prevNode !== null && nodePointMap.get(prevNode.id) !== undefined) ? nodePointMap.get(prevNode.id).diagramObjectPoints[0].yPosition : 0;
+                                        let yPosAKnoten;
+                                        if (prevNode === node) {
+                                            yPosAKnoten = yPos - ((schaltfeldDeltaausrichtung === 0 ? -1 : 1) * constants_1.NsgConstants.VERTICAL_OFFSET) / 2;
+                                        }
+                                        else {
+                                            yPosAKnoten = (yPos - prevNodeY) / 2 + prevNodeY;
+                                        }
                                     }
-                                    nodePointMap.set(crtNode.aknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPosAKnoten));
+                                    lastNode = crtNode;
+                                    prevNode = crtNode;
+                                    crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
                                 }
                             }
-                            lastNode = crtNode;
-                            prevNode = crtNode;
-                            crtNode = schaltfeldI7KnotenBeziehungen.find(elem => elem.aknoten === crtNode.eknoten);
                         }
                     }
-                    const lastEKnotenUUID = this.integralID2UUID.get(lastNode.eknoten);
-                    if (!integral7.placedCIMObjectsForDLProfil.has(lastEKnotenUUID) && !nodePointMap.has(lastNode.eknoten)) {
-                        const yPos = (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (i7Data.hoehe);
-                        const heightAdjustement = schaltfeldDeltaausrichtung === 0 ? (constants_1.NsgConstants.VERTICAL_OFFSET * (maxSSabPos + 1)) : 0;
-                        nodePointMap.set(lastNode.eknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos + heightAdjustement));
+                    if (lastNode !== undefined) {
+                        const lastEKnotenUUID = this.integralID2UUID.get(lastNode.eknoten);
+                        if (!integral7.placedCIMObjectsForDLProfil.has(lastEKnotenUUID) && !nodePointMap.has(lastNode.eknoten)) {
+                            const yPos = (schaltfeldDeltaausrichtung === 0 ? -1 : 1) * (i7Data.hoehe);
+                            const heightAdjustement = schaltfeldDeltaausrichtung === 0 ? (constants_1.NsgConstants.VERTICAL_OFFSET * (maxSSabPos + 1)) : 0;
+                            nodePointMap.set(lastNode.eknoten, util_functions_1.DLUtilFunctions.createDiagramObjectWithPoint(xPos, yPos + heightAdjustement));
+                        }
+                        nsgSchaltfeldObj.lastNodeID = lastNode.eknoten;
+                        nsgSchaltfeldObj.lastNodeCimUUID = lastEKnotenUUID;
                     }
-                    nsgSchaltfeldObj.lastNodeID = lastNode.eknoten;
-                    nsgSchaltfeldObj.lastNodeCimUUID = lastEKnotenUUID;
                     for (const node of onSSabNodes) {
                         let crtNode = node;
                         while (crtNode) {
                             let aKnotenPos = undefined;
-                            if (crtNode === node) {
+                            if (crtNode === node && xPos !== undefined && integral7.integralNSGSsab.get(crtNode.aknoten) !== undefined) {
                                 aKnotenPos = new DiagramObjectPoint_1.DiagramObjectPoint(xPos, integral7.integralNSGSsab.get(crtNode.aknoten).posSSAB * constants_1.NsgConstants.VERTICAL_OFFSET);
                             }
                             util_functions_1.DLUtilFunctions.exportTerminals(crtNode, nodePointMap, uuidPointsMap, cimModel, this.integralID2UUID, aKnotenPos);
@@ -947,7 +959,7 @@ class ConverterI7 {
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.querkupplungIDs));
-                const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, integral7.querkupplungIDs));
+                const resultsNsgKpFeld = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG), integral7.querkupplungIDs));
                 const filteredResultsNsgKpFeld = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgKpFeld, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgKpFeld) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_QUERKUPPLUNG);
@@ -975,7 +987,7 @@ class ConverterI7 {
     convertSchemaLaengskupplungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const ssabIDs = [...integral7.integralNSGSAAbschnitt.keys()];
-            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0 && ssabIDs.length > 0) {
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG) && integral7.laengskupplungIDs.length > 0 && [...integral7.integralNSGSAAbschnitt.keys()].length > 0) {
                 const i7relevantTables = [
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.LEISTUNGSSCHALTER],
                     integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.TRENNER_3P],
@@ -984,7 +996,7 @@ class ConverterI7 {
                 ];
                 const i7checkedTables = this.filterTablesByAvailability(i7relevantTables);
                 const i7knotenBeziehungen = yield this.mysqlController.execQuery(integral_sql_1.getI7KnotenBeziehungenQuery(i7checkedTables, integral7.laengskupplungIDs));
-                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, ssabIDs));
+                const resultsNsgLKupplung = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG), ssabIDs));
                 const filteredResultsNsgLKupplung = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(resultsNsgLKupplung, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResultsNsgLKupplung) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LAENGSKUPPLUNG);
@@ -1019,7 +1031,7 @@ class ConverterI7 {
             try {
                 const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO2W) && nsgStandortIDs.length > 0) {
-                    const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, nsgStandortIDs));
+                    const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO2W), nsgStandortIDs));
                     let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
                     for (const i7Data of filteredResults) {
                         integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_TRAFO2W);
@@ -1091,9 +1103,9 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_TRAFO3W) && nsgStandortIDs.length > 0 && standortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO3W, nsgStandortIDs));
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_TRAFO3W), nsgStandortIDs));
                 let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
-                const netzTrafoResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, standortIDs));
+                const netzTrafoResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
                 const netzTrafos = new Map(netzTrafoResults.map(obj => [obj.id, obj]));
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_TRAFO3W);
@@ -1117,57 +1129,52 @@ class ConverterI7 {
                             exchangeGroup = constants_1.NsgConstants.TRAFO3W_ExchangeMap[key];
                             break;
                         }
-                    }
-                    const rotationenGroups = constants_1.NsgConstants.TRAFO3W_RotationGroups;
-                    let rotationenGroup = undefined;
-                    for (const key of Object.keys(rotationenGroups)) {
-                        if (rotationenGroups[key].indexOf(trafo3wNsg.ausrichtung) !== -1) {
-                            rotationenGroup = constants_1.NsgConstants.TRAFO3W_RotationGroup2Positions[key];
-                            break;
+                        const rotationenGroups = constants_1.NsgConstants.TRAFO3W_RotationGroups;
+                        let rotationenGroup = undefined;
+                        for (const key of Object.keys(rotationenGroups)) {
+                            if (rotationenGroups[key].indexOf(trafo3wNsg.ausrichtung) !== -1) {
+                                rotationenGroup = constants_1.NsgConstants.TRAFO3W_RotationGroup2Positions[key];
+                                break;
+                            }
+                        }
+                        const xMirroring = trafo3wNsg.orientierung_cw === 1;
+                        const terminal1 = pteW1.terminal;
+                        const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[1]]);
+                        tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
+                        const terminal2 = pteW2.terminal;
+                        const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 3 : 2]]);
+                        tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
+                        const terminal3 = pteW3.terminal;
+                        const terminal3DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 2 : 3]]);
+                        tempPoints.push(terminal3DiagramObject.diagramObjectPoints[0]);
+                        if (terminal1 !== undefined) {
+                            uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
+                        }
+                        if (terminal2 !== undefined) {
+                            uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
+                        }
+                        if (terminal3 !== undefined) {
+                            uuidPointsMap.set(terminal3.getUUID(), terminal3DiagramObject);
+                        }
+                        util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo3wNsg.nsgsoid, uuidPointsMap);
+                        if (terminal1) {
+                            const t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getConnectivityNodeUUID());
+                            const t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
+                            if (t1CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
+                        }
+                        if (terminal2) {
+                            const t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getConnectivityNodeUUID());
+                            const t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
+                            if (t2CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
+                        }
+                        if (terminal3) {
+                            const t3CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getConnectivityNodeUUID());
+                            const t3DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getUUID());
+                            if (t3CNdiagramObject !== undefined)
+                                utils_schema_1.copyDiagramObjectPoints(t3DiagramObject, t3CNdiagramObject.diagramObjectPoints);
                         }
-                    }
-                    const xMirroring = trafo3wNsg.orientierung_cw === 1;
-                    const terminal1 = pteW1.terminal;
-                    const terminal1DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[1]]);
-                    tempPoints.push(terminal1DiagramObject.diagramObjectPoints[0]);
-                    const terminal2 = pteW2.terminal;
-                    const terminal2DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 3 : 2]]);
-                    tempPoints.push(terminal2DiagramObject.diagramObjectPoints[0]);
-                    const terminal3 = pteW3.terminal;
-                    const terminal3DiagramObject = util_functions_1.DLUtilFunctions.createDiagramObjectWithPointArrayBased(rotationenGroup[exchangeGroup[xMirroring ? 2 : 3]]);
-                    tempPoints.push(terminal3DiagramObject.diagramObjectPoints[0]);
-                    for (const p of tempPoints) {
-                        p.xPosition += trafo3wNsg.xrel;
-                        p.yPosition += trafo3wNsg.yrel;
-                    }
-                    uuidPointsMap.set(this.integralID2UUID.get(trafo3wNsg.trafo3wid), trafoDiagramObject);
-                    if (terminal1 !== undefined) {
-                        uuidPointsMap.set(terminal1.getUUID(), terminal1DiagramObject);
-                    }
-                    if (terminal2 !== undefined) {
-                        uuidPointsMap.set(terminal2.getUUID(), terminal2DiagramObject);
-                    }
-                    if (terminal3 !== undefined) {
-                        uuidPointsMap.set(terminal3.getUUID(), terminal3DiagramObject);
-                    }
-                    util_functions_1.DLUtilFunctions.shiftAddBasedOnNsgSo(cimModel, integral7, variantenNr, trafo3wNsg.nsgsoid, uuidPointsMap);
-                    if (terminal1) {
-                        const t1CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getConnectivityNodeUUID());
-                        const t1DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal1.getUUID());
-                        if (t1CNdiagramObject !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t1DiagramObject, t1CNdiagramObject.diagramObjectPoints);
-                    }
-                    if (terminal2) {
-                        const t2CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getConnectivityNodeUUID());
-                        const t2DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal2.getUUID());
-                        if (t2CNdiagramObject !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t2DiagramObject, t2CNdiagramObject.diagramObjectPoints);
-                    }
-                    if (terminal3) {
-                        const t3CNdiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getConnectivityNodeUUID());
-                        const t3DiagramObject = integral7.placedCIMObjectsForDLProfil.get(terminal3.getUUID());
-                        if (t3CNdiagramObject !== undefined)
-                            utils_schema_1.copyDiagramObjectPoints(t3DiagramObject, t3CNdiagramObject.diagramObjectPoints);
                     }
                 }
             }
@@ -1177,16 +1184,16 @@ class ConverterI7 {
         });
     }
     convertSchemaLeitungen(cimModel, integral7, variantenNr, onlyEingeblendet = true) {
-        var _a, _b;
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const leitungIDs = [...integral7.integralLeitungen.keys(), ...integral7.integralHgueLeitungen.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNG) && this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT)
                 && leitungIDs.length > 0) {
-                const leitungResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNG, leitungIDs));
+                const leitungResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNG), leitungIDs));
                 let filteredLeitungResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungResults, variantenNr, onlyEingeblendet);
                 const nsgLeitungIDs = filteredLeitungResults.map(elem => elem.id);
                 if (nsgLeitungIDs.length > 0) {
-                    const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, nsgLeitungIDs));
+                    const leitungspktResults = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_LEITUNGSPUNKT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_LEITUNGSPUNKT), nsgLeitungIDs));
                     let filteredLeitungspktResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(leitungspktResults, variantenNr, onlyEingeblendet);
                     for (const i7Data of filteredLeitungResults) {
                         integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_LEITUNG);
@@ -1243,29 +1250,41 @@ class ConverterI7 {
                         }
                         if (tempAnfDiagramObject === undefined || tempEndDiagramObject === undefined)
                             continue;
-                        tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition));
+                        tempDiagramObjectPoints.push({
+                            xPosition: tempAnfDiagramObject.diagramObjectPoints[0].xPosition,
+                            yPosition: tempAnfDiagramObject.diagramObjectPoints[0].yPosition
+                        });
                         const relevantLeitungspkts = filteredLeitungspktResults.filter(elem => elem.nsgleitung === i7Data.id).sort((a, b) => a.pos - b.pos);
                         for (let a = 0; a < relevantLeitungspkts.length; a++) {
                             const nsgLeitungspkt = relevantLeitungspkts[a];
                             if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 1) {
-                                const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempAnfDiagramObject.diagramObjectPoints[0].xPosition, tempAnfDiagramObject.diagramObjectPoints[0].yPosition);
+                                const tempDiagramObjectPoint = {
+                                    xPosition: tempAnfDiagramObject.diagramObjectPoints[0].xPosition,
+                                    yPosition: tempAnfDiagramObject.diagramObjectPoints[0].yPosition
+                                };
                                 const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(anfSchemaType, integral7, i7Data.anschlussanf, nsgLeitungspkt);
                                 tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
                                 tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
                                 tempDiagramObjectPoints.push(tempDiagramObjectPoint);
                             }
                             else if (nsgLeitungspkt.userelpos === 1 && nsgLeitungspkt.reltoanf === 0) {
-                                const tempDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition);
+                                const tempDiagramObjectPoint = {
+                                    xPosition: tempEndDiagramObject.diagramObjectPoints[0].xPosition,
+                                    yPosition: tempEndDiagramObject.diagramObjectPoints[0].yPosition
+                                };
                                 const tempOffsetArray = util_functions_1.DLUtilFunctions.getXYOffsetFromRelCM(endSchemaType, integral7, i7Data.anschlussend, nsgLeitungspkt);
                                 tempDiagramObjectPoint.xPosition += tempOffsetArray[0];
                                 tempDiagramObjectPoint.yPosition += tempOffsetArray[1];
                                 tempDiagramObjectPoints.push(tempDiagramObjectPoint);
                             }
                             else {
-                                tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(nsgLeitungspkt.xrel, nsgLeitungspkt.yrel));
+                                tempDiagramObjectPoints.push({ xPosition: nsgLeitungspkt.xrel, yPosition: nsgLeitungspkt.yrel });
                             }
                         }
-                        tempDiagramObjectPoints.push(new DiagramObjectPoint_1.DiagramObjectPoint(tempEndDiagramObject.diagramObjectPoints[0].xPosition, tempEndDiagramObject.diagramObjectPoints[0].yPosition));
+                        tempDiagramObjectPoints.push({
+                            xPosition: tempEndDiagramObject.diagramObjectPoints[0].xPosition,
+                            yPosition: tempEndDiagramObject.diagramObjectPoints[0].yPosition
+                        });
                         const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
                         const diagram = cimModel.getDiagram(diagramUUID);
                         if (isACLine) {
@@ -1273,16 +1292,19 @@ class ConverterI7 {
                             const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
                             const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
                             let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
+                            let tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                             if (cableAvailable && overheadAvailable) {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
                             }
                             else if (cableAvailable) {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
+                                tableName = integral_sql_1.Integral7TableNames.KABEL;
                             }
                             else if (overheadAvailable) {
                                 type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
+                                tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                             }
-                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, [netzLeitung.id]));
+                            const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, this.getAvailableColumnNames(tableName), [netzLeitung.id]));
                             leitungStromkreisabschnitt.sort((a, b) => a.pos - b.pos);
                             const acSegmentPercentages = [];
                             let completeLength = 0;
@@ -1294,74 +1316,11 @@ class ConverterI7 {
                                 crtLength += leitungStromkreisabschnitt[a].laenge;
                                 acSegmentPercentages.push(crtLength / completeLength);
                             }
-                            let completePixelLength = 0;
-                            for (let a = 1; a < tempDiagramObjectPoints.length; ++a) {
-                                const tempX = tempDiagramObjectPoints[a].xPosition - tempDiagramObjectPoints[a - 1].xPosition;
-                                const tempY = tempDiagramObjectPoints[a].yPosition - tempDiagramObjectPoints[a - 1].yPosition;
-                                completePixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
-                            }
-                            let lastB = 0;
-                            let b = 1;
-                            let crtPixelLength = 0;
-                            for (let eqIdx = 0; eqIdx < acSegmentPercentages.length; ++eqIdx) {
-                                let crtPixelPercentageSize = 0;
-                                let lastPixelPercentageSize;
-                                const epsilon = 0.00001;
-                                do {
-                                    const tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
-                                    const tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
-                                    crtPixelLength += Math.sqrt((tempX * tempX) + (tempY * tempY));
-                                    lastPixelPercentageSize = crtPixelPercentageSize;
-                                    crtPixelPercentageSize = (crtPixelLength / completePixelLength);
-                                    b++;
-                                } while (crtPixelPercentageSize < acSegmentPercentages[eqIdx] + epsilon && b < tempDiagramObjectPoints.length);
-                                if ((crtPixelLength / completePixelLength) <= acSegmentPercentages[eqIdx] + epsilon) {
-                                    const conductorCimObj = netzLeitungCimObj.equipments[eqIdx];
-                                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObject');
-                                    diagramObject.setIdentifiedObject(conductorCimObj);
-                                    diagramObject.setDiagram(diagram);
-                                    diagram.addDiagramObject(diagramObject);
-                                    let i = 1;
-                                    for (let idx = lastB; idx < b; ++idx) {
-                                        const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
-                                        diagramObjectPoint.mrid = utils_1.generateUUID();
-                                        diagramObjectPoint.diagramObject = diagramObject;
-                                        diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                                        ++i;
-                                    }
-                                }
-                                else if ((crtPixelLength / completePixelLength) > acSegmentPercentages[eqIdx]) {
-                                    let decreased = false;
-                                    if (b === tempDiagramObjectPoints.length) {
-                                        b--;
-                                        decreased = true;
-                                    }
-                                    let tempX = tempDiagramObjectPoints[b].xPosition - tempDiagramObjectPoints[b - 1].xPosition;
-                                    let tempY = tempDiagramObjectPoints[b].yPosition - tempDiagramObjectPoints[b - 1].yPosition;
-                                    const percentageOfSegment = crtPixelPercentageSize - lastPixelPercentageSize;
-                                    const tempRestX = tempX * (1 - percentageOfSegment);
-                                    const tempRestY = tempY * (1 - percentageOfSegment);
-                                    tempX = tempX * percentageOfSegment;
-                                    tempY = tempY * percentageOfSegment;
-                                    const newDiagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[b - 1].xPosition + tempX, tempDiagramObjectPoints[b - 1].yPosition + tempY);
-                                    tempDiagramObjectPoints.splice(b, 0, newDiagramObjectPoint);
-                                    const conductorCimObj = netzLeitungCimObj.equipments[eqIdx];
-                                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.generateUUID(), 'DiagramObj ' + ((_a = conductorCimObj.shortName) !== null && _a !== void 0 ? _a : ''));
-                                    diagramObject.setDiagram(diagram);
-                                    diagramObject.setIdentifiedObject(conductorCimObj);
-                                    diagram.addDiagramObject(diagramObject);
-                                    let i = 1;
-                                    if (decreased)
-                                        b++;
-                                    for (let idx = lastB; idx < b; ++idx) {
-                                        const diagramObjectPoint = new DiagramObjectPoint_1.DiagramObjectPoint(tempDiagramObjectPoints[idx].xPosition, tempDiagramObjectPoints[idx].yPosition, i);
-                                        diagramObjectPoint.mrid = utils_1.generateUUID();
-                                        diagramObjectPoint.diagramObject = diagramObject;
-                                        diagramObject.addDiagramObjectPoint(diagramObjectPoint);
-                                        ++i;
-                                    }
-                                }
-                                lastB = b - 1;
+                            const eqUUIDs = netzLeitungCimObj.equipments.map(value => value.getUUID());
+                            const resultingDiagramObjects = util_functions_1.DLUtilFunctions.convertACLineSegment(completeLength, acSegmentPercentages, eqUUIDs, tempDiagramObjectPoints);
+                            for (const diagramObject of resultingDiagramObjects) {
+                                diagramObject.setDiagram(diagram);
+                                diagram.addDiagramObject(diagramObject);
                             }
                         }
                         else {
@@ -1371,7 +1330,7 @@ class ConverterI7 {
                             diagram.addDiagramObject(diagramObject);
                             diagramObject.setIdentifiedObjectUUID(this.integralID2UUID.get(netzLeitung.id));
                             if (netzLeitungCimObj !== undefined) {
-                                diagramObject.name = 'DiagramObj ' + ((_b = netzLeitungCimObj.shortName) !== null && _b !== void 0 ? _b : '');
+                                diagramObject.name = 'DiagramObj ' + ((_a = netzLeitungCimObj.shortName) !== null && _a !== void 0 ? _a : '');
                             }
                             else {
                                 diagramObject.name = 'DiagramObj HGUE-Leitung';
@@ -1395,7 +1354,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const whereIDs = [...integral7.i7SchemaID2Type.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG) && whereIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERZWEIG, whereIDs));
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_QUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_QUERZWEIG), whereIDs));
                 let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     integral7.i7SchemaID2Type.set(i7Data.id, integral_sql_1.Integral7TableNames.NSG_QUERZWEIG);
@@ -1422,7 +1381,7 @@ class ConverterI7 {
                         nsgQuerzweigWidth = constants_1.NsgConstants.QUERZWEIG_OBJ_WIDTH;
                         nsgQuerzweigHeight = constants_1.NsgConstants.QUERZWEIG_OBJ_HEIGHT;
                     }
-                    if (referenceType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD) {
+                    if (referenceType === integral_sql_1.Integral7TableNames.NSG_SCHALTFELD && integral7.integralNSGSchaltfeld.get(i7Data.bezugsobjekt) !== undefined) {
                         const nsgSchaltfeld = integral7.integralNSGSchaltfeld.get(i7Data.bezugsobjekt);
                         refCNNodeUUID = nsgSchaltfeld.lastNodeCimUUID;
                         const lastDiagramObjectPointInsideBay = integral7.placedCIMObjectsForDLProfil.get(nsgSchaltfeld.lastNodeCimUUID).diagramObjectPoints[0];
@@ -1471,7 +1430,7 @@ class ConverterI7 {
                             }
                         }
                     }
-                    else if (referenceType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO) {
+                    else if (referenceType === integral_sql_1.Integral7TableNames.NSG_KNOTEN_SO && integral7.i7ID2UUID.get(i7Data.bezugsobjekt) !== undefined) {
                         const nsgKnotenSoUUID = integral7.i7ID2UUID.get(i7Data.bezugsobjekt);
                         refCNNodeUUID = nsgKnotenSoUUID;
                         const lastDiagramObjectPointInsideBay = integral7.placedCIMObjectsForDLProfil.get(nsgKnotenSoUUID).diagramObjectPoints[0];
@@ -1490,7 +1449,7 @@ class ConverterI7 {
                     const querzweigObjectUUID = this.integralID2UUID.get(i7Data.querzweig);
                     const cimObject2LinkWith = cimModel.getObject(querzweigObjectUUID);
                     uuidPointsMap.set(querzweigObjectUUID, tempDiagramObject);
-                    if (cimObject2LinkWith !== undefined) {
+                    if (cimObject2LinkWith !== undefined && cimModel.getConnectivityNode(refCNNodeUUID) !== undefined) {
                         let ceTerminals = new Set([...cimObject2LinkWith.terminals.values()].map(t => t.getUUID()));
                         cimObject2LinkWith.terminalsUUIDs.forEach(tUUID => ceTerminals.add(tUUID));
                         let cnTerminals = new Set([...cimModel.getConnectivityNode(refCNNodeUUID).terminals.values()].map(t => t.getUUID()));
@@ -1528,7 +1487,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE) && nsgStandortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_SCHIENE, nsgStandortIDs));
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_SCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STP_SCHIENE), nsgStandortIDs));
                 let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
                 for (const i7Data of filteredResults) {
                     const nsgSo = integral7.integralNSGStandorte.get(i7Data.nsgso);
@@ -1570,7 +1529,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nsgStandortIDs = [...integral7.integralNSGStandorte.keys()];
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.NSG_STP_KNOTEN) && nsgStandortIDs.length > 0) {
-                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_KNOTEN, nsgStandortIDs));
+                const results = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.NSG_STP_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.NSG_STP_KNOTEN), nsgStandortIDs));
                 let filteredResults = util_functions_1.DLUtilFunctions.filterByVariantenNrOnlyEingeblendet(results, variantenNr, onlyEingeblendet);
                 if (filteredResults.length <= 0)
                     return;
@@ -1605,30 +1564,32 @@ class ConverterI7 {
                     let centerPoint = new DiagramObjectPoint_1.DiagramObjectPoint(0, 0, 1);
                     const shiftOffset = constants_1.NsgConstants.STP_KNOTEN_WIDTH;
                     const trafoIDType = trafoIDTypeMap.get(i7Data.knoten);
-                    const nsgTrafo = integral7.integralNSGTrafos.get(trafoIDType.trafoID);
-                    const nsgStandort = integral7.integralNSGStandorte.get(nsgTrafo.nsgsoid);
-                    const points = [];
-                    points.push(centerPoint);
-                    for (const p of points) {
-                        util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * i7Data.ausrichtung);
-                        p.xPosition += i7Data.xrel + nsgTrafo.xrel + nsgStandort.xrel + (i7Data.ausrichtung === 2 ? shiftOffset : 0);
-                        p.yPosition += i7Data.yrel + nsgTrafo.yrel + nsgStandort.yrel + (i7Data.ausrichtung === 3 ? shiftOffset : 0);
-                    }
-                    integral7.integralNSGStpKnoten.set(i7Data.id, i7Data);
-                    const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'Stp-SSAB');
-                    diagramObject.rotation = (360 - 90 * i7Data.ausrichtung) % 360;
-                    utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
-                    const uuid = this.integralID2UUID.get(i7Data.knoten);
-                    diagramObject.setIdentifiedObjectUUID(uuid);
-                    const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
-                    const diagram = cimModel.getDiagram(diagramUUID);
-                    if (diagram) {
-                        diagramObject.setDiagram(diagram);
-                        diagram.addDiagramObject(diagramObject);
-                        integral7.placedCIMObjectsForDLProfil.set(uuid, diagramObject);
-                    }
-                    else {
-                        this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                    if (trafoIDType !== undefined) {
+                        const nsgTrafo = integral7.integralNSGTrafos.get(trafoIDType.trafoID);
+                        const nsgStandort = integral7.integralNSGStandorte.get(nsgTrafo.nsgsoid);
+                        const points = [];
+                        points.push(centerPoint);
+                        for (const p of points) {
+                            util_functions_1.DLUtilFunctions.rotateDiagramObjectPoint(p, -90 * i7Data.ausrichtung);
+                            p.xPosition += i7Data.xrel + nsgTrafo.xrel + nsgStandort.xrel + (i7Data.ausrichtung === 2 ? shiftOffset : 0);
+                            p.yPosition += i7Data.yrel + nsgTrafo.yrel + nsgStandort.yrel + (i7Data.ausrichtung === 3 ? shiftOffset : 0);
+                        }
+                        integral7.integralNSGStpKnoten.set(i7Data.id, i7Data);
+                        const diagramObject = new DiagramObject_1.DiagramObject(utils_1.getUUID(''), 'Stp-SSAB');
+                        diagramObject.rotation = (360 - 90 * i7Data.ausrichtung) % 360;
+                        utils_schema_1.copyDiagramObjectPoints(diagramObject, points);
+                        const uuid = this.integralID2UUID.get(i7Data.knoten);
+                        diagramObject.setIdentifiedObjectUUID(uuid);
+                        const diagramUUID = integral7.i7SchemaID2UUID.get(i7Data.variantennr);
+                        const diagram = cimModel.getDiagram(diagramUUID);
+                        if (diagram) {
+                            diagramObject.setDiagram(diagram);
+                            diagram.addDiagramObject(diagramObject);
+                            integral7.placedCIMObjectsForDLProfil.set(uuid, diagramObject);
+                        }
+                        else {
+                            this.logger.debug(`SSAB/DiagramObject ${diagramObject.mrid} hat kein Diagram-Objekt.`);
+                        }
                     }
                 }
             }
@@ -1640,7 +1601,7 @@ class ConverterI7 {
     convertStandorte(cimModel, integral7, whereID, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STANDORT)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STANDORT, whereID));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STANDORT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STANDORT), whereID));
                 for (const i7Data of result) {
                     const i7name = util_create_1.createNotation([utils_2.getName(i7Data), '_', utils_2.ueberpruefeZeichenkette(i7Data.ukz)], 32);
                     const substation = new AMPRIONSubstation_1.AMPRIONSubstation(utils_1.getUUID(i7Data.guid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
@@ -1678,7 +1639,7 @@ class ConverterI7 {
     convertSchaltanlagen(cimModel, integral7, standortIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGE, standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGE), standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const object = cimModel.getObject(this.integralID2UUID.get(i7Data.standort));
@@ -1715,7 +1676,7 @@ class ConverterI7 {
     convertSchaltanlagenAbschnitte(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTANLAGENABSCHNITT, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTANLAGENABSCHNITT), schaltanlagenIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     if (!voltageLevel) {
@@ -1739,7 +1700,7 @@ class ConverterI7 {
     convertSchaltfelder(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHALTFELD)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTFELD, schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHALTFELD, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHALTFELD), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
                     if (!voltageLevel) {
@@ -1774,7 +1735,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_SO)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const vl = new VoltageLevel_1.VoltageLevel(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
@@ -1820,18 +1781,32 @@ class ConverterI7 {
             }
         });
     }
+    convertKnotenHgue(frame, integral7, standortIDs, defaultValuesConfig) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const cimModel = frame.cimModel;
+            if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KNOTEN)) {
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KNOTEN), standortIDs));
+                for (const i7Data of result) {
+                    const cimrdfid = utils_1.getUUID(i7Data.guid);
+                    const dcNode = new DCNode_1.DCNode(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_DC_Node'], 32, true), i7Data.kurzname);
+                    cimModel.addDCNode(dcNode);
+                    this.addIdMapping(i7Data.id, dcNode.mrid, integral_sql_1.Integral7TableNames.HGUE_KNOTEN);
+                }
+            }
+            else {
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KNOTEN_SO} ist nicht vorhanden.`);
+            }
+        });
+    }
     convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const i7Schaltanlagenabschnitt = integral7.integralSchaltanlagenAbschnitte.get(i7Data.saabschnitt);
                     const busbarSection = new BusbarSection_1.BusbarSection(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Schaltanlagenabschnitt), '_BBS']), i7Schaltanlagenabschnitt.kurzname);
                     busbarSection.ipMax = i7Data.limit_ip;
                     busbarSection.aggregate = false;
-                    if (utils_1.getUUID(i7Data.guid) === '24206c79-3ac8-4436-aa02-3f60a9e85975') {
-                        let stop = true;
-                    }
                     const rdfid = utils_1.getUUID(i7Data.guid);
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
@@ -1895,7 +1870,7 @@ class ConverterI7 {
     convertKnotenKf(cimModel, querkupplungIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_KF)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_KF, querkupplungIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_KF, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_KF), querkupplungIDs));
                 for (const i7Data of result) {
                     const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'knotenkf');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.kpfeld));
@@ -1918,7 +1893,7 @@ class ConverterI7 {
     convertKnotenLk(cimModel, laengskupplungIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_LK)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_LK, laengskupplungIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_LK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_LK), laengskupplungIDs));
                 for (const i7Data of result) {
                     const connectivityNode = new ConnectivityNode_1.ConnectivityNode(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_CN']), 'KnotenLk');
                     const bay = cimModel.getBay(this.integralID2UUID.get(i7Data.lkupplung));
@@ -1941,7 +1916,7 @@ class ConverterI7 {
     convertSchlaufen(cimModel, integral7, knotenSoIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SCHLAUFE)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, knotenSoIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SCHLAUFE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SCHLAUFE), knotenSoIDs));
                 for (const i7Data of result) {
                     const terminal = new Terminal_1.Terminal(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_Schlaufe_T']), i7Data.kurzname, i7Data.kommentar);
                     terminal.connected = utils_2.convertToBooleanI7(i7Data.schaltzustand);
@@ -1969,7 +1944,7 @@ class ConverterI7 {
     convertBelastungen(cimModel, knotenSfIDs, defaultValuesConfig, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BELASTUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
                 for (const i7Data of result) {
                     const load = targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_CL'])) : new EnergyConsumer_1.EnergyConsumer(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_EC']));
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
@@ -1981,8 +1956,8 @@ class ConverterI7 {
                     const powerData = utils_2.getActiveReactivePower(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
-                    load.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] : undefined;
-                    load.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] : undefined;
+                    load.p_mf = powerData[2] ? powerData[2] : undefined;
+                    load.q_mf = powerData[3] ? powerData[3] : undefined;
                     if (targetClass === cim_class_names_1.CIM_CLASS_NAMES.ConformLoad) {
                         const conformLoadGroup = cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, cim_class_names_1.CIM_CLASS_NAMES.ConformLoadGroup);
                         load.loadGroup = conformLoadGroup;
@@ -1999,7 +1974,7 @@ class ConverterI7 {
     convertEinspeisungen(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.EINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.EINSPEISUNG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertEinspeisungen2EquivalentInjection(cimModel, result);
@@ -2022,7 +1997,7 @@ class ConverterI7 {
     convertErsatzQuerZweige(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZQUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
@@ -2045,7 +2020,7 @@ class ConverterI7 {
     convertGeneratoren(cimModel, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.GENERATOR), knotenSfIDs));
                 for (const i7Data of result) {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
                     const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
@@ -2139,8 +2114,8 @@ class ConverterI7 {
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
                     synchronousMachine.setActivePower(p * -1);
                     synchronousMachine.setReactivePower(q * -1);
-                    synchronousMachine.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
-                    synchronousMachine.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] * -1 : undefined;
+                    synchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    synchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     const sr = utils_2.isNumericI7(i7Data.sr) ? utils_2.convertToNumberI7(i7Data.sr) : genType === null || genType === void 0 ? void 0 : genType.sr;
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
@@ -2308,8 +2283,8 @@ class ConverterI7 {
                     const q = powerData[1];
                     asynchronousMachine.setActivePower(p * -1);
                     asynchronousMachine.setReactivePower(q * -1);
-                    asynchronousMachine.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
-                    asynchronousMachine.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] * -1 : undefined;
+                    asynchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    asynchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     asynchronousMachine.controlEnabled = false;
                     const inBetrieb = utils_2.isBooleanI7(i7Data.betrieb) ? utils_2.convertToBooleanI7(i7Data.betrieb) : true;
                     asynchronousMachine.normallyInService = inBetrieb;
@@ -2340,7 +2315,7 @@ class ConverterI7 {
     convertKraftwerksbloecke(cimModel, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KWBLOCK, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KWBLOCK), knotenSfIDs));
                 for (const i7Data of result) {
                     const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SM']), i7Data.kurzname);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
@@ -2486,7 +2461,7 @@ class ConverterI7 {
     convertBoundaryInjections(cimModel, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BOUNDARYINJECTION, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.CIM_CLASS_NAMES.EquivalentInjection: {
                         yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
@@ -2546,7 +2521,7 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const cimModel = frame.cimModel;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG) && integral7.ersatzZweigAnschlussKnotenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, integral7.ersatzZweigAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.ERSATZLAENGSZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG), integral7.ersatzZweigAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
                         utils_2.ueberpruefeZeichenkette(i7Data.ukz) +
@@ -2583,7 +2558,7 @@ class ConverterI7 {
     convertKompensationsdrossel(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL), knotenSfIDs));
                 for (const i7Data of result) {
                     const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_LSC']), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
@@ -2617,7 +2592,7 @@ class ConverterI7 {
     convertKompensationskondensatoren(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR), knotenSfIDs));
                 for (const i7Data of result) {
                     const shunt = new LinearShuntCompensator_1.LinearShuntCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_LSC']), i7Data.kurzname);
                     shunt.normalSections = i7Data.aktstufe;
@@ -2651,7 +2626,7 @@ class ConverterI7 {
     convertStatcom(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STATCOM, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STATCOM), knotenSfIDs));
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SVC']), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
@@ -2691,7 +2666,7 @@ class ConverterI7 {
     convertSVC(cimModel, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SVC), knotenSfIDs));
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SVC']), i7Data.kurzname);
                     const inBetrieb = utils_2.convertToBooleanI7(i7Data.betrieb);
@@ -2731,7 +2706,7 @@ class ConverterI7 {
     convertCsConverterDC(cimModel, integral7, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
                 for (const i7Data of result) {
                     const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -2798,7 +2773,7 @@ class ConverterI7 {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, knotenSfIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
                 for (const i7Data of result) {
                     const dcConverterUnit = new DCConverterUnit_1.DCConverterUnit(utils_1.generateUUID(), util_create_1.createNotation([utils_2.getName(i7Data), '_DCCU']));
                     const acConnectivityNode = cimModel.connectivityNodes.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -2921,7 +2896,7 @@ class ConverterI7 {
                 try {
                     const cn = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     const cimrdfid = utils_1.getUUID(i7Data.guid);
-                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_' + cimrdfid, '_ENI'], 32, true), i7Data.kurzname);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
                     const un = cn.getVoltageLevel().getBaseVoltageAsNumber();
                     externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp;
                     let mf = undefined;
@@ -2932,7 +2907,7 @@ class ConverterI7 {
                     }
                     const maxP = utils_2.isNumericI7(i7Data.p_max) ? utils_2.convertToNumberI7(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
-                    const governorscd = utils_2.isNumericI7(i7Data.kr) && maxP ? utils_2.calculateSigma(50, externalNetworkInjection.maxP, utils_2.convertToNumberI7(i7Data.kr)) : undefined;
+                    const governorscd = utils_2.isNumericI7(i7Data.kr) ? utils_2.convertToNumberI7(i7Data.kr) : undefined;
                     externalNetworkInjection.governorSCD = governorscd;
                     const maxQ = utils_2.isNumericI7(i7Data.q_max) ? utils_2.convertToNumberI7(i7Data.q_max) : undefined;
                     externalNetworkInjection.maxQ = maxQ;
@@ -2967,7 +2942,8 @@ class ConverterI7 {
                     let regulatingControl = undefined;
                     switch (i7Data.spannungsgeregelt) {
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), `RC_ENI_${externalNetworkInjection.getUUID().substring(0, 8)}`);
+                            const cimrdfid = utils_1.getUUID(externalNetworkInjection.getUUID());
+                            regulatingControl = new RegulatingControl_1.RegulatingControl(utils_1.generateUUID(), util_create_1.createNotation([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
@@ -2998,8 +2974,8 @@ class ConverterI7 {
                     const q = powerData[1];
                     externalNetworkInjection.setActivePower(p * -1);
                     externalNetworkInjection.setReactivePower(q * -1);
-                    externalNetworkInjection.p_mf = utils_2.isNumericI7(powerData[2]) ? powerData[2] * -1 : undefined;
-                    externalNetworkInjection.q_mf = utils_2.isNumericI7(powerData[3]) ? powerData[3] * -1 : undefined;
+                    externalNetworkInjection.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
+                    externalNetworkInjection.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
@@ -3058,7 +3034,7 @@ class ConverterI7 {
     convertQuerkupplungen(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, schaltanlagenAbschnittIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.QUERKUPPLUNG), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
                     const cimrdfid = utils_1.getUUID(i7Data.guid);
                     const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
@@ -3089,7 +3065,7 @@ class ConverterI7 {
     convertLaegskupplungen(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
                     const cimrdfid = utils_1.getUUID(i7Data.guid);
                     const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
@@ -3122,7 +3098,7 @@ class ConverterI7 {
     convertStarreVerbindungen(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KNOTEN_STARR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_STARR, containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.KNOTEN_STARR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_STARR), containerIDs));
                 for (const i7Data of result) {
                     const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']), 'Breaker', 'starre Verbindung');
                     yield this.convertSwitch(breaker, cimModel, i7Data);
@@ -3138,7 +3114,7 @@ class ConverterI7 {
     convertTrennerFi3f(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNERFI_3P)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNERFI_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNERFI_3P), containerIDs));
                 for (const i7Data of result) {
                     const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
@@ -3154,7 +3130,7 @@ class ConverterI7 {
     convertTrenner3f(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRENNER_3P)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRENNER_3P, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRENNER_3P), containerIDs));
                 for (const i7Data of result) {
                     const disconnector = new Disconnector_1.Disconnector(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_D']));
                     yield this.convertSwitch(disconnector, cimModel, i7Data);
@@ -3170,7 +3146,7 @@ class ConverterI7 {
     convertLeistungsschalter(cimModel, containerIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, containerIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEISTUNGSSCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEISTUNGSSCHALTER), containerIDs));
                 for (const i7Data of result) {
                     const breaker = new Breaker_1.Breaker(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_BR']));
                     yield this.convertSwitch(breaker, cimModel, i7Data);
@@ -3224,7 +3200,7 @@ class ConverterI7 {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSDROSSEL) && integral7.lDrosselAnschlussKnotenIDs.length) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSDROSSEL, integral7.lDrosselAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSDROSSEL), integral7.lDrosselAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname, i7Data.kommentar + '; LD-' + i7Data.bezeichner);
                     const start = cimModel.objects.get(this.integralID2UUID.get(i7Data.aknoten));
@@ -3286,7 +3262,7 @@ class ConverterI7 {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR) && integral7.lKondensatorAnschlussKnotenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, integral7.lKondensatorAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKONDENSATOR), integral7.lKondensatorAnschlussKnotenIDs));
                 for (const i7Data of result) {
                     const seriesCompensator = new AMPRIONSeriesCompensator_1.AMPRIONSeriesCompensator(utils_1.getUUID(i7Data.guid), util_create_1.createNotation([utils_2.getName(i7Data), '_SC']), i7Data.kurzname);
                     const start = cimModel.getObject(this.integralID2UUID.get(i7Data.aknoten));
@@ -3348,7 +3324,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenKdrossel() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KDROSSEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KDROSSEL, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KDROSSEL), []));
                 for (const i7Data of result) {
                     this.kdrosseltypen.set(i7Data.name, i7Data);
                 }
@@ -3363,7 +3339,7 @@ class ConverterI7 {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 const stpSchieneIDs = [];
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE)) {
-                    const stpSchiene = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, standortIDs));
+                    const stpSchiene = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHIENE), standortIDs));
                     for (const i7DataSchiene of stpSchiene) {
                         try {
                             stpSchieneIDs.push(i7DataSchiene.id);
@@ -3403,7 +3379,7 @@ class ConverterI7 {
                 try {
                     if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ)) {
                         if (stpScheinenID.length) {
-                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, stpScheinenID));
+                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_IMPEDANZ, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_IMPEDANZ), stpScheinenID));
                             for (const i7Data of result) {
                                 const kdType = this.kdrosseltypen.get(i7Data.nametyp);
                                 const imax = utils_2.isNumericI7(i7Data.imax) ? i7Data.imax : (utils_2.isNumericI7(kdType === null || kdType === void 0 ? void 0 : kdType.imax) ? kdType === null || kdType === void 0 ? void 0 : kdType.imax : undefined);
@@ -3455,7 +3431,7 @@ class ConverterI7 {
                 try {
                     if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER)) {
                         if (stpSchienenID.length) {
-                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, stpSchienenID));
+                            const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_SCHALTER, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_SCHALTER), stpSchienenID));
                             for (const i7Data of result) {
                                 const terminal = integral7.sternPunktImpModel.stpSchieneTerminal.get(i7Data.eknoten);
                                 if (terminal) {
@@ -3485,7 +3461,7 @@ class ConverterI7 {
     convertLaengskupplungen(cimModel, integral7, schaltanlagenIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, schaltanlagenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
                     const cimrdfid = utils_1.getUUID(i7Data.guid);
                     const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, util_create_1.createNotation([utils_2.getName(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
@@ -3518,7 +3494,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenLeitung() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_FREILEITUNG, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG), []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(utils_1.generateUUID(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Freileitung');
@@ -3529,7 +3505,7 @@ class ConverterI7 {
                 this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_FREILEITUNG} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_KABEL)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KABEL, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KABEL), []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(utils_1.generateUUID(), i7Data.name);
                     this.setWireInfoProperties(typ, i7Data, 'Kabel');
@@ -3558,25 +3534,25 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LEITUNG) && integral7.leitungsAnschlussIDs.length) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEITUNG, integral7.leitungsAnschlussIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEITUNG), integral7.leitungsAnschlussIDs));
                 const leitungIDs = result.map(elem => elem.id);
                 const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
                 const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
                 let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
+                let tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 if (cableAvailable && overheadAvailable) {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG;
                 }
                 else if (cableAvailable) {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL;
+                    tableName = integral_sql_1.Integral7TableNames.KABEL;
                 }
                 else if (overheadAvailable) {
                     type = integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG;
+                    tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 }
-                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, leitungIDs));
+                const leitungStromkreisabschnitt = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(type, this.getAvailableColumnNames(tableName), leitungIDs));
                 for (const i7Data of result) {
-                    if (i7Data.id === 943) {
-                        let stop = true;
-                    }
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
                     if (!((stromkreisabschnitte === null || stromkreisabschnitte === void 0 ? void 0 : stromkreisabschnitte.length) > 0))
                         continue;
@@ -3609,11 +3585,8 @@ class ConverterI7 {
                             utils_2.ueberpruefeZeichenkette(i7Data.bezeichner) +
                             '-' +
                             utils_2.ueberpruefeZeichenkette(stk.bezeichner);
-                        if (utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137).toLowerCase() === '8387376e-86bf-4da0-91f2-b19a3d490715') {
-                            let stop = true;
-                        }
-                        const uuidACLineString = utils_1.getUUID(i7Data.guid);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuidACLineString, util_create_1.createNotation([name, '_' + stk.pos.toString(), uuidACLineString, '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
+                        const cimrdfid = utils_1.getUUID(stk.custom_guid_0120 + stk.custom_guid_2137);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(cimrdfid, util_create_1.createNotation([name, '_' + stk.pos.toString(), '_' + cimrdfid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
                         let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(stk.multfaktor));
                         if (mf) {
                             cimModel.addMultiplierFactor(mf);
@@ -3643,12 +3616,6 @@ class ConverterI7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
-                    if (acLineSegments[0].getUUID() === 'c6b755ed-b4fa-4649-8aa5-62ebcbd3b559') {
-                        let stop = true;
-                    }
-                    else if (acLineSegments[0].getUUID() === 'e1a65e81-1cec-4f1a-ab87-9c7b667ad64f') {
-                        let stop = true;
-                    }
                     this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentStart, stromkreisabschnitte[0], defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentStart);
                     const anzahl = acLineSegments.length;
@@ -3662,9 +3629,6 @@ class ConverterI7 {
                         if (tmp_terminal) {
                             tmp_terminal = undefined;
                         }
-                        if (acLineSegments[i].getUUID() === 'c6b755ed-b4fa-4649-8aa5-62ebcbd3b559') {
-                            let stop = true;
-                        }
                         this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
                         const acLineSegment2 = acLineSegments[i + 1];
                         tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
@@ -3742,12 +3706,8 @@ class ConverterI7 {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, integral7.hgueAnschlussKnotenIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.HGUE_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_LEITUNG), integral7.hgueAnschlussKnotenIDs));
                 for (const i7Data of result) {
-                    console.log(utils_1.getUUID(i7Data.guid_dcline));
-                    if (utils_1.getUUID(i7Data.guid_dcline) === '6a5b7e1e-f8be-4165-9752-2e2359d9b4f8') {
-                        let stop = true;
-                    }
                     integral7.integralHgueLeitungen.set(i7Data.id, i7Data);
                     const dcLine = new DCLine_1.DCLine(utils_1.getUUID(i7Data.guid_dcline), util_create_1.createNotation([utils_2.getName(i7Data), '_DCL']));
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
@@ -3816,7 +3776,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenTrafo() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO2W)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO2W, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO2W), []));
                 for (const i7Data of result) {
                     const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(utils_1.generateUUID(), i7Data.name);
                     typTrafo.ukr12 = i7Data.ukr;
@@ -3844,7 +3804,7 @@ class ConverterI7 {
                 this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.TYP_TRAFO2W} ist nicht vorhanden.`);
             }
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_TRAFO3W)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO3W, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_TRAFO3W), []));
                 for (const i7Data of result) {
                     const typTrafo = new EVPowerTransformerInfo_1.EVPowerTransformerInfo(utils_1.generateUUID(), i7Data.name);
                     typTrafo.pLeer = i7Data.p_leer;
@@ -3884,7 +3844,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenGenerator() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_GENERATOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_GENERATOR, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_GENERATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_GENERATOR), []));
                 for (const i7Data of result) {
                     this.generatorTypen.set(i7Data.name, i7Data);
                 }
@@ -3897,7 +3857,7 @@ class ConverterI7 {
     convertBetriebsmitteltypenAsynchronmotor() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TYP_ASYNCHRONMOTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_ASYNCHRONMOTOR), []));
                 for (const i7Data of result) {
                     this.asynchronmotorTypen.set(i7Data.name, i7Data);
                 }
@@ -3910,7 +3870,7 @@ class ConverterI7 {
     convertMultiplikationsfaktoren() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR)) {
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, []));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.MULTIPLIKATIONSFAKTOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.MULTIPLIKATIONSFAKTOR), []));
                 for (const i7Data of result) {
                     const multFaktor = new INTEGRALMultiplierFactor_1.INTEGRALMultiplierFactor(utils_1.getUUID(undefined), utils_2.getName(i7Data), i7Data.kurzname, i7Data.kommentar);
                     multFaktor.p = utils_2.isNumericI7(i7Data.p) ? utils_2.convertToNumberI7(i7Data.p) : undefined;
@@ -3932,14 +3892,14 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO2W)) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO2W, standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO2W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO2W), standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
                 const sternpunktKnotenMap = new Map();
                 for (const elem of trafoIDs) {
                     sternpunktKnotenMap.set(elem, new Map());
                 }
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, trafoIDs));
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
@@ -4042,12 +4002,13 @@ class ConverterI7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3W)) {
                 const cimModel = frame.cimModel;
-                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, standortIDs));
+                const result = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3W, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TRAFO3W), standortIDs));
                 const trafoIDs = result.map(obj => obj['id']);
                 const trafoWicklungen = new Map();
                 const trafoWicklungIDs = [];
-                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG) && trafoIDs.length) {
-                    const wicklungenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, trafoIDs));
+                const tableNameWicklung = integral_sql_1.Integral7TableNames.TRAFO3_WICKLUNG;
+                if (this.isTableAvailable(tableNameWicklung) && trafoIDs.length) {
+                    const wicklungenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.TRAFO3_WICKLUNG, this.getAvailableColumnNames(tableNameWicklung), trafoIDs));
                     for (const wicklung of wicklungenResult) {
                         trafoWicklungen.set(wicklung.id, wicklung);
                         trafoWicklungIDs.push(wicklung.id);
@@ -4060,8 +4021,9 @@ class ConverterI7 {
                 for (const elem of trafoIDs) {
                     sternpunktKnotenMap.set(elem, new Map());
                 }
-                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, trafoIDs));
+                const tableNameStpKnoten = integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN;
+                if (this.isTableAvailable(tableNameStpKnoten) && trafoIDs.length) {
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery(integral_sql_1.getI7Query(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(tableNameStpKnoten), trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
@@ -4320,9 +4282,6 @@ class ConverterI7 {
         });
     }
     sortTransformerEnd(powerTransformer, sortProperty, order) {
-        if (powerTransformer.getUUID() === '5b0e4820d43247188ded6b28db72fc95') {
-            let stop = true;
-        }
         let winding_guids = new Array(powerTransformer.powerTransformerEnds.length);
         let winding_guids_fixed = new Array(powerTransformer.powerTransformerEnds.length);
         for (let i = 0; i < powerTransformer.powerTransformerEnds.length; i++) {
@@ -4345,12 +4304,13 @@ class ConverterI7 {
         }
     }
     setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
-        if (acLineSegment.getUUID() === 'e2505f0f-c764-44da-b88b-d40e048193c9') {
-            let stop = true;
-        }
-        if ((utils_2.isNumericI7(data.laenge) && data.laenge <= 0) || (utils_2.isBooleanI7(data.flag_impedanzlos) && utils_2.convertToBooleanI7(data.flag_impedanzlos))) {
+        if (utils_2.isBooleanI7(data.flag_impedanzlos) && utils_2.convertToBooleanI7(data.flag_impedanzlos)) {
             data.flag_impedanzlos = 1;
         }
+        else if (!utils_2.isNumericI7(data.laenge) && utils_2.isBooleanI7(data.flag_impedanzlos) && !utils_2.convertToBooleanI7(data.flag_impedanzlos)) {
+            data.flag_impedanzlos = 0;
+            data.laenge = 1;
+        }
         if (utils_2.isNumericI7(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
             acLineSegment.length = data.laenge;
         }
@@ -4475,9 +4435,6 @@ class ConverterI7 {
         return operationalLimitType;
     }
     createConnection(cimModel, conductingEquipment, object, phase, connected) {
-        if (conductingEquipment.getUUID() === '66d3c196-8927-478a-a6bf-248ea34cdeb3') {
-            let stop = true;
-        }
         let isNameSet = false;
         let terminal;
         if (object instanceof ConnectivityNode_1.ConnectivityNode) {
@@ -4720,7 +4677,26 @@ class ConverterI7 {
             try {
                 const results = yield this.mysqlController.execQuery(`SHOW TABLES FROM  ${database}`);
                 for (const table of results) {
-                    this.availableTableNames.push(table[`Tables_in_${database}`]);
+                    this.availableTableNames.set(table[`Tables_in_${database}`], []);
+                }
+            }
+            catch (e) {
+                this.logger.error(e);
+                console.error('ERROR:' + e);
+            }
+        });
+    }
+    getAvailableTableColumnNames(database) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const query = `SELECT table_name, column_name 
+                   FROM information_schema.columns
+                   WHERE table_schema = '${database}'
+                   ORDER BY table_name, ORDINAL_POSITION;`;
+            try {
+                const results = yield this.mysqlController.execQuery(query);
+                for (const table of results) {
+                    (_a = this.availableTableNames.get(table['table_name'])) === null || _a === void 0 ? void 0 : _a.push(table['column_name']);
                 }
             }
             catch (e) {
@@ -4736,6 +4712,7 @@ class ConverterI7 {
                 this.logger = logger;
                 this.initMySQLConnection(mySqlConfig);
                 yield this.getAvailableTableNames(mySqlConfig.database);
+                yield this.getAvailableTableColumnNames(mySqlConfig.database);
             }
             catch (e) {
                 status.status = 'error';
@@ -4837,7 +4814,7 @@ class ConverterI7 {
                 const offset = i * limit;
                 const currentLimit = (i + 1 === numberOfIntervals && restCount > 0) ? restCount : limit;
                 const partSchaltfeldIDs = ids.slice(offset, offset + currentLimit);
-                result.push(...yield this.mysqlController.execQuery(integral_sql_1.getI7Query(objectName, partSchaltfeldIDs)));
+                result.push(...yield this.mysqlController.execQuery(integral_sql_1.getI7Query(objectName, this.getAvailableColumnNames(objectName), partSchaltfeldIDs)));
             }
             return result;
         });
@@ -5353,7 +5330,10 @@ class ConverterI7 {
         return filteredRelevantTables;
     }
     isTableAvailable(tableName) {
-        return this.availableTableNames.indexOf(tableName) > -1 ? true : false;
+        return this.availableTableNames.has(tableName);
+    }
+    getAvailableColumnNames(tableName) {
+        return this.availableTableNames.get(tableName);
     }
     addIdMapping(i7ID, uuid, type) {
         if (this.integralID2UUID.has(i7ID)) {