[Mapbender-commits] r5392 - trunk/mapbender/resources/db

Thu Jan 21 06:28:08 EST 2010

Author: astrid_emde
Date: 2010-01-21 06:28:08 -0500 (Thu, 21 Jan 2010)
New Revision: 5392

Modified:
   trunk/mapbender/resources/db/install.bat
Log:
added psql to run update files for 2.6 to 2.6.1 and
2.6.1 to 2.7 (they where only added to install.sh)

Modified: trunk/mapbender/resources/db/install.bat
===================================================================

--- trunk/mapbender/resources/db/install.bat	2010-01-21 11:25:54 UTC (rev 5391)
+++ trunk/mapbender/resources/db/install.bat	2010-01-21 11:28:08 UTC (rev 5392)
@@ -1,203 +1,207 @@
- at echo off
-REM Script to install Mapbender 2.6 database
-REM
-setlocal
-REM Delete old Logfiles
-del log_*.txt
-del err_*.txt
+ at echo off
+REM Script to install Mapbender 2.6 database
+REM
+setlocal
+REM Delete old Logfiles
+del log_*.txt
+del err_*.txt
 :PREP
-echo.
-echo ==============================================================================
-REM Disclaimer
-echo.
-echo DISCLAIMER: this Mapbender database setup script is not stable. USE AT YOUR OWN RISK!
-echo This script will create a database for you and will import the Mapbender data to the new database
-echo It will possibly also compile the Mapbender.mo files
-echo.
-echo You need:
-echo - a running postgresql or mysql database 
-echo - database user with write access 
-echo.
-echo If everything is prepared you can continue.
-echo.
-echo ==============================================================================
-echo.
-echo Continue?
-set /p PREPARED="(y)es or (n)o:"
-
-if %PREPARED%==y goto :PREP_OK
-if %PREPARED%==n goto :End
-goto :PREP
-:PREP_OK
-
-rem Database
-:DB_TYPE
-echo.
-echo Which Database?
-set /p DBTYPE="(p)ostgresql or (m)ysql:"
-
-if %DBTYPE%==p goto :DB_PG
-if %DBTYPE%==m goto :DB_MYSQL
-goto :DB_TYPE
-
-:DB_PG
-set USEDBTYPE=PostgreSQL
-:DB_MYSQL
-IF %USEDBTYPE%x==x set USEDBTYPE=Mysql
-
-
-REM Encoding
-:DB_ENC
-echo.
-echo Which Encoding?
-set /p DBENC="(u)tf-8 or (i)so-8859-1/latin1:"
-
-if %DBENC%==u goto :DB_UTF
-if %DBENC%==i goto :DB_ISO
-goto :DB_ENC
-
-:DB_UTF
-set USEDBENC=UTF-8
-:DB_ISO
-IF %USEDBENC%x==x set USEDBENC=ISO-8859-1
-
-echo.
-set /p DBHOST="Database host (localhost if running on local maschine):"
-echo.
+echo.
+echo ==============================================================================
+REM Disclaimer
+echo.
+echo DISCLAIMER: this Mapbender database setup script is not stable. USE AT YOUR OWN RISK!
+echo This script will create a database for you and will import the Mapbender data to the new database
+echo It will possibly also compile the Mapbender.mo files
+echo.
+echo You need:
+echo - a running postgresql or mysql database 
+echo - database user with write access 
+echo.
+echo If everything is prepared you can continue.
+echo.
+echo ==============================================================================
+echo.
+echo Continue?
+set /p PREPARED="(y)es or (n)o:"
 
-
-echo.
-set /p DBPORT="Database port (e.g. 5432 for postgres, 3306 for mysql):"
-echo.
+if %PREPARED%==y goto :PREP_OK
+if %PREPARED%==n goto :End
+goto :PREP
+:PREP_OK
 
+rem Database
+:DB_TYPE
+echo.
+echo Which Database?
+set /p DBTYPE="(p)ostgresql or (m)ysql:"
 
