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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-07-29 05:21:39 -0400 (Wed, 29 Jul 2009)
New Revision: 4430

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


Modified: branches/2.5/resources/db/install_2.5.2.sh
===================================================================
--- branches/2.5/resources/db/install_2.5.2.sh	2009-07-29 09:18:10 UTC (rev 4429)
+++ branches/2.5/resources/db/install_2.5.2.sh	2009-07-29 09:21:39 UTC (rev 4430)
@@ -73,8 +73,10 @@
     if [  "$DBENCODING" = "i" ]
     then
         DBENCODING="ISO-8859-1" 
+        DBFOLDER="iso" 
     else
         DBENCODING="UTF-8" 
+        DBFOLDER="utf8" 
     fi
 
     echo ""
@@ -137,9 +139,9 @@
         mysql -e "create database $DBNAME CHARACTER SET utf8 COLLATE utf8_general_ci;" -p$DBPASSWORD
     fi
 	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/mysql_schema_2.5.sql > log_schema.txt 2> err_schema.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5_to_2.5.1rc1_mysql_$DBENCODING.sql > log_update.txt 2> err_update.txt
-	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
+	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBFOLDER/mysql_data_2.5.sql > log_data.txt 2> err_data.txt
+	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBFOLDER/update/update_2.5_to_2.5.1rc1_mysql_$DBENCODING.sql > log_update.txt 2> err_update.txt
+	mysql $DBNAME -p$DBPASSWORD -h $DBHOST -P $DBPORT < mysql/$DBFOLDER/update/update_2.5.1rc1_to_2.5.1_mysql_$DBENCODING.sql >> log_update.txt 2>> err_update.txt
 	
 }
 
@@ -157,15 +159,15 @@
     echo "creating database"
     createdb -U $DBUSER  -h $DBHOST -p $DBPORT -E $DBENCODING $DBNAME -T $DBTEMPLATE
     echo "creating schema"
-	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/pgsql_schema_2.5.sql $DBNAME > log_schema.txt 2> err_schema.txt
+	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f postgresql/pgsql_schema_2.5.sql $DBNAME > log_schema.txt 2> err_schema.txt
     echo "loading data"	
-    psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/pgsql_data_2.5.sql $DBNAME > log_data.txt 2> err_data.txt
+    psql -U $DBUSER  -h $DBHOST -p $DBPORT -f postgresql/$DBFOLDER/pgsql_data_2.5.sql $DBNAME > 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 > log_sequences.txt 2> err_squences.txt
+    psql -U $DBUSER  -h $DBHOST -p $DBPORT -f postgresql/pgsql_serial_set_sequences_2.5.sql $DBNAME > log_sequences.txt 2> err_squences.txt
 	echo "update to 2.5.1rc1"
-    psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5_to_2.5.1rc1_pgsql_$DBENCODING.sql $DBNAME > 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_$DBENCODING.sql $DBNAME > log_update.txt 2> err_update.txt
 	echo "update to 2.5.1"
-	psql -U $DBUSER  -h $DBHOST -p $DBPORT -f pgsql/$DBENCODING/update/update_2.5.1rc1_to_2.5.1_pgsql_$DBENCODING.sql $DBNAME >> 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_$DBENCODING.sql $DBNAME >> log_update.txt 2>> err_update.txt
 
 
 }