Fix kohastructure for deletedborrowers

[koha.git] / tags / review.pl

diff --git a/tags/review.pl b/tags/review.pl
index 291e84a..8bdfaa9 100755 (executable)
--- a/tags/review.pl
+++ b/tags/review.pl
@@ -26,29 +26,13 @@ use POSIX;
 use CGI;
 use CGI::Cookie; # need to check cookies before having CGI parse the POST request
 
-use C4::Auth qw(:DEFAULT check_cookie_auth);;
+use C4::Auth qw(:DEFAULT check_cookie_auth);
 use C4::Context;
 use C4::Dates qw(format_date format_date_in_iso);
 # use C4::Koha;
 use C4::Output 3.02 qw(:html :ajax pagination_bar);
 use C4::Debug;
-use C4::Tags 0.02 qw(get_tags get_approval_rows whitelist blacklist is_approved);
-
-sub counts () { 
-       my $query = "SELECT " .
-       #               (SELECT count(*) FROM tags_all     ) as tags_all,
-       #               (SELECT count(*) FROM tags_index   ) as tags_index,
-       "               (SELECT count(*) FROM tags_approval WHERE approved= 1) as approved_count,
-                       (SELECT count(*) FROM tags_approval WHERE approved=-1) as rejected_count,
-                       (SELECT count(*) FROM tags_approval WHERE approved= 0) as unapproved_count
-       ";
-       my $sth = C4::Context->dbh->prepare($query);
-       $sth->execute;
-       my $result = $sth->fetchrow_hashref();
-       $result->{approved_total} = $result->{approved_count} + $result->{rejected_count} + $result->{unapproved_count};
-       $debug and warn "counts returned: " . Dumper $result;
-       return $result;
-}
+use C4::Tags 0.03 qw(get_tags get_approval_rows approval_counts whitelist blacklist is_approved);
 
 my $script_name = "/cgi-bin/koha/tags/review.pl";
 my $needed_flags = { tools => 'moderate_comments' };   # FIXME: replace when more specific permission is created.
@@ -78,7 +62,9 @@ if (is_ajax()) {
        $debug and print STDERR "op: " . Dumper($operator) . "\n";
        my ($tag, $js_reply);
        if ($tag = $input->param('test')) {
-               $js_reply = ( is_approved(          $tag) ? 'success' : 'failure') . "_test('$tag');\n";
+               my $check = is_approved($tag);
+               $js_reply = ( $check >=  1 ? 'success' :
+                                         $check <= -1 ? 'failure' : 'indeterminate' ) . "_test('$tag');\n";
        }
        if ($tag = $input->param('ok')) {
                $js_reply = (   whitelist($operator,$tag) ? 'success' : 'failure') . "_approve('$tag');\n";
@@ -103,7 +89,7 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
 });
 
 my ($op, @errors, @tags);
-$op   = $input->param('op') || 'none';
+$op   = lc($input->param('op')) || 'none';
 @tags = $input->param('tags');
 
 $borrowernumber == 0 and push @errors, {op_zero=>1};
@@ -118,13 +104,15 @@ $borrowernumber == 0 and push @errors, {op_zero=>1};
 } elsif ($op eq 'test'   ) {
        my $tag = $input->param('test');
        push @tags, $tag;
+       my $check = is_approved($tag);
        $template->param(
                test_term => $tag,
-               (is_approved($tag) ? 'verdict_ok' : 'verdict_rej') => 1,
+               ( $check >=  1 ? 'verdict_ok' :
+                 $check <= -1 ? 'verdict_rej' : 'verdict_indeterminate' ) => 1,
        );
 }
 
-my $counts = &counts;
+my $counts = &approval_counts;
 foreach (keys %$counts) {
        $template->param($_ => $counts->{$_});
 }
@@ -209,13 +197,8 @@ if ($filter = $input->param('approved_by')) {      # borrowernumber from link
 $debug and print STDERR "filters: " . Dumper(\%filters);
 my $tagloop = get_approval_rows(\%filters);
 my $qstring = $input->query_string;
-$qstring =~ s/([&;])*\blimit=\d+//;            # remove pagination vars
-# $qstring =~ s/([&;])*\bpage=\d+//;           # remove pagination vars
-# $qstring =~ s/\&[\&]+/&/g;           # compress duplicates
-# $qstring =~ s/;;+/;/g;               # compress duplicates
-# $qstring =~ s/\&;//g;                # remove empties
-# $qstring =~ s/;+$//;         # remove trailing delim
-$qstring =~ s/^;+//;           # remove leading delim
+$qstring =~ s/([&;])*\blimit=\d+//;            # remove pagination var
+$qstring =~ s/^;+//;                                   # remove leading delims
 $qstring = "limit=$pagesize" . ($qstring ? '&amp;' . $qstring : '');
 $debug and print STDERR "number of approval_rows: " . scalar(@$tagloop) . "rows\n";
 (scalar @errors) and $template->param(message_loop=>\@errors);
@@ -236,3 +219,9 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 __END__
 
+=head1 AUTHOR
+
+Joe Atzberger
+atz AT liblime.com
+
+=cut