From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Thu, 9 Feb 2006 17:48:17 +0000 (+0000)
Subject: Begin implementing virtual package support.
X-Git-Tag: switch-to-templates~148
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=dc9512b1309f4c8c6bd1171b543183e8ac8b2115;p=deb%2Fpackages.git

Begin implementing virtual package support.
search_package is already working, show_package needs more work
---

diff --git a/bin/parse-packages b/bin/parse-packages
index 817f547..7de51b6 100755
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -48,6 +48,7 @@ $/ = "";
 for my $archive (@ARCHIVES) {
     for my $suite (@SUITES) {
 
+	my %virtual_packages = ();
 	print "Reading $archive/$suite...\n";
 	my %packages_all_db;
 	tie %packages_all_db, "DB_File", "$DBDIR/packages_all_$suite.db.new",
@@ -69,6 +70,11 @@ 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{$_}{$data{'package'}}++;
+		    }
+		}
 		$package_names{$data{'package'}} = 1;
 		my $src = $data{'package'};
 		my $src_version = '';
@@ -122,6 +128,11 @@ for my $archive (@ARCHIVES) {
 			= $data;
 	}
 
+	foreach (keys %virtual_packages) {
+	    my @provided_by = keys %{$virtual_packages{$_}};
+	    $packages_small{$_} .= "$archive $suite virtual - - - - @provided_by\000";
+	}
+
 	untie %packages_all_db;
     }
 }