-
-echo.
-set /p DBUSER="Database user:"
-echo.
-
-rem Password
-rem echo.
-echo Database Password will be asked many times during install...
-
-echo.
-set /p DBNAME="Database name:"
-
-:CHOICES
-echo.
-echo Your Choices:
-echo Databasetype: %DBTYPE% - %USEDBTYPE%
+if %DBTYPE%==p goto :DB_PG
+if %DBTYPE%==m goto :DB_MYSQL
+goto :DB_TYPE
+
+:DB_PG
+set USEDBTYPE=PostgreSQL
+:DB_MYSQL
+IF %USEDBTYPE%x==x set USEDBTYPE=Mysql
+
+
+REM Encoding
+:DB_ENC
+echo.
+echo Which Encoding?
+set /p DBENC="(u)tf-8 or (i)so-8859-1/latin1:"
+
+if %DBENC%==u goto :DB_UTF
+if %DBENC%==i goto :DB_ISO
+goto :DB_ENC
+
+:DB_UTF
+set USEDBENC=UTF-8
+:DB_ISO
+IF %USEDBENC%x==x set USEDBENC=ISO-8859-1
+
+echo.
+set /p DBHOST="Database host (localhost if running on local maschine):"
+echo.
+
+
+echo.
+set /p DBPORT="Database port (e.g. 5432 for postgres, 3306 for mysql):"
+echo.
+
+
+
+echo.
+set /p DBUSER="Database user:"
+echo.
+
+rem Password
+rem echo.
+echo Database Password will be asked many times during install...
+
+echo.
+set /p DBNAME="Database name:"
+
+:CHOICES
+echo.
+echo Your Choices:
+echo Databasetype: %DBTYPE% - %USEDBTYPE%
 echo Encoding: %DBENC% - %USEDBENC%
 echo Database Host: %DBHOST%
-echo Database Port: %DBPORT%
-echo Database Name: %DBNAME%
-echo Database User: %DBUSER%
-echo Database Password: %DBPASSWORD% (not shown)
-echo.
-echo Looks ok, start install?
-echo.
-set /p START_INSTALL="(y)es or (n)o? "
-if %START_INSTALL%==y goto START_INSTALL
-goto PREP
-:START_INSTALL
-rem echo on
-
-if %USEDBTYPE% == PostgreSQL goto INSTPOSTGRESQL
-if %USEDBTYPE% == Mysql goto INSTMYSQL
-
-:INSTPOSTGRESQL
-REM do these exist?
-psql --version 2> nul 1> nul
-if NOT %ERRORLEVEL% == 0 goto PGNOTFOUND
-set /p DBTEMPLATE="database template to use (just hit return for default):"
-
-IF %DBTEMPLATE%x==x set DBTEMPLATE=template0
+echo Database Port: %DBPORT%
+echo Database Name: %DBNAME%
+echo Database User: %DBUSER%
+echo Database Password: %DBPASSWORD% (not shown)
+echo.
+echo Looks ok, start install?
+echo.
+set /p START_INSTALL="(y)es or (n)o? "
+if %START_INSTALL%==y goto START_INSTALL
+goto PREP
+:START_INSTALL
+rem echo on
+
+if %USEDBTYPE% == PostgreSQL goto INSTPOSTGRESQL
+if %USEDBTYPE% == Mysql goto INSTMYSQL
+
+:INSTPOSTGRESQL
+REM do these exist?
+psql --version 2> nul 1> nul
+if NOT %ERRORLEVEL% == 0 goto PGNOTFOUND
+set /p DBTEMPLATE="database template to use (just hit return for default):"
+
+IF %DBTEMPLATE%x==x set DBTEMPLATE=template0
 IF %DBHOST%x==x set DBHOST=localhost
 IF %DBPORT%x==x set DBPORT=5432
-
-echo creating db
-createdb -U %DBUSER% -E %USEDBENC% -h %DBHOST% -p %DBPORT% -T %DBTEMPLATE% %DBNAME% "Mapbender Database Version 2.6"
-echo creating schema
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_schema_2.5.sql %DBNAME% 1>log_schema.txt 2> err_schema.txt
-echo importing data
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/pgsql_data_2.5.sql %DBNAME% 1>log_data.txt 2> err_data.txt
-echo setting sequences
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_serial_set_sequences_2.5.sql %DBNAME% 1>log_sequences.txt 2> err_sequences.txt
-
-echo performing updates
-echo to 2.5.1rc1
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>log_update.txt 2> err_update.txt
-echo to 2.5.1
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
-echo to 2.6rc1
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
-echo to 2.6
-psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6rc1_to_2.6_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
-
-
-goto POFILES
-
+
+echo creating db
+createdb -U %DBUSER% -E %USEDBENC% -h %DBHOST% -p %DBPORT% -T %DBTEMPLATE% %DBNAME% "Mapbender Database Version 2.6"
+echo creating schema
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_schema_2.5.sql %DBNAME% 1>log_schema.txt 2> err_schema.txt
+echo importing data
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/pgsql_data_2.5.sql %DBNAME% 1>log_data.txt 2> err_data.txt
+echo setting sequences
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/pgsql_serial_set_sequences_2.5.sql %DBNAME% 1>log_sequences.txt 2> err_sequences.txt
+
+echo performing updates
+echo to 2.5.1rc1
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>log_update.txt 2> err_update.txt
+echo to 2.5.1
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
+echo to 2.6rc1
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
+echo to 2.6
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6rc1_to_2.6_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
+echo update to 2.6.1
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6_to_2.6.1_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
+echo update to 2.7
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f pgsql/%USEDBENC%/update/update_2.6.1_to_2.7rc1_pgsql_%USEDBENC%.sql %DBNAME% 1>> log_update.txt 2>> err_update.txt
+
+
+goto POFILES
+
 :INSTMYSQL
 IF %DBHOST%x==x set DBHOST=localhost
 IF %DBPORT%x==x set DBPORT=3306
 
