Performance Improvements : Publisher lists and Item Codes becomes free input.

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
index a038f5e..d5c38ee 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/catalogue_stats.tmpl
@@ -64,7 +64,7 @@
                                        <td>Dewey Classification</td>
                                        <td align="center"><input type="radio" name="Line" value="dewey"></td>
                                        <td align="center"><input type="radio" name="Column" value="dewey"></td>
-                                       <td > From <!-- TMPL_VAR NAME="CGIFromDeweyClass" --> To <!-- TMPL_VAR NAME="CGIToDeweyClass" --></td>
+                                       <td > From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
                                </tr>
                                <tr class="hilighted">
                                        <td>&nbsp;</td>
@@ -88,7 +88,7 @@
                                        <td>LoC Classification</td>
                                        <td align="center"><input type="radio" name="Line" value="lccn"></td>
                                        <td align="center"><input type="radio" name="Column" value="lccn"></td>
-                                       <td > From <!-- TMPL_VAR NAME="CGIFromLoCClass" --> To <!-- TMPL_VAR NAME="CGIToLoCClass" --></td>
+                                       <td > From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
                                </tr>
                                <!--TMPL_IF Name="hlghtlccn"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
                                        <td>&nbsp;</td>
@@ -112,7 +112,7 @@
                                        <td>Callnumber</td>
                                        <td align="center"><input type="radio" name="Line" value="items.itemcallnumber"></td>
                                        <td align="center"><input type="radio" name="Column" value="items.itemcallnumber"></td>
-                                       <td>From <!-- TMPL_VAR NAME="CGIFromCoteClass" --> To <!-- TMPL_VAR NAME="CGIToCoteClass" --></td>
+                                       <td>From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
                                </tr>
                                <!--TMPL_IF Name="hlghtcote"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
                                        <td>&nbsp;</td>
@@ -141,7 +141,7 @@
                                <td>Publisher</td>
                                <td align="center"><input type="radio" name="Line" value="publishercode"></td>
                                <td align="center"><input type="radio" name="Column" value="publishercode"></td>
-                               <td><!-- TMPL_VAR NAME="CGIPublisher" --></td>
+                               <td><input type="text" name="Filter" ></td>
                        </tr>
                        <!--TMPL_IF Name="hglghtPY"--><tr class="hilighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
                                <td>Publication Year</td>

diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
index 55d6251..6c3dce3 100755 (executable)
--- a/reports/catalogue_stats.pl
+++ b/reports/catalogue_stats.pl
@@ -106,57 +106,57 @@ if ($do_it) {
        my %labels;
        my $count=0;
        my $req;
-       $req = $dbh->prepare("select distinctrow left(dewey,3) from biblioitems order by dewey");
+       $req = $dbh->prepare("select count(dewey) from biblioitems ");
        $req->execute;
        my $hasdewey;
        my @select;
-       push @select,"";
+#      push @select,"";
        while (my ($value) =$req->fetchrow) {
-               $hasdewey =1 if (($value) and (! $hasdewey));
-               $count++ if (($value) and (! $hasdewey));
-               push @select, $value;
+               $hasdewey =1 if (($value>2) and (! $hasdewey));
+               $count++ if (($value>2) and (! $hasdewey));
+#              push @select, $value;
        }
-       my $CGIdewey=CGI::scrolling_list( -name     => 'Filter',
-                               -id => 'Filter',
-                               -values   => \@select,
-                               -size     => 1,
-                               -multiple => 0 );
+#      my $CGIdewey=CGI::scrolling_list( -name     => 'Filter',
+#                              -id => 'Filter',
+#                              -values   => \@select,
+#                              -size     => 1,
+#                              -multiple => 0 );
        
-       $req = $dbh->prepare( "select distinctrow left(lccn,3) from biblioitems order by lccn");
+       $req = $dbh->prepare( "select count(lccn) from biblioitems ");
        $req->execute;
-       undef @select;
-       push @select,"";
+#      undef @select;
+#      push @select,"";
        my $haslccn;
        my $hlghtlccn;
        while (my ($value) =$req->fetchrow) {
                $hlghtlccn = !($hasdewey);
-               $haslccn =1 if (($value) and (! $haslccn));
+               $haslccn =1 if (($value>2) and (! $haslccn));
                $count++ if (($value) and (! $haslccn));
-               push @select, $value;
+#              push @select, $value;
        }
-       my $CGIlccn=CGI::scrolling_list( -name     => 'Filter',
-                               -id => 'Filter',
-                               -values   => \@select,
-                               -size     => 1,
-                               -multiple => 0 );
+#      my $CGIlccn=CGI::scrolling_list( -name     => 'Filter',
+#                              -id => 'Filter',
+#                              -values   => \@select,
+#                              -size     => 1,
+#                              -multiple => 0 );
        
-       $req = $dbh->prepare("select distinctrow left(itemcallnumber,5) from items order by itemcallnumber");
+       $req = $dbh->prepare("select count(itemcallnumber) from items");
        $req->execute;
-       undef @select;
-       push @select,"";
+#      undef @select;
+#      push @select,"";
        my $hascote;
        my $hlghtcote;
        while (my ($value) =$req->fetchrow) {
-               $hascote =1 if (($value) and (! $hascote));
+               $hascote =1 if (($value>2) and (! $hascote));
                $count++ if (($value) and (! $hascote));
                $hlghtcote = (($hasdewey) and ($haslccn)) or (!($hasdewey) and !($haslccn));
-               push @select, $value;
+#              push @select, $value;
        }
-       my $CGIcote=CGI::scrolling_list( -name     => 'Filter',
-                               -id => 'Filter',
-                               -values   => \@select,
-                               -size     => 1,
-                               -multiple => 0 );
+#      my $CGIcote=CGI::scrolling_list( -name     => 'Filter',
+#                              -id => 'Filter',
+#                              -values   => \@select,
+#                              -size     => 1,
+#                              -multiple => 0 );
        $count++;
        my $hglghtDT =$count % 2;
 #      warn "highlightDT ".$hglghtDT;
@@ -187,18 +187,18 @@ if ($do_it) {
                                -size     => 1,
                                -multiple => 0 );
        
-       $req = $dbh->prepare("select distinctrow left(publishercode,75) from biblioitems order by publishercode");
-       $req->execute;
-       undef @select;
-       push @select,"";
-       while (my ($value) =$req->fetchrow) {
-               push @select, $value;
-       }
-       my $CGIpublisher=CGI::scrolling_list( -name     => 'Filter',
-                               -id => 'Filter',
-                               -values   => \@select,
-                               -size     => 1,
-                               -multiple => 0 );
+#      $req = $dbh->prepare("select distinctrow left(publishercode,75) from biblioitems order by publishercode");
+#      $req->execute;
+#      undef @select;
+#      push @select,"";
+#      while (my ($value) =$req->fetchrow) {
+#              push @select, $value;
+#      }
+#      my $CGIpublisher=CGI::scrolling_list( -name     => 'Filter',
+#                              -id => 'Filter',
+#                              -values   => \@select,
+#                              -size     => 1,
+#                              -multiple => 0 );
 
        undef @select;
        push @select,"";
@@ -247,12 +247,12 @@ if ($do_it) {
                                -multiple => 0 );
        
        $template->param(hasdewey=>$hasdewey,
-                                       CGIFromDeweyClass => $CGIdewey,
-                                       CGIToDeweyClass => $CGIdewey,
+#                                      CGIFromDeweyClass => $CGIdewey,
+#                                      CGIToDeweyClass => $CGIdewey,
                                        haslccn=> $haslccn,
                                        hlghtlccn => $hlghtlccn,
-                                       CGIFromLoCClass => $CGIlccn,
-                                       CGIToLoCClass => $CGIlccn,
+#                                      CGIFromLoCClass => $CGIlccn,
+#                                      CGIToLoCClass => $CGIlccn,
                                        hascote=> $hascote,
                                        hlghtcote => $hlghtcote,
                                        hglghtDT => $hglghtDT,
@@ -260,12 +260,12 @@ if ($do_it) {
                                        hglghtPY => $hglghtPY,
                                        hglghtHB => $hglghtHB,
                                        hglghtLOC => $hglghtLOC,
-                                       CGIFromCoteClass => $CGIcote,
-                                       CGIToCoteClass => $CGIcote,
+#                                      CGIFromCoteClass => $CGIcote,
+#                                      CGIToCoteClass => $CGIcote,
                                        CGIItemType => $CGIitemtype,
 #                                      CGIFromPublicationYear => $CGIpublicationyear,
 #                                      CGIToPublicationYear => $CGIpublicationyear,
-                                       CGIPublisher => $CGIpublisher,
+#                                      CGIPublisher => $CGIpublisher,
                                        CGIBranch => $CGIbranch,
                                        CGILocation => $CGIlocation,
                                        CGIextChoice => $CGIextChoice,