[Mapbender-commits] r4429 - branches/2.5/resources/db

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-07-29 05:18:10 -0400 (Wed, 29 Jul 2009)
New Revision: 4429

Modified:
   branches/2.5/resources/db/install_2.5.2.bat
Log:


Modified: branches/2.5/resources/db/install_2.5.2.bat
===================================================================
--- branches/2.5/resources/db/install_2.5.2.bat	2009-07-28 13:21:59 UTC (rev 4428)
+++ branches/2.5/resources/db/install_2.5.2.bat	2009-07-29 09:18:10 UTC (rev 4429)
@@ -102,6 +102,9 @@
 :START_INSTALL
 rem echo on
 
+set DBFOLDER=utf8
+if %USEDBENC% == ISO-8859-1 set DBFOLDER=iso
+
 if %USEDBTYPE% == PostgreSQL goto INSTPOSTGRESQL
 if %USEDBTYPE% == Mysql goto INSTMYSQL
 
@@ -118,17 +121,17 @@
 echo creating db
 createdb -U %DBUSER% -E %USEDBENC% -h %DBHOST% -p %DBPORT% -T %DBTEMPLATE% %DBNAME% "Mapbender Database Version 2.5.2"
 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
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f postgresql/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
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f postgresql/%DBFOLDER%/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
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f postgresql/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
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f postgresql/%DBFOLDER%/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
+psql -U %DBUSER% -h %DBHOST% -p %DBPORT% -f postgresql/%DBFOLDER%/update/update_2.5.1rc1_to_2.5.1_pgsql_%USEDBENC%.sql %DBNAME% 1>>log_update.txt 2>> err_update.txt
 
 
 goto POFILES
@@ -146,11 +149,11 @@
 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
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%DBFOLDER%/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
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%DBFOLDER%/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
+mysql %DBNAME% -p -h %DBHOST% -P %DBPORT% -u %DBUSER% < mysql/%DBFOLDER%/update/update_2.5.1rc1_to_2.5.1_mysql_%USEDBENC%.sql >> log_update.txt 2>> err_update.txt
 
 GOTO POFILES