diff --git a/rapport_bdd.cmd b/rapport_bdd.cmd
index dd09bc5..478c5f3 100644
--- a/rapport_bdd.cmd
+++ b/rapport_bdd.cmd
@@ -1,31 +1,29 @@
-@echo on
+@echo off
setlocal enabledelayedexpansion
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!
- 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 HTML_FILE=Rapport_%COMPUTERNAME%_!ORACLE_SID!_%DATE:~6,4%%DATE:~3,2%%DATE:~0,2%.html
+ set TMP_SQLFILE="tmp_sqlfile.sql"
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 donnees : !ORACLE_SID!^
>> !HTML_FILE!
- echo ^
>> !HTML_FILE!
+
+ type sql\00_html_header.html > !HTML_FILE!
+ echo ^Rapport de base de donnees^
>> !HTML_FILE!
+ echo ^Date : !DATE_JOUR!^
>> !HTML_FILE!
+ echo ^Hostname : %COMPUTERNAME%^
>> !HTML_FILE!
+ echo ^Base de donnees : !ORACLE_SID!^
>> !HTML_FILE!
+ echo ^
>> !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!
+ echo SET PAGES 999 FEEDBACK OFF MARKUP HTML ON SPOOL ON PREFORMAT OFF ENTMAP OFF > !TMP_SQLFILE!
+ echo WHENEVER SQLERROR CONTINUE >> !TMP_SQLFILE!
type %%f >> !TMP_SQLFILE!
- REM echo call sqlplus / as sysdba @!TMP_SQLFILE! >> !HTML_FILE!
- type !TMP_SQLFILE! ^| sqlplus / as sysdba >> !HTML_FILE!
+ echo EXIT >> !TMP_SQLFILE!
+ echo Execution du script %%f
+ call sqlplus -S / as sysdba @!TMP_SQLFILE! >> !HTML_FILE!
)
type sql\99_html_footer.html >> !HTML_FILE!