--- trunk/pkgtools/mage2mysql.sh	2009/02/11 16:13:24	803
+++ trunk/pkgtools/mage2mysql.sh	2009/02/11 16:14:07	804
@@ -12,18 +12,20 @@
 SQL_PASS=mage
 SQL_HOST=localhost
 SQL_DB=mage
+SQL_TABLE_PACKAGES=packages
+SQL_TABLE_CATEGORIES=categories
 
 create_database()
 {
 	# create categories table
-	mysqldo "CREATE TABLE IF NOT EXISTS categories (
+	mysqldo "CREATE TABLE IF NOT EXISTS ${SQL_TABLE_CATEGORIES} (
 			id int(10) NOT NULL auto_increment,
 			pcat varchar(255) NOT NULL,
 			PRIMARY KEY  (id)
 		)"
 
 	# create packages table
-	mysqldo "CREATE TABLE IF NOT EXISTS packages (
+	mysqldo "CREATE TABLE IF NOT EXISTS ${SQL_TABLE_PACKAGES} (
 			id int(10) NOT NULL auto_increment,
 			pname varchar(255) NOT NULL,
 			pver varchar(255) NOT NULL,
@@ -55,12 +57,12 @@
 		# exclude includes
 		[[ ${pcat} = include ]] && continue
 
-		id=$(mysqldo "SELECT id FROM categories WHERE pcat='${pcat}'")
+		id=$(mysqldo "SELECT id FROM ${SQL_TABLE_CATEGORIES} WHERE pcat='${pcat}'")
 
 		# only add if not found
 		if [[ -z ${id} ]]
 		then
-			mysqldo "INSERT INTO categories ( pcat ) VALUES ( '${pcat}' )"
+			mysqldo "INSERT INTO ${SQL_TABLE_CATEGORIES} ( pcat ) VALUES ( '${pcat}' )"
 		fi
 	done
 }
@@ -103,10 +105,10 @@
 	SDEPEND=$(echo ${SDEPEND} | sed 's/[^a-zA-Z0-9]\{2\}\ //g')
 
 	# check if there is a pname for the same state
-	local id=$(mysqldo "SELECT id FROM packages WHERE pname='${PNAME}' AND state='${STATE}'")
+	local id=$(mysqldo "SELECT id FROM ${SQL_TABLE_PACKAGES} WHERE pname='${PNAME}' AND state='${STATE}'")
 
 	# get categorie id
-	local pcatid=$(mysqldo "SELECT id FROM categories WHERE pcat='${PCAT}'")
+	local pcatid=$(mysqldo "SELECT id FROM ${SQL_TABLE_CATEGORIES} WHERE pcat='${PCAT}'")
 
 	# get current time
 	local time="$(date +%F\ %T)"
@@ -114,7 +116,7 @@
 	# found, then update
 	if [[ ! -z ${id} ]]
 	then
-		mysqldo "UPDATE packages SET
+		mysqldo "UPDATE ${SQL_TABLE_PACKAGES} SET
 				pname='${PNAME}',
 				pver='${PVER}',
 				pbuild='${PBUILD}',
@@ -132,7 +134,7 @@
 
 	else
 		# else import to database as new
-		mysqldo "INSERT INTO packages (
+		mysqldo "INSERT INTO ${SQL_TABLE_PACKAGES} (
 				pname,
 				pver,
 				pbuild,
@@ -168,7 +170,7 @@
 reset_flags()
 {
 	# set all flags to zero
-	mysqldo "UPDATE packages SET flag='0'"
+	mysqldo "UPDATE ${SQL_TABLE_PACKAGES} SET flag='0'"
 }
 
 prune_old_packages()
@@ -178,7 +180,7 @@
 #	mysqldo "SELECT id FROM packages WHERE flag='0'"
 
 	# delete them
-	mysqldo "DELETE FROM packages WHERE flag='0'"
+	mysqldo "DELETE FROM ${SQL_TABLE_PACKAGES} WHERE flag='0'"
 }
 
 echo "Processing Categories ..."