[Debian-l10n-commits] r2720 - in /ddtp-web: Changelog Packages2db.sh

[nekral-guest at users.alioth.debian.org]

Author: nekral-guest
Date: Mon Jul 25 16:51:18 2011
New Revision: 2720

URL: http://svn.debian.org/wsvn/?sc=1&rev=2720
Log:
	* Packages2db.sh: Added function load_distribution() to
	commonalize the different blocks.

Modified:
    ddtp-web/Changelog
    ddtp-web/Packages2db.sh

Modified: ddtp-web/Changelog
URL: http://svn.debian.org/wsvn/ddtp-web/Changelog?rev=2720&op=diff
==============================================================================
--- ddtp-web/Changelog (original)
+++ ddtp-web/Changelog Mon Jul 25 16:51:18 2011
@@ -1,3 +1,8 @@
+2011-07-25  Nicolas Francois  <nicolas.francois at centraliens.net>
+
+	* Packages2db.sh: Added function load_distribution() to
+	commonalize the different blocks.
+
 2011-07-25  Nicolas Francois  <nicolas.francois at centraliens.net>
 
 	* Packages2packages_tb.sh: Redirect errors to stderr.

Modified: ddtp-web/Packages2db.sh
URL: http://svn.debian.org/wsvn/ddtp-web/Packages2db.sh?rev=2720&op=diff
==============================================================================
--- ddtp-web/Packages2db.sh (original)
+++ ddtp-web/Packages2db.sh Mon Jul 25 16:51:18 2011
@@ -4,66 +4,12 @@
 
 cd ~ddtp/Packages
 
-
-
-#distribution="gaia"
-#	file="Packages-lliurex_${distribution}"
-#
-#	echo `date`: lliurex_${distribution}
-#
-#	bunzip2 -k -f $file.bz2
-#	echo `date`: Packages bunzip2
-#
-#	$INPORT2DB $file lliurex_$distribution
-#	echo `date`: data in db
-#
-#	rm -f $file
-
-
-PART="main contrib"
-
-#distribution="etch"
-#for part in $PART
-#do
-#		file="Packages_${distribution}_${part}"
-#
-#		echo `date`: ${distribution}/${part}
-#
-#		bunzip2 -k -f $file.bz2
-#		echo `date`: Packages bunzip2
-#
-#		$INPORT2DB $file $distribution
-#		echo `date`: data in db
-#
-#		rm -f $file
-#done
-# Regular vacuum to cut disk usage
-#psql ddtp -c "VACUUM"
-
-
-#distribution="lenny"
-#for part in $PART
-#do
-#		file="Packages_${distribution}_${part}"
-#
-#		echo `date`: ${distribution}/${part}
-#
-#		bunzip2 -k -f $file.bz2
-#		echo `date`: Packages bunzip2
-#
-#		$INPORT2DB $file $distribution
-#		echo `date`: data in db
-#
-#		rm -f $file
-#done
-# Regular vacuum to cut disk usage
-#psql ddtp -c "VACUUM"
-
-
-
-distribution="squeeze"
-for part in $PART
-do
+load_distribution ()
+{
+	distribution=$1
+	parts=$2
+	for part in $parts
+	do
 		file="Packages_${distribution}_${part}"
 
 		echo `date`: ${distribution}/${part}
@@ -71,49 +17,26 @@
 		bunzip2 -k -f $file.bz2
 		echo `date`: Packages bunzip2
 
+#		[ "$distribution" = "lliurex" ] && distribution="gaia"
 		$INPORT2DB $file $distribution
 		echo `date`: data in db
 
 		rm -f $file
-done
-distribution="wheezy"
-for part in $PART
-do
-		file="Packages_${distribution}_${part}"
+	done
+}
 
-		echo `date`: ${distribution}/${part}
+#load_distribution lliurex gaia
 
-		bunzip2 -k -f $file.bz2
-		echo `date`: Packages bunzip2
-
-		$INPORT2DB $file $distribution
-		echo `date`: data in db
-
-		rm -f $file
-done
-# Regular vacuum to cut disk usage
-psql ddtp -c "VACUUM"
+PARTS="main contrib"
+load_distribution squeeze $PARTS
+load_distribution wheezy $PARTS
 
 # Clear active before loading sid (which is what counts as active)
 psql ddtp -c "TRUNCATE active_tb"
 psql ddtp -c "TRUNCATE part_description_tb"
 
+load_distribution sid $PARTS
 
-distribution="sid"
-for part in $PART
-do
-		file="Packages_${distribution}_${part}"
-
-		echo `date`: ${distribution}/${part}
-
-		bunzip2 -k -f $file.bz2
-		echo `date`: Packages bunzip2
-
-		$INPORT2DB $file $distribution 
-		echo `date`: data in db
-
-		rm -f $file
-done
 # Regular vacuum to cut disk usage
 psql ddtp -c "VACUUM"