diff --git a/cgi-bin/search_packages.pl b/cgi-bin/search_packages.pl
index 516d36d..3572915 100755
--- a/cgi-bin/search_packages.pl
+++ b/cgi-bin/search_packages.pl
@@ -252,7 +252,7 @@ print_errors();
 print_hints();
 print_debug();
 if (@results) {
-    my (%pkgs, %subsect, %sect, %desc, %binaries);
+    my (%pkgs, %subsect, %sect, %desc, %binaries, %provided_by);
 
     unless ($opts{searchon} eq 'sourcenames') {
 	foreach (@results) {
@@ -260,25 +260,31 @@ if (@results) {
 		$priority, $version, $desc) = @$_;
 	
 	    my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint
-	    $pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1;
-	    $subsect{$pkg}{$suite}{$archive}{$version} = $subsection;
-	    $sect{$pkg}{$suite}{$archive}{$version} = $section
-		unless $section eq 'main';
-	    
-	    $desc{$pkg}{$suite}{$archive}{$version} = $desc;
+	    if ($arch ne 'virtual') {
+		$pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1;
+		$subsect{$pkg}{$suite}{$archive}{$version} = $subsection;
+		$sect{$pkg}{$suite}{$archive}{$version} = $section
+		    unless $section eq 'main';
+		
+		$desc{$pkg}{$suite}{$archive}{$version} = $desc;
+	    } else {
+		$provided_by{$pkg}{$suite}{$archive} = [ split /\s+/, $desc ];
+	    }
 	}
 
+my @pkgs = sort(keys %pkgs, keys %provided_by);
 	if ($opts{format} eq 'html') {
-	    my ($start, $end) = multipageheader( $input, scalar keys %pkgs, \%opts );
+	    my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts );
 	    my $count = 0;
 	
-	    foreach my $pkg (sort keys %pkgs) {
+	    foreach my $pkg (@pkgs) {
 		$count++;
 		next if $count < $start or $count > $end;
 		printf "<h3>Package %s</h3>\n", $pkg;
 		print "<ul>\n";
 		foreach my $suite (@SUITES) {
 		    foreach my $archive (@ARCHIVES) {
+			my $path = $suite.(($archive ne 'us')?"/$archive":'');
 			if (exists $pkgs{$pkg}{$suite}{$archive}) {
 			    my @versions = version_sort keys %{$pkgs{$pkg}{$suite}{$archive}};
 			    my $origin_str = "";
@@ -286,14 +292,23 @@ if (@results) {
 				$origin_str .= " [<span style=\"color:red\">$sect{$pkg}{$suite}{$versions[0]}</span>]";
 			    }
 			    printf "<li><a href=\"$ROOT/%s/%s\">%s</a> (%s): %s   %s\n",
-			    $suite.(($archive ne 'us')?"/$archive":''), $pkg, $suite.(($archive ne 'us')?"/$archive":''), $subsect{$pkg}{$suite}{$archive}{$versions[0]},
+			    $path, $pkg, $path, $subsect{$pkg}{$suite}{$archive}{$versions[0]},
 			    $desc{$pkg}{$suite}{$archive}{$versions[0]}, $origin_str;
 			    
 			    foreach my $v (@versions) {
 				printf "<br>%s: %s\n",
 				$v, join (" ", (sort keys %{$pkgs{$pkg}{$suite}{$archive}{$v}}) );
 			    }
+			    if (my $provided_by =  $provided_by{$pkg}{$suite}{$archive}) {
+				print '<br>also provided by: ',
+				join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$provided_by);
+			    }
 			    print "</li>\n";
+			} elsif (my $provided_by =  $provided_by{$pkg}{$suite}{$archive}) {
+			    printf "<li><a href=\"$ROOT/%s/%s\">%s</a>: Virtual package<br>",
+			    $path, $pkg, $path;
+			    print 'provided by: ',
+			    join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$provided_by);
 			}
 		    }
 		}
diff --git a/cgi-bin/show_package.pl b/cgi-bin/show_package.pl
index 5e7cfe2..2ec4616 100755
--- a/cgi-bin/show_package.pl
+++ b/cgi-bin/show_package.pl
@@ -154,13 +154,17 @@ unless (@Packages::CGI::fatal_errors) {
 		for my $entry (@results) {
 		    debug( join(":", @$entry), 1 );
 		    my (undef, $archive, undef, $arch, $section, $subsection,
-			$priority, $version) = @$entry;
+			$priority, $version, @provided_by) = @$entry;
 		    
-		    my %data = split /\000/, $packages_all{"$pkg $arch $version"};
-		    $data{package} = $pkg;
-		    $data{architecture} = $arch;
-		    $data{version} = $version;
-		    $page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+		    if ($arch ne 'virtual') {
+			my %data = split /\000/, $packages_all{"$pkg $arch $version"};
+			$data{package} = $pkg;
+			$data{architecture} = $arch;
+			$data{version} = $version;
+			$page->merge_package(\%data) or debug( "Merging $pkg $arch $version FAILED", 2 );
+		    } else {
+			$page->add_provided_by(\@provided_by);
+		    }
 		}
 
 		$version = $page->{newest};
diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 47a0f6b..e550fcc 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -81,6 +81,19 @@ sub add_src_data {
     return 1;
 }
 
+sub add_provided_by {
+    my ($self, $provided_by) = @_;
+
+    $self->{provided_by} ||= [];
+    push @{$self->{provided_by}}, @$provided_by;
+}
+
+sub is_virutal {
+    my ($self) = @_;
+
+    return (exists($self->{provided_by}) && !exists($self->{versions}));
+}
+
 our @TAKE_NEWEST = qw( description essential priority section subsection tag
 		       archive source source-version );
 our @STORE_ALL = qw( version source source-version installed-size size
diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 37f3996..b616f6f 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -346,8 +346,9 @@ sub read_entry_all {
 	my @data = split ( /\s/o, $_, 8 );
 	debug( "Considering entry ".join( ':', @data), 2);
 	if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]}
-	    && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all')
-	    && $opts->{h_sections}{$data[3]}) {
+	    && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all'
+		|| $data[2] eq 'virtual')
+	    && ($opts->{h_sections}{$data[3]} || $data[3] eq '-')) {
 	    debug( "Using entry ".join( ':', @data), 2);
 	    push @$results, [ $key, @data ];
 	} else {