borr_issues_top : adapting to old_issues changes

[koha.git] / reports / cat_issues_top.pl

diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index 8b2b61c..3235bbe 100755 (executable)
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -26,7 +26,7 @@ use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
 use C4::Circulation;
-use C4::Date;
+use C4::Dates qw/format_date format_date_in_iso/;
 use C4::Members;
 
 =head1 NAME
@@ -61,7 +61,7 @@ my ($template, $borrowernumber, $cookie)
                 debug => 1,
                 });
 $template->param(do_it => $do_it,
-        DHTMLcalendar_dateformat => get_date_format_string_for_DHTMLcalendar(),
+        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         );
 if ($do_it) {
 # Displaying results
@@ -268,7 +268,12 @@ sub calculate {
         }  
         
         my $strsth2;
-        $strsth2 .= "select distinctrow $colfield FROM `issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null";
+        $strsth2 .= "SELECT distinctrow $colfield 
+                     FROM `issues` 
+                     LEFT JOIN borrowers ON borrowers.borrowernumber=issues.borrowernumber 
+                     LEFT JOIN items ON issues.itemnumber=items.itemnumber 
+                     LEFT JOIN biblioitems  ON biblioitems.biblioitemnumber=items.biblioitemnumber 
+                     WHERE returndate is not null";
         if (($column=~/timestamp/) or ($column=~/returndate/)){
             if ($colfilter[1] and ($colfilter[0])){
                 $strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ;
@@ -325,7 +330,13 @@ sub calculate {
 # Processing average loanperiods
     $strcalc .= "SELECT DISTINCT biblio.title, COUNT(biblio.biblionumber) AS RANK, biblio.biblionumber AS ID";
     $strcalc .= " , $colfield " if ($colfield);
-    $strcalc .= " FROM `issues`,borrowers,(items LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN biblio ON (biblio.biblionumber=items.biblionumber) WHERE issues.itemnumber=items.itemnumber AND issues.borrowernumber=borrowers.borrowernumber and returndate is not null";
+    $strcalc .= " FROM `issues` 
+                  LEFT JOIN borrowers ON issues.borrowernumber=borrowers.borrowernumber 
+                  LEFT JOIN (items 
+                         LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber) 
+                    ON items.itemnumber=issues.itemnumber 
+                  LEFT JOIN biblio ON (biblio.biblionumber=items.biblionumber) 
+                  WHERE returndate is not null";
 
     @$filters[0]=~ s/\*/%/g if (@$filters[0]);
     $strcalc .= " AND issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
@@ -352,6 +363,7 @@ sub calculate {
     $strcalc .= ", $colfield" if ($column);
     $strcalc .= " order by RANK DESC";
     $strcalc .= ", $colfield " if ($colfield);
+
 #      my $max;
 #      if (@loopcol) {
 #              $max = $line*@loopcol;