[#87043888] Patrons who haven't checked out report timing out

WHERE clause needed to be added to SQL subselect.
liblime · Feb 17, 2015 · 24134ac · 24134ac
1 parent ed73235
commit 24134ac
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cgi/reports/borrowers_out.pl b/cgi/reports/borrowers_out.pl
@@ -236,26 +236,26 @@ sub calculate {
     @$filters[0]=~ s/\*/%/g if (@$filters[0]);
     $strcalc = AddCondition( $strcalc, "borrowers.categorycode", @$filters[0], 0 ) if ( @$filters[0] );
     if (@$filters[1]){
-        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> @$filters[1] ";
+        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues WHERE borrowernumber = borrowers.borrowernumber AND old_issues.timestamp > @$filters[1] ";
 #        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> ".format_date_in_iso(@$filters[1]));
-        $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
+        $strcalc .= " AND borrowers.borrowernumber NOT IN ($strqueryfilter)";
 
 # 		$queryfilter->execute(@$filters[1]);
 # 		while (my ($borrowernumber)=$queryfilter->fetchrow){
 # 			$strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
 # 		}
     } else {
-        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues ";
+        my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues WHERE borrowernumber = borrowers.borrowernumber";
 #        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues ");
 #        $queryfilter->execute;
-        $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
+        $strcalc .= " AND borrowers.borrowernumber NOT IN ($strqueryfilter)";
 # 		while (my ($borrowernumber)=$queryfilter->fetchrow){
 # 			$strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
 # 		}
     }
-    $strcalc .= " group by borrowers.borrowernumber";
+    $strcalc .= " GROUP BY borrowers.borrowernumber";
     $strcalc .= ", $colfield" if ($column);
-    $strcalc .= " order by $colfield " if ($colfield);
+    $strcalc .= " ORDER BY $colfield " if ($colfield);
     my $max;
     if ($line) {
         if (@loopcol) {