diff --git a/README.md b/README.md
index 2b2d9fb..04f43dc 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,6 @@ cd db_report
sh -x rapport_bdd.sh
```
## Sous Windows
-```cmd
-
+```info
+Le script ne fonctionne pas, les fichiers sql ne contiennent pas les retours chariots adaptés à Windows
```
diff --git a/rapport_bdd.cmd b/rapport_bdd.cmd
index a954b7a..dd09bc5 100644
--- a/rapport_bdd.cmd
+++ b/rapport_bdd.cmd
@@ -1,50 +1,33 @@
-@echo off
+@echo on
+
setlocal enabledelayedexpansion
-REM
-REM for /f "tokens=3 delims=_" %%r in ('netstart | find /i "OracleService"') do (
-REM set ORAENV_ASK=NO
-REM set ORACLE_SID=%%r
-REM set ORACLE_SID=%ORACLE_SID:~13%
-REM set HTML_FILE=Rapport_%HNAME%_!ORACLE_SID!_%DATE:~6,4%%DATE:~3,2%%DATE:~0,2%_%TIME:~0,2%%TIME:~3,2%.html
-REM call oraenv -s >nul
-REM
-REM type sql\00_html_header.html >> !HTML_FILE!
-REM
-REM set DATE_JOUR=!DATE:~0,2!/!DATE:~3,2!/!DATE:~6,4! !TIME:~0,2!h!TIME:~3,2!
-REM echo ^
Rapport de base de données^
>> !HTML_FILE!
-REM echo ^Date : !DATE_JOUR!^
>> !HTML_FILE!
-REM echo ^Hostname : %COMPUTERNAME%^
>> !HTML_FILE!
-REM echo ^Base de données : !ORACLE_SID!^
>> !HTML_FILE!
-REM echo ^
>> !HTML_FILE!
-REM
-REM echo ^Configuration système^
>> !HTML_FILE!
-REM for %%f in (sh\*.sh) do (
-REM echo call %%f >> !HTML_FILE!
-REM )
-REM )
-for /f "tokens=3 delims=_" %%r in ('netstart | find /i "OracleService"') do (
- set ORACLE_SID=%%r
- set ORACLE_SID=%ORACLE_SID:~13%
- set HTML_FILE=Rapport_%HNAME%_!ORACLE_SID!_%DATE:~6,4%%DATE:~3,2%%DATE:~0,2%_%TIME:~0,2%%TIME:~3,2%.html
+for /f "tokens=*" %%r in ('net start ^| find /i "OracleService"') do (
+ set "ORACLE_SID=%%r"
+ set "ORACLE_SID=!ORACLE_SID:~13!"
echo ORACLE_SID=!ORACLE_SID!
- echo HTML_FILE=!HTML_FILE!
-)
-
-exit
- call oraenv -s >nul
+ set HTML_FILE=Rapport_%HNAME%_!ORACLE_SID!_%DATE:~6,4%%DATE:~3,2%%DATE:~0,2%.html
+ set TMP_SQLFILE="c:\tmp_sqlfile.sql"
+ echo exclam=!TMP_SQLFILE!
type sql\00_html_header.html >> !HTML_FILE!
- set DATE_JOUR=!DATE:~0,2!/!DATE:~3,2!/!DATE:~6,4! !TIME:~0,2!h!TIME:~3,2!
- echo ^Rapport de base de données^
>> !HTML_FILE!
+ set DATE_JOUR=%DATE:~6,4%%DATE:~3,2%%DATE:~0,2%
+ echo
+ echo ^Rapport de base de donnees^
>> !HTML_FILE!
echo ^Date : !DATE_JOUR!^
>> !HTML_FILE!
echo ^Hostname : %COMPUTERNAME%^
>> !HTML_FILE!
- echo ^Base de données : !ORACLE_SID!^
>> !HTML_FILE!
+ echo ^Base de donnees : !ORACLE_SID!^
>> !HTML_FILE!
echo ^
>> !HTML_FILE!
- echo ^Configuration système^
>> !HTML_FILE!
- for %%f in (sh\*.sh) do (
- echo call %%f >> !HTML_FILE!
+ echo ^Configuration de la base de donnees !ORACLE_SID! ^
>> !HTML_FILE!
+ for %%f in (sql\*.sql) do (
+ echo "SET PAGES 999 FEEDBACK OFF MARKUP HTML ON SPOOL ON PREFORMAT OFF ENTMAP OFF" > !TMP_SQLFILE!
+ type %%f >> !TMP_SQLFILE!
+ REM echo call sqlplus / as sysdba @!TMP_SQLFILE! >> !HTML_FILE!
+ type !TMP_SQLFILE! ^| sqlplus / as sysdba >> !HTML_FILE!
)
+
+ type sql\99_html_footer.html >> !HTML_FILE!
+ echo Rapport de la base !ORACLE_SID! dans le fichier html : !HTML_FILE!
)
\ No newline at end of file