-mysql --version 2> nul 1> nul
-
-if not %ERRORLEVEL% == 0 goto MYSQLNOTFOUND
-echo creating database
-if %USEDBENC% == ISO-8859-1 mysql -h %DBHOST% -P %DBPORT% -u %DBUSER% -e "create database %DBNAME% character set latin1 COLLATE latin1_german1_ci;" -p
-if %USEDBENC% == UTF-8 mysql -h %DBHOST% -P %DBPORT% -e "create database %DBNAME% character set utf8 COLLATE utf8_general__ci;" -p
-echo creating schema
-mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
-echo loading data
-mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
-echo update to 2.5.1rc1
-mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_mysql_%USEDBENC%.sql > log_update.txt 2> err_update.txt
-echo update to 2.5.1
-mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
-echo update to 2.6rc1
+mysql --version 2> nul 1> nul
+
+if not %ERRORLEVEL% == 0 goto MYSQLNOTFOUND
+echo creating database
+if %USEDBENC% == ISO-8859-1 mysql -h %DBHOST% -P %DBPORT% -u %DBUSER% -e "create database %DBNAME% character set latin1 COLLATE latin1_german1_ci;" -p
+if %USEDBENC% == UTF-8 mysql -h %DBHOST% -P %DBPORT% -e "create database %DBNAME% character set utf8 COLLATE utf8_general__ci;" -p
+echo creating schema
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
+echo loading data
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+echo update to 2.5.1rc1
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5_to_2.5.1rc1_mysql_%USEDBENC%.sql > log_update.txt 2> err_update.txt
+echo update to 2.5.1
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
+echo update to 2.6rc1
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.5.1_to_2.6rc1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
-echo update to 2.6
+echo update to 2.6
 mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%USEDBENC%/update/update_2.6rc1_to_2.6_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
-
 
+
 GOTO POFILES
 
 
 :POFILES
 rem install mapbender.conf
 if not exist ..\..\conf\mapbender.conf copy ..\..\conf\mapbender.conf-dist ..\..\conf\mapbender.conf
-echo please check and edit your mapbender.conf.
+echo please check and edit your mapbender.conf.
 
-
-rem update .po files
-echo ""
-msgfmt --version 2> nul 1> nul
-if NOT %ERRORLEVEL% == 0 goto MSGFMTNOTFOUND
-echo "Compiling .po files..."
-pushd ..\..\tools\
-findstr /v ^# i18n_update_mo.sh > i18n_update_mo.bat
-call i18n_update_mo.bat
-del i18n_update_mo.bat
+
+rem update .po files
+echo ""
+msgfmt --version 2> nul 1> nul
+if NOT %ERRORLEVEL% == 0 goto MSGFMTNOTFOUND
+echo "Compiling .po files..."
+pushd ..\..\tools\
+findstr /v ^# i18n_update_mo.sh > i18n_update_mo.bat
+call i18n_update_mo.bat
+del i18n_update_mo.bat
 popd
 
 
-goto END:
-
-:MSGFMTNOTFOUND
-echo Sorry, msgfmt not found, must be in PATH-Variable, won't compile translations...
-echo Have a look at http://www.mapbender.org/Gettext#Utility_programms for msgfmt.
-goto END:
-goto END:
-:PGNOTFOUND
-echo Sorry, psql not found, must be in PATH-Variable, exiting...
-goto END
-:MYSQLNOTFOUND
-echo Sorry, mysql not found, must be in PATH-Variable, exiting...
-goto END
-
-REM End, keep Terminal session open
-:END
-endlocal
-echo Finished...check the log files to see if an error occured.
+goto END:
+
+:MSGFMTNOTFOUND
+echo Sorry, msgfmt not found, must be in PATH-Variable, won't compile translations...
+echo Have a look at http://www.mapbender.org/Gettext#Utility_programms for msgfmt.
+goto END:
+goto END:
+:PGNOTFOUND
+echo Sorry, psql not found, must be in PATH-Variable, exiting...
+goto END
+:MYSQLNOTFOUND
+echo Sorry, mysql not found, must be in PATH-Variable, exiting...
+goto END
+
+REM End, keep Terminal session open
+:END
+endlocal
+echo Finished...check the log files to see if an error occured.
 pause 

