diff --git a/bin/getexdraw.bat b/bin/getexdraw.bat index 8bdfb2d..0d35b4f 100644 --- a/bin/getexdraw.bat +++ b/bin/getexdraw.bat @@ -7,6 +7,7 @@ for %%i in ("%~1") do ( set "DIR=%%~dpi" ) call C:\kabellaengen\bin\setenv.bat +REM call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat REM echo Dateiname ohne Erweiterung: %FILENAME% REM echo Erweiterung: %EXT% @@ -14,6 +15,7 @@ REM echo Verzeichnis: %DIR% REM REM Namen der Zwischenergebnis Dateien set JSON_POS=%FILENAME%_positionsdraw.json +set JSON_ROUTING=%FILENAME%_routing.json set JSON_TODRAW=%FILENAME%_todraw.json REM Namen der Ergebnisdateien set ERROR_DOUBLE=%FILENAME%_errors.json @@ -24,15 +26,18 @@ if exist "%~dp0_setenv.bat" ( echo Lade lokale Umgebungseinstellungen aus _setenv.bat... call "%~dp0_setenv.bat" ) +REM Zielverzeichnis +set TARGET_DIR=%PROJECT_BOM_RESULTS%\%FILENAME% +mkdir "%TARGET_DIR%" -echo on echo. echo === Fetching Positions === call getpositions.bat --filename %1 -s -r -w %JSON_POS% -e %ERROR_DOUBLE% if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" ( - @echo -failed- duplicate IDs in given layout + @echo -failed- errors found, e.g. duplicate IDs in given layout pause - move %PROJECT_WORK%\%ERROR_DOUBLE% %PROJECT_BOM_RESULTS% + move %PROJECT_WORK%\%ERROR_DOUBLE% %TARGET_DIR% + move %PROJECT_WORK%\%JSON_TODRAW% %TARGET_DIR% goto :eof ) if not exist "%PROJECT_WORK%\%JSON_POS%" ( @@ -42,8 +47,8 @@ if not exist "%PROJECT_WORK%\%JSON_POS%" ( ) echo. echo === Creating Graph for Routing === -call routing.bat --filename %JSON_POS% -w %JSON_TODRAW% -if not exist "%PROJECT_WORK%\%JSON_TODRAW%" ( +call routing.bat --filename %JSON_POS% -w %JSON_ROUTING% +if not exist "%PROJECT_WORK%\%JSON_ROUTING%" ( @echo -failed- routing pause goto :eof @@ -58,8 +63,7 @@ if not exist "%PROJECT_WORK%\%EXCEL_RES%" ( ) echo. -mkdir %PROJECT_BOM_RESULTS%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%_* %PROJECT_BOM_RESULTS%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%_* %TARGET_DIR% pause diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat index 9c066a2..050b405 100644 --- a/bin/ioconverter.bat +++ b/bin/ioconverter.bat @@ -7,6 +7,7 @@ for %%i in ("%~1") do ( set "DIR=%%~dpi" ) call C:\kabellaengen\bin\setenv.bat +REM call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat REM echo Dateiname ohne Erweiterung: %FILENAME% REM echo Erweiterung: %EXT% @@ -23,16 +24,20 @@ if exist "%~dp0_setenv.bat" ( echo Lade lokale Umgebungseinstellungen aus _setenv.bat... call "%~dp0_setenv.bat" ) - +REM Zielverzeichnis +set TARGET_DIR=%PROJECT_IO_RESULTS%\%FILENAME% +mkdir "%TARGET_DIR%" echo. echo === Fetching Positions === call getpositions.bat --filename %1 -s -r -w %JSON_POS% -e %ERROR_DOUBLE% if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" ( - @echo == failed: duplicate IDs in given layout + @echo == failed: errors, e.g. duplicate IDs in given layout pause - move %PROJECT_WORK%\%ERROR_DOUBLE% %PROJECT_IO_RESULTS% + move %PROJECT_WORK%\%ERROR_DOUBLE% %TARGET_DIR% + move %PROJECT_WORK%\%JSON_TODRAW% %TARGET_DIR% + goto :eof ) if not exist "%PROJECT_WORK%\%JSON_POS%" ( @@ -47,9 +52,8 @@ if not exist "%PROJECT_WORK%\%RESULT_TIA%" ( pause goto :eof ) -mkdir %PROJECT_IO_RESULTS%\%FILENAME% -echo move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME% +echo move %PROJECT_WORK%\%FILENAME%-* %TARGET_DIR% +move %PROJECT_WORK%\%FILENAME%-* %TARGET_DIR% pause goto :eof diff --git a/bin/run_tests.bat b/bin/run_tests.bat index 7fcb407..b9a9a69 100644 --- a/bin/run_tests.bat +++ b/bin/run_tests.bat @@ -18,12 +18,10 @@ if %ERRORLEVEL% NEQ 0 ( echo. echo Tests failed! CALL manage_interpreter.bat deactivate_interpreter - pause exit /B 1 ) else ( echo. echo All tests passed! CALL manage_interpreter.bat deactivate_interpreter - pause exit /B 0 ) \ No newline at end of file