X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=bin%2Fparse-packages;h=b3aab25fff2ee63b7e779edb86a2928023cba511;hp=04bee3d9b75381ce410359568e9b25466e92dbfa;hb=49f6fa5b401d8bba7abc2bafde675841a8729a15;hpb=08852aab550de858d4e4956ea357dbc3ae713a26

diff --git a/bin/parse-packages b/bin/parse-packages
index 04bee3d..b3aab25 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -20,13 +20,21 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 use strict;
+use lib './lib';
+
+$| = 1;
 
 my $what = $ARGV[0] ? "non-free" : "*";
 # max. distinct results for a given package postfix
 my $MAX_PACKAGE_POSTFIXES = 100;
 
 use DB_File;
+use Storable;
+use Deb::Versions;
+use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES );
+&Packages::Config::init( './' );
 my %packages_small = ();
+my %virtual_packages = ();
 my %package_names = ();
 my %package_postfixes = ();
 my %sources_packages = ();
@@ -35,20 +43,21 @@ my @descriptions = ("we count lines one-based\000");
 my %packages_descriptions = ();
 my %descriptions_packages = ();
 
-my @archives = ( 'us', 'non-US', 'security', 'volatile', 'backports' );
-my @suites = ('oldstable', 'stable', 'testing', 'unstable', 'experimental');
+my %sections = ();
+my %subsections = ();
+my %priorities = ();
 
 $/ = "";
 
