- $strcalc .= " 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";
-
- @$filters[0]=~ s/\*/%/g if (@$filters[0]);
- $strcalc .= " AND issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
- @$filters[1]=~ s/\*/%/g if (@$filters[1]);
- $strcalc .= " AND issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] );
- @$filters[2]=~ s/\*/%/g if (@$filters[2]);
- $strcalc .= " AND issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] );
- @$filters[3]=~ s/\*/%/g if (@$filters[3]);
- $strcalc .= " AND issues.returndate < '" . @$filters[3] ."'" if ( @$filters[3] );
- @$filters[4]=~ s/\*/%/g if (@$filters[4]);
- $strcalc .= " AND issues.branchcode like '" . @$filters[4] ."'" if ( @$filters[4] );
- @$filters[5]=~ s/\*/%/g if (@$filters[5]);
- $strcalc .= " AND biblioitems.itemtype like '" . @$filters[5] ."'" if ( @$filters[5] );
- @$filters[6]=~ s/\*/%/g if (@$filters[6]);
- $strcalc .= " AND borrowers.categorycode like '" . @$filters[6] ."'" if ( @$filters[6] );
- @$filters[7]=~ s/\*/%/g if (@$filters[7]);
- $strcalc .= " AND dayname(issues.timestamp) like '" . @$filters[7]."'" if (@$filters[7]);
- @$filters[8]=~ s/\*/%/g if (@$filters[8]);
- $strcalc .= " AND monthname(issues.timestamp) like '" . @$filters[8]."'" if (@$filters[8]);
- @$filters[9]=~ s/\*/%/g if (@$filters[9]);
- $strcalc .= " AND year(issues.timestamp) like '" . @$filters[9] ."'" if ( @$filters[9] );
-
- $strcalc .= " group by borrowers.borrowernumber";
+ $strcalc .= " FROM `old_issues`
+ LEFT JOIN borrowers USING(borrowernumber)
+ LEFT JOIN items USING(itemnumber)
+ LEFT JOIN biblioitems USING(biblioitemnumber)
+ WHERE old_issues.borrowernumber IS NOT NULL
+ ";
+ my @filterterms = (
+ 'old_issues.issuedate >',
+ 'old_issues.issuedate <',
+ 'old_issues.returndate >',
+ 'old_issues.returndate <',
+ 'old_issues.branchcode like',
+ 'biblioitems.itemtype like',
+ 'borrowers.categorycode like',
+ );
+ foreach ((@$filters)[0..9]) {
+ my $term = shift @filterterms; # go through both arrays in step
+ ($_) or next;
+ s/\*/%/g;
+ $strcalc .= " AND $term '$_' ";
+ }
+ $strcalc .= " GROUP BY borrowers.borrowernumber";