X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI%2FPkgreport.pm;h=01e661f30d987fff3cee189cab1803e6c1a4607d;hb=e09c4d3c9adb00e42d9af5daf9b1d5dd04264e6b;hp=beba95a89694f563b6085fccf20664d66ee9b800;hpb=f492418a6fe1653c67d9f26428da65f1b584cee6;p=debbugs.git

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index beba95a..01e661f 100644
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -28,7 +28,7 @@ None known.
 use warnings;
 use strict;
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
 
 use IO::Scalar;
 use Params::Validate qw(validate_with :types);
@@ -41,6 +41,7 @@ use Debbugs::Bugs qw(bug_filter);
 use Debbugs::Packages qw(:mapping);
 
 use Debbugs::Text qw(:templates);
+use Encode qw(decode_utf8);
 
 use POSIX qw(strftime);
 
@@ -51,13 +52,9 @@ BEGIN{
 
      @EXPORT = ();
      %EXPORT_TAGS = (html => [qw(short_bug_status_html pkg_htmlizebugs),
-			      qw(pkg_javascript),
-			      qw(pkg_htmlselectyesno pkg_htmlselectsuite),
-			      qw(buglinklist pkg_htmlselectarch)
 			     ],
-		     misc => [qw(generate_package_info make_order_list),
-			      qw(myurl),
-			      qw(get_bug_order_index determine_ordering),
+		     misc => [qw(generate_package_info),
+			      qw(determine_ordering),
 			     ],
 		    );
      @EXPORT_OK = (qw());
@@ -78,12 +75,15 @@ sub generate_package_info{
 			       spec  => {binary => {type => BOOLEAN,
 						    default => 1,
 						   },
-					 package => {type => SCALAR|ARRAYREF,
+					 package => {type => SCALAR,#|ARRAYREF,
 						    },
 					 options => {type => HASHREF,
 						    },
 					 bugs    => {type => ARRAYREF,
 						    },
+					 schema => {type => OBJECT,
+						    optional => 1,
+						   },
 					},
 			      );
 
@@ -94,23 +94,30 @@ sub generate_package_info{
 
      my %pkgsrc = %{getpkgsrc()};
      my $srcforpkg = $package;
-     if ($param{binary} and exists $pkgsrc{$package}
-	 and defined $pkgsrc{$package}) {
-	  $srcforpkg = $pkgsrc{$package};
+     if ($param{binary}) {
+	 $srcforpkg =
+	     binary_to_source(source_only => 1,
+			      scalar_only => 1,
+			      binary => $package,
+			      hash_slice(%param,qw(schema)),
+			     );
      }
 
      my $showpkg = html_escape($package);
-     my $maintainers = getmaintainers();
-     my $maint = $maintainers->{$srcforpkg};
-     if (defined $maint) {
+     my @maint = package_maintainer($param{binary}?'binary':'source',
+				    $package
+				   );
+     if (@maint) {
 	  print {$output} '<p>';
-	  print {$output} (($maint =~ /,/)? "Maintainer for $showpkg is "
+	  print {$output} (@maint > 1? "Maintainer for $showpkg is "
 			   : "Maintainers for $showpkg are ") .
-				package_links(maint => $maint);
+				package_links(maintainer => \@maint);
 	  print {$output} ".</p>\n";
      }
      else {
-	  print {$output} "<p>No maintainer for $showpkg. Please do not report new bugs against this package.</p>\n";
+	  print {$output} "<p>There is no maintainer for $showpkg. ".
+	       "This means that this package no longer exists (or never existed). ".
+		   "Please do not report new bugs against this package. </p>\n";
      }
      my @pkgs = getsrcpkgs($srcforpkg);
      @pkgs = grep( !/^\Q$package\E$/, @pkgs );
@@ -129,18 +136,20 @@ sub generate_package_info{
      my @references;
      my $pseudodesc = getpseudodesc();
      if ($package and defined($pseudodesc) and exists($pseudodesc->{$package})) {
-	  push @references, "to the <a href=\"http://$config{web_domain}/pseudo-packages$config{html_suffix}\">".
+	  push @references, "to the <a href=\"$config{web_domain}/pseudo-packages$config{html_suffix}\">".
 	       "list of other pseudo-packages</a>";
      }
      else {
 	  if ($package and defined $config{package_pages} and length $config{package_pages}) {
 	       push @references, sprintf "to the <a href=\"%s\">%s package page</a>",
-		    html_escape("http://$config{package_pages}/$package"), html_escape("$package");
+		    html_escape("$config{package_pages}/$package"), html_escape("$package");
 	  }
-	  if (defined $config{subscription_domain} and
-	      length $config{subscription_domain}) {
+	  if (defined $config{package_tracking_domain} and
+	      length $config{package_tracking_domain}) {
 	       my $ptslink = $param{binary} ? $srcforpkg : $package;
-	       push @references, q(to the <a href="http://).html_escape("$config{subscription_domain}/$ptslink").q(">Package Tracking System</a>);
+	       # the pts only wants the source, and doesn't care about src: (#566089)
+	       $ptslink =~ s/^src://;
+	       push @references, q(to the <a href=").html_escape("$config{package_tracking_domain}/$ptslink").q(">Package Tracking System</a>);
 	  }
 	  # Only output this if the source listing is non-trivial.
 	  if ($param{binary} and $srcforpkg) {
@@ -155,17 +164,12 @@ sub generate_package_info{
 	  $references[$#references] = "or $references[$#references]" if @references > 1;
 	  print {$output} "<p>You might like to refer ", join(", ", @references), ".</p>\n";
      }
-     if (defined $maint) {
+     if (@maint) {
 	  print {$output} "<p>If you find a bug not listed here, please\n";
 	  printf {$output} "<a href=\"%s\">report it</a>.</p>\n",
-	       html_escape("http://$config{web_domain}/Reporting$config{html_suffix}");
-     }
-     if (not defined $maint and not @{$param{bugs}}) {
-	  print {$output} "<p>There is no record of the " . html_escape($package) .
-	       ($param{binary} ? " package" : " source package") .
-		    ", and no bugs have been filed against it.</p>";
+	       html_escape("$config{web_domain}/Reporting$config{html_suffix}");
      }
-     return $output_scalar;
+     return decode_utf8($output_scalar);
 }
 
 
@@ -222,7 +226,7 @@ sub short_bug_status_html {
      if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
 	  for my $b (@blockedby) {
 	       my %s = %{get_bug_status($b)};
-	       next if $s{"pending"} eq 'fixed' || length $s{done};
+	       next if (defined $s{pending} and $s{pending} eq 'fixed') or (defined $s{done} and length $s{done});
 	       push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s};
 	  }
      }
@@ -232,7 +236,7 @@ sub short_bug_status_html {
      if (@blocks && $status{"pending"} ne 'fixed' && ! length($status{done})) {
 	  for my $b (@blocks) {
 	       my %s = %{get_bug_status($b)};
-	       next if $s{"pending"} eq 'fixed' || length $s{done};
+	       next if (defined $s{pending} and $s{pending} eq 'fixed') or (defined $s{done} and length $s{done});
 	       push @{$status{blocks_array}}, {bug_num => $b, subject => $s{subject}, status => \%s};
 	  }
      }
@@ -298,6 +302,9 @@ sub pkg_htmlizebugs {
 					  dist     => {type => SCALAR,
 						       optional => 1,
 						      },
+					  schema   => {type => OBJECT,
+						       optional => 1,
+						      },
 					 }
 			      );
      my @bugs = @{$param{bugs}};
@@ -307,8 +314,6 @@ sub pkg_htmlizebugs {
      my $header = '';
      my $footer = "<h2 class=\"outstanding\">Summary</h2>\n";
 
-     my @dummy = ($gRemoveAge); #, @gSeverityList, @gSeverityDisplay);  #, $gHTMLExpireNote);
-
      if (@bugs == 0) {
 	  return "<HR><H2>No reports found!</H2></HR>\n";
      }
@@ -349,28 +354,30 @@ sub pkg_htmlizebugs {
 	  push @{$exclude{$key}}, split /\s*,\s*/, $value;
      }
 
-     foreach my $bug (@bugs) {
-	  my %status = %{get_bug_status(bug=>$bug,
-					(exists $param{dist}?(dist => $param{dist}):()),
-					bugusertags => $param{bugusertags},
-					(exists $param{version}?(version => $param{version}):()),
-					(exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
-				       )};
-	  next unless %status;
-	  next if bug_filter(bug => $bug,
-			     status => \%status,
-			     repeat_merged => $param{repeatmerged},
-			     seen_merged => \%seenmerged,
-			     (keys %include ? (include => \%include):()),
-			     (keys %exclude ? (exclude => \%exclude):()),
-			    );
-
-	  my $html = "<li>"; #<a href=\"%s\">#%d: %s</a>\n<br>",
-	       #bug_url($bug), $bug, html_escape($status{subject});
-	  $html .= short_bug_status_html(status  => \%status,
-					 options => $param{options},
-					) . "\n";
-	  push @status, [ $bug, \%status, $html ];
+     my $binary_to_source_cache = {};
+     my $statuses =
+	 get_bug_statuses(bug => \@bugs,
+			  hash_slice(%param,
+			   qw(dist version schema bugusertags),
+			  ),
+			  (exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
+			  binary_to_source_cache => $binary_to_source_cache,
+			 );
+     for my $bug (sort {$a <=> $b} keys %{$statuses}) {
+	 next unless %{$statuses->{$bug}};
+	 next if bug_filter(bug => $bug,
+			    status => $statuses->{$bug},
+			    repeat_merged => $param{repeatmerged},
+			    seen_merged => \%seenmerged,
+			    (keys %include ? (include => \%include):()),
+			    (keys %exclude ? (exclude => \%exclude):()),
+			   );
+
+	 my $html = "<li>";	#<a href=\"%s\">#%d: %s</a>\n<br>",
+	 $html .= short_bug_status_html(status  => $statuses->{$bug},
+					options => $param{options},
+				       ) . "\n";
+	 push @status, [ $bug, $statuses->{$bug}, $html ];
      }
      if ($param{bug_order} eq 'age') {
 	  # MWHAHAHAHA
@@ -458,112 +465,59 @@ sub pkg_htmlizebugs {
      return $result;
 }
 
-sub pkg_javascript {
-     return fill_in_template(template=>'cgi/pkgreport_javascript',
-			    );
-}
-
-sub pkg_htmlselectyesno {
-     my ($name, $n, $y, $default) = @_;
-     return sprintf('<select name="%s"><option value=no%s>%s</option><option value=yes%s>%s</option></select>', $name, ($default ? "" : " selected"), $n, ($default ? " selected" : ""), $y);
-}
-
-sub pkg_htmlselectsuite {
-     my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2];
-     my @suites = ("stable", "testing", "unstable", "experimental");
-     my %suiteaka = ("stable", "etch", "testing", "lenny", "unstable", "sid");
-     my $defaultsuite = "unstable";
-
-     my $result = sprintf '<select name=dist id="%s">', $id;
-     for my $s (@suites) {
-	  $result .= sprintf '<option value="%s"%s>%s%s</option>',
-	       $s, ($defaultsuite eq $s ? " selected" : ""),
-		    $s, (defined $suiteaka{$s} ? " (" . $suiteaka{$s} . ")" : "");
-     }
-     $result .= '</select>';
-     return $result;
-}
-
-sub pkg_htmlselectarch {
-     my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2];
-     my @arches = qw(alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc);
-
-     my $result = sprintf '<select name=arch id="%s">', $id;
-     $result .= '<option value="any">any architecture</option>';
-     for my $a (@arches) {
-	  $result .= sprintf '<option value="%s">%s</option>', $a, $a;
-     }
-     $result .= '</select>';
-     return $result;
-}
-
-sub myurl {
-     my %param = @_;
-     return html_escape(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
-				qw(archive repeatmerged mindays maxdays),
-				qw(version dist arch package src tag maint submitter)
-			       )
-		       );
-}
-
-sub make_order_list {
-     my $vfull = shift;
-     my @x = ();
-
-     if ($vfull =~ m/^([^:]+):(.*)$/) {
-	  my $v = $1;
-	  for my $vv (split /,/, $2) {
-	       push @x, "$v=$vv";
-	  }
-     }
-     else {
-	  for my $v (split /,/, $vfull) {
-	       next unless $v =~ m/.=./;
-	       push @x, $v;
-	  }
-     }
-     push @x, "";		# catch all
-     return @x;
+sub parse_order_statement_into_boolean {
+    my ($statement,$status,$tags) = @_;
+
+    if (not defined $tags) {
+        $tags = {map { $_, 1 } split / /, $status->{"tags"}
+                }
+            if defined $status->{"tags"};
+
+    }
+    # replace all + with &&
+    $statement =~ s/\+/&&/g;
+    # replace all , with ||
+    $statement =~ s/,/||/g;
+    $statement =~ s{([^\&\|\=]+) # field
+                    =
+                    ([^\&\|\=]+) # value
+              }{
+                  my $ok = 0;
+                  if ($1 eq 'tag') {
+                      $ok = 1 if defined $tags->{$2};
+                  } else {
+                      $ok = 1 if defined $status->{$1} and
+                          $status->{$1} eq $2;
+                  }
+                  $ok;
+              }exg;
+    # check that the parsed statement is just valid boolean statements
+    if ($statement =~ /^([01\(\)\&\|]+)$/) {
+        return eval "$1";
+    } else {
+        # this is an invalid boolean statement
+        return 0;
+    }
 }
 
 sub get_bug_order_index {
      my $order = shift;
      my $status = shift;
-     my $pos = -1;
-
-     my %tags = ();
-     %tags = map { $_, 1 } split / /, $status->{"tags"}
-	  if defined $status->{"tags"};
-
+     my $pos = 0;
+     my $tags = {map { $_, 1 } split / /, $status->{"tags"}
+                }
+         if defined $status->{"tags"};
      for my $el (@${order}) {
-	  $pos++;
-	  my $match = 1;
-	  for my $item (split /[+]/, $el) {
-	       my ($f, $v) = split /=/, $item, 2;
-	       next unless (defined $f and defined $v);
-	       my $isokay = 0;
-	       $isokay = 1 if (defined $status->{$f} and $v eq $status->{$f});
-	       $isokay = 1 if ($f eq "tag" && defined $tags{$v});
-	       unless ($isokay) {
-		    $match = 0;
-		    last;
-	       }
-	  }
-	  if ($match) {
-	       return $pos;
-	       last;
-	  }
+         if (not length $el or
+             parse_order_statement_into_boolean($el,$status,$tags)
+            ) {
+             return $pos;
+         }
+         $pos++;
      }
-     return $pos + 1;
-}
-
-sub buglinklist {
-     my ($prefix, $infix, @els) = @_;
-     return '' if not @els;
-     return $prefix . bug_linklist($infix,'submitter',@els);
+     return $pos;
 }
 
-
 # sets: my @names; my @prior; my @title; my @order;
 
 sub determine_ordering {