-for my $archive (@archives) {
-    for my $suite (@suites) {
+for my $archive (@ARCHIVES) {
+    for my $suite (@SUITES) {
 
 	print "Reading $archive/$suite...\n";
 	my %packages_all_db;
-	tie %packages_all_db, "DB_File", "packages_all_$suite.db.new",
+	tie %packages_all_db, "DB_File", "$DBDIR/packages_all_$suite.db.new",
 		O_RDWR|O_CREAT, 0666, $DB_BTREE
 		or die "Error creating DB: $!";
-	open PKG, "zcat /org/packages.debian.org/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
+	open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
 	while (<PKG>) {
 		next if /^\s*$/;
 		my $data = "";
@@ -64,16 +73,19 @@ for my $archive (@archives) {
 		# Skip double package
 		next if exists($packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"});
 
+		if ($data{'provides'}) {
+		    foreach (split /\s*,\s*/, $data{'provides'}) {
+			$virtual_packages{$_}{$suite}{$data{'package'}}++;
+		    }
+		}
 		$package_names{$data{'package'}} = 1;
 		my $src = $data{'package'};
 		my $src_version = '';
 		if ($data{'source'}) {
 			$src = $data{'source'};
-			$src_version = $1
-			    if $src =~ s/\s+\(\s*=\s*(.*)\).*//; # strip version info
+			$src =~ s/\s+.*//; # strip version info
 		}
 		$data{'source'} = $src;
-		$data{'source-version'} = $src_version;
 		my $descr = $data{'description'};
 		my $did = undef;
 		if (exists($descriptions{$descr})) {
@@ -94,12 +106,25 @@ for my $archive (@archives) {
 		my $subsection = $data{section} || '-';
 		if ($data{section} && ($data{section} =~ m=/=o)) {
 		    ($section, $subsection) = split m=/=o, $data{section}, 2;
+		    ($subsection, $section) = split m=/=o, $data{section}, 2
+			if $section eq 'non-US';
 		}
 		$data{'section'} = $section;
 		$data{'subsection'} = $subsection;
 		$data{'priority'} ||= '-';
-		$packages_small{$data{'package'}} .= "$archive $suite $data{'architecture'} ".
-			"$section $subsection $data{'priority'} $data{'version'} $sdescr\000";
+		$sections{$suite}{$archive}{$section}++;
+		$subsections{$suite}{$archive}{$subsection}++;
+		$priorities{$suite}{$archive}{$data{priority}}++;
+		my $pkgitem = "$archive $suite $data{'architecture'} ".
+			"$section $subsection $data{'priority'} $data{'version'} $sdescr\0";
+		my $previtem = $packages_small{$data{'package'}}{$suite}{$data{'architecture'}}
+		    || $pkgitem;
+		$packages_small{$data{'package'}}{$suite}{$data{'architecture'}} = $pkgitem
+		    if version_cmp($data{'version'}, (split /\s/o, $previtem)[6]) >= 0;
+		$previtem = $packages_small{$data{'package'}}{$suite}{'any'}
+		    || $pkgitem;
+		$packages_small{$data{'package'}}{$suite}{'any'} = $pkgitem
+		    if version_cmp($data{'version'}, (split /\s/o, $previtem)[6]) >= 0;
 		$sources_packages{$src} .=
 			"$archive $suite $data{'package'} $data{'version'} $data{'architecture'}\000";
 		$data{archive} = $archive;
@@ -107,8 +132,9 @@ for my $archive (@archives) {
 			next if $key eq 'package' or $key eq 'version' or $key eq 'architecture'
 				or $key eq 'maintainer';
 			print STDERR "WARN: $key ($suite/$archive/$data{package}/$data{architecture}\n" unless defined $value;
-			$data .= "$key: $value\n";
+			$data .= "$key\00$value\00";
 		}
+		$data =~ s/.$//s;
 		$packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"}
 			= $data;
 	}
@@ -119,17 +145,36 @@ for my $archive (@archives) {
 
 print "Writing databases...\n";
 my %packages_small_db;
-tie %packages_small_db, "DB_File", "packages_small.db.new",
+tie %packages_small_db, "DB_File", "$DBDIR/packages_small.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
-while (my ($k, $v) = each(%packages_small)) {
-	$v =~ s/.$//s;
-	$packages_small_db{$k} = $v;
+while (my ($pkg, $v) = each(%packages_small)) {
+	my ($res1, $res2, $res3) = ("", "", "");
+	while (my ($suite, $v2) = each %$v) {
+	    $res2 .= $v2->{'any'};
+	    while (my ($arch, $v3) = each %$v2) {
+		next if $arch eq 'any' or $v3 eq $v2->{'any'};
+		$res3 .= $v3;
+	    }
+	}
+    	
+	if (exists $virtual_packages{$pkg}) {
+		while (my ($suite, $v2) = each %{$virtual_packages{$pkg}}) {
+			$res1 .= "$suite\01".(join ' ', keys %$v2)."\01";
+		}
+	} else {
+		$res1 .= "-\01-\01";
+	}
+	$res1 =~ s/.$/\0/s;
+
+	my $res = "$res1$res2$res3";
+	$res =~ s/.$//s;
+	$packages_small_db{$pkg} = $res;
 }
 untie %packages_small_db;
 
 my %sources_packages_db;
-tie %sources_packages_db, "DB_File", "sources_packages.db.new",
+tie %sources_packages_db, "DB_File", "$DBDIR/sources_packages.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%sources_packages)) {
@@ -139,7 +184,7 @@ while (my ($k, $v) = each(%sources_packages)) {
 untie %sources_packages_db;
 
 my %packages_descriptions_db;
-tie %packages_descriptions_db, "DB_File", "packages_descriptions.db.new",
+tie %packages_descriptions_db, "DB_File", "$DBDIR/packages_descriptions.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%packages_descriptions)) {
@@ -148,7 +193,7 @@ while (my ($k, $v) = each(%packages_descriptions)) {
 untie %packages_descriptions_db;
 
 my %descriptions_packages_db;
-tie %descriptions_packages_db, "DB_File", "descriptions_packages.db.new",
+tie %descriptions_packages_db, "DB_File", "$DBDIR/descriptions_packages.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%descriptions_packages)) {
@@ -158,14 +203,19 @@ while (my ($k, $v) = each(%descriptions_packages)) {
 untie %descriptions_packages_db;
 
 my %descriptions_db;
-tie %descriptions_db, "DB_File", "descriptions.db.new",
+tie %descriptions_db, "DB_File", "$DBDIR/descriptions.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
-open DESCR, "> descriptions.txt" or die "Error creating descriptions textfile";
+open DESCR, ">", "$DBDIR/descriptions.txt" or die "Error creating descriptions textfile";
 for (my $i=1; $i<= $#descriptions; $i++) {
 	my $plain_description = $descriptions[$i];
-	$plain_description =~ s/\n .\n/ /og;
-	$plain_description =~ s/[\n \t]+/ /og;
+# WARNING: This needs to correspond with what happens in
+# Packages/Search.pm:do_fulltext_search
+	$plain_description =~ tr [A-Z] [a-z];
+	# ensure one space on both ends
+	$plain_description = " $plain_description ";
+	$plain_description =~ s/[(),.-]+//og;
+	$plain_description =~ s#[^a-z0-9_/+]+# #og;
 	print DESCR "$plain_description\n";
 	$descriptions_db{$i} = $descriptions[$i];
 }
@@ -182,7 +232,7 @@ for my $pkg (keys %package_names) {
 	}
 }
 my %package_postfixes_db;
-tie %package_postfixes_db, "DB_File", "package_postfixes.db.new",
+tie %package_postfixes_db, "DB_File", "$DBDIR/package_postfixes.db.new",
 	O_RDWR|O_CREAT, 0666, $DB_BTREE
 	or die "Error creating DB: $!";
 while (my ($k, $v) = each(%package_postfixes)) {
@@ -197,13 +247,20 @@ while (my ($k, $v) = each(%package_postfixes)) {
 }
 untie %package_postfixes_db;
 
-rename("packages_small.db.new", "packages_small.db");
-rename("sources_packages.db.new", "sources_packages.db");
-for my $suite (@suites) {
-	rename("packages_all_$suite.db.new", "packages_all_$suite.db");
+store \%sections, "$DBDIR/sections.info";
+store \%subsections, "$DBDIR/subsections.info";
+store \%priorities, "$DBDIR/priorities.info";
+
+rename("$DBDIR/packages_small.db.new", "$DBDIR/packages_small.db");
+rename("$DBDIR/sources_packages.db.new", "$DBDIR/sources_packages.db");
+for my $suite (@SUITES) {
+	rename("$DBDIR/packages_all_$suite.db.new",
+	       "$DBDIR/packages_all_$suite.db");
 }
-rename("packages_descriptions.db.new", "packages_descriptions.db");
-rename("descriptions_packages.db.new", "descriptions_packages.db");
-rename("descriptions.txt.new", "descriptions.txt");
-rename("descriptions.db.new", "descriptions.db");
-rename("package_postfixes.db.new", "package_postfixes.db");
+rename("$DBDIR/packages_descriptions.db.new",
+       "$DBDIR/packages_descriptions.db");
+rename("$DBDIR/descriptions_packages.db.new",
+       "$DBDIR/descriptions_packages.db");
+rename("$DBDIR/descriptions.txt.new", "$DBDIR/descriptions.txt");
+rename("$DBDIR/descriptions.db.new", "$DBDIR/descriptions.db");
+rename("$DBDIR/package_postfixes.db.new", "$DBDIR/package_postfixes.db");