m.stangl/kabellaengen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mit neuem Schalter --export_dir

Browse Source
This commit is contained in:
Michael Stangl
2026-07-30 10:53:31 +02:00
parent 0083718814
commit e554a18f4c
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/ioconverter.bat
+4 -7
View File
@@ -17,7 +17,6 @@ set JSON_POS=%FILENAME%_positionsconv.json
set JSON_TODRAW=%FILENAME%_todraw.json set JSON_TODRAW=%FILENAME%_todraw.json
REM Namen der Ergebnisdateien REM Namen der Ergebnisdateien
set ERROR_DOUBLE=%FILENAME%_errors.json set ERROR_DOUBLE=%FILENAME%_errors.json
set RESULT_TIA=%FILENAME%-*_TIA.xlsx
if exist "%~dp0_setenv.bat" ( if exist "%~dp0_setenv.bat" (
echo Lade lokale Umgebungseinstellungen aus _setenv.bat... echo Lade lokale Umgebungseinstellungen aus _setenv.bat...
@@ -25,9 +24,9 @@ if exist "%~dp0_setenv.bat" (
) )
REM Zielverzeichnis REM Zielverzeichnis
set TARGET_DIR=%PROJECT_IO_RESULTS%\%FILENAME% set TARGET_DIR=%PROJECT_IO_RESULTS%\%FILENAME%
mkdir "%TARGET_DIR%" if not exist "%TARGET_DIR%" mkdir "%TARGET_DIR%"
REM lösche alte Fehlermeldungen REM lösche alte Fehlermeldungen
del "%PROJECT_WORK%\%ERROR_DOUBLE%" if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" del "%PROJECT_WORK%\%ERROR_DOUBLE%"
@@ -48,14 +47,12 @@ if not exist "%PROJECT_WORK%\%JSON_POS%" (
goto :eof goto :eof
) )
echo === Creating Excel Files for TIA, WSCAD, .. === echo === Creating Excel Files for TIA, WSCAD, .. ===
call portalexport.bat --filename %JSON_POS% --outname %FILENAME% call portalexport.bat --filename %JSON_POS% --outname %FILENAME% --export_dir "%TARGET_DIR%"
if not exist "%PROJECT_WORK%\%RESULT_TIA%" ( if not exist "%TARGET_DIR%\*_TIA.xlsx" (
@echo == failed: creating .xlsx files @echo == failed: creating .xlsx files
pause pause
goto :eof goto :eof
) )
echo move %PROJECT_WORK%\%FILENAME%-* %TARGET_DIR%
move %PROJECT_WORK%\%FILENAME%-* %TARGET_DIR%
pause pause
goto :eof goto :eof
bin/ioconverter.sh
+7 -7
View File
@@ -21,7 +21,9 @@ JSON_POS="${FILENAME}_positionsconv.json"
JSON_TODRAW="${FILENAME}_todraw.json" JSON_TODRAW="${FILENAME}_todraw.json"
# Namen der Ergebnisdateien # Namen der Ergebnisdateien
ERROR_DOUBLE="${FILENAME}_errors.json" ERROR_DOUBLE="${FILENAME}_errors.json"
RESULT_TIA="${FILENAME}-*_TIA.xlsx"
TARGET_DIR="$PROJECT_IO_RESULTS/$FILENAME"
mkdir -p "$TARGET_DIR"
echo echo
echo "=== Fetching Positions ===" echo "=== Fetching Positions ==="
@@ -30,7 +32,8 @@ echo "=== Fetching Positions ==="
if [ -f "$PROJECT_WORK/$ERROR_DOUBLE" ]; then if [ -f "$PROJECT_WORK/$ERROR_DOUBLE" ]; then
echo "== failed: duplicate IDs in given layout" echo "== failed: duplicate IDs in given layout"
read -p "Press any key to continue..." read -p "Press any key to continue..."
mv "$PROJECT_WORK/$ERROR_DOUBLE" "$PROJECT_IO_RESULTS" mv "$PROJECT_WORK/$ERROR_DOUBLE" "$TARGET_DIR"
mv "$PROJECT_WORK/$JSON_TODRAW" "$TARGET_DIR"
exit 1 exit 1
fi fi
@@ -41,15 +44,12 @@ if [ ! -f "$PROJECT_WORK/$JSON_POS" ]; then
fi fi
echo "=== Creating Excel Files for TIA, WSCAD, .. ===" echo "=== Creating Excel Files for TIA, WSCAD, .. ==="
"$SCRIPT_DIR/portalexport.sh" --filename "$JSON_POS" --outname "$FILENAME" "$SCRIPT_DIR/portalexport.sh" --filename "$JSON_POS" --outname "$FILENAME" --export_dir "$TARGET_DIR"
if [ ! -f "$PROJECT_WORK/$RESULT_TIA" ]; then if ! compgen -G "$TARGET_DIR/*_TIA.xlsx" > /dev/null; then
echo "== failed: creating .xlsx files" echo "== failed: creating .xlsx files"
read -p "Press any key to continue..." read -p "Press any key to continue..."
exit 1 exit 1
fi fi
mkdir -p "$PROJECT_IO_RESULTS/$FILENAME"
echo "move $PROJECT_WORK/${FILENAME}-* $PROJECT_IO_RESULTS/$FILENAME"
mv "$PROJECT_WORK/${FILENAME}"-* "$PROJECT_IO_RESULTS/$FILENAME"
read -p "Press any key to continue..." read -p "Press any key to continue..."