diff --git a/bin/ioconverter.bat b/bin/ioconverter.bat index 41c0e48..91d95d3 100644 --- a/bin/ioconverter.bat +++ b/bin/ioconverter.bat @@ -1,4 +1,54 @@ @echo off -CALL setenv.bat -python %PROJECT_LIB%\portalexport.py %* \ No newline at end of file +if [%1]==[] goto usage +for %%i in ("%~1") do ( + set "FILENAME=%%~ni" + set "EXT=%%~xi" + set "DIR=%%~dpi" +) + +REM echo Dateiname ohne Erweiterung: %FILENAME% +REM echo Erweiterung: %EXT% +REM echo Verzeichnis: %DIR% +REM +REM Namen der Zwischenergebnis Dateien +set JSON_POS=%FILENAME%_positions.json +set JSON_TODRAW=%FILENAME%_todraw.json +REM Namen der Ergebnisdateien +set ERROR_DOUBLE=%FILENAME%_errors.json + + +call C:\kabellaengen\bin\setenv.bat +if exist "_setenv_local.bat" ( + call _setenv_local.bat +) + + +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 + pause + move %PROJECT_WORK%\%ERROR_DOUBLE% %INSTALL_DIR% + goto :eof +) +if not exist "%PROJECT_WORK%\%JSON_POS%" ( + @echo -failed- getpositions + pause + goto :eof +) +echo === Creating Excel Files for TIA, WSCAD, .. === +call ioconvert.bat --filename %JSON_POS% -outname %FILENAME% + +mkdir %INSTALL_DIR%\%FILENAME% +move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%\%FILENAME% +goto :eof + + +:usage +@echo Usage: %0 ^ +exit /B 1 +goto :eof + + diff --git a/bin/portalexport.bat b/bin/portalexport.bat deleted file mode 100644 index 946d674..0000000 --- a/bin/portalexport.bat +++ /dev/null @@ -1,48 +0,0 @@ -@echo off - -if [%1]==[] goto usage -for %%i in ("%~1") do ( - set "FILENAME=%%~ni" - set "EXT=%%~xi" - set "DIR=%%~dpi" -) - -REM echo Dateiname ohne Erweiterung: %FILENAME% -REM echo Erweiterung: %EXT% -REM echo Verzeichnis: %DIR% -REM -REM Namen der Zwischenergebnis Dateien -set JSON_POS=%FILENAME%_positions.json -set JSON_TODRAW=%FILENAME%_todraw.json -REM Namen der Ergebnisdateien -set ERROR_DOUBLE=%FILENAME%_errors.json - - -call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat - - -echo --hole Positionen -call portalexport.bat --filename %1 -w %JSON_POS% -e %ERROR_DOUBLE% -if exist "%PROJECT_WORK%\%ERROR_DOUBLE%" ( - @echo -failed- given items with the same ids - pause - move %PROJECT_WORK%\%ERROR_DOUBLE% %INSTALL_DIR% - goto :eof -) -if not exist "%PROJECT_WORK%\%JSON_POS%" ( - @echo -failed- getpositions - pause - goto :eof -) - -mkdir %INSTALL_DIR%\%FILENAME% -move %PROJECT_WORK%\%FILENAME%_* %INSTALL_DIR%\%FILENAME% -goto :eof - - -:usage -@echo Usage: %0 ^ -exit /B 1 -goto :eof - -