|
Lines 210-217
sub calculate {
Link Here
|
| 210 |
} |
210 |
} |
| 211 |
$column = "borrowers.".$column if $column=~/categorycode/; |
211 |
$column = "borrowers.".$column if $column=~/categorycode/; |
| 212 |
my @colfilter ; |
212 |
my @colfilter ; |
| 213 |
$colfilter[0] = @$filters[0] if ($column =~ /timestamp/ ) ; |
213 |
$colfilter[0] = @$filters[0] if ($column =~ /issuedate/ ) ; |
| 214 |
$colfilter[1] = @$filters[1] if ($column =~ /timestamp/ ) ; |
214 |
$colfilter[1] = @$filters[1] if ($column =~ /issuedate/ ) ; |
| 215 |
$colfilter[0] = @$filters[2] if ($column =~ /returndate/ ) ; |
215 |
$colfilter[0] = @$filters[2] if ($column =~ /returndate/ ) ; |
| 216 |
$colfilter[1] = @$filters[3] if ($column =~ /returndate/ ) ; |
216 |
$colfilter[1] = @$filters[3] if ($column =~ /returndate/ ) ; |
| 217 |
$colfilter[0] = @$filters[4] if ($column =~ /branch/ ) ; |
217 |
$colfilter[0] = @$filters[4] if ($column =~ /branch/ ) ; |
|
Lines 251-257
sub calculate {
Link Here
|
| 251 |
LEFT JOIN items ON old_issues.itemnumber=items.itemnumber |
251 |
LEFT JOIN items ON old_issues.itemnumber=items.itemnumber |
| 252 |
LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber |
252 |
LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=items.biblioitemnumber |
| 253 |
WHERE 1"; |
253 |
WHERE 1"; |
| 254 |
if (($column=~/timestamp/) or ($column=~/returndate/)){ |
254 |
if (($column=~/issuedate/) or ($column=~/returndate/)){ |
| 255 |
if ($colfilter[1] and ($colfilter[0])){ |
255 |
if ($colfilter[1] and ($colfilter[0])){ |
| 256 |
$strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ; |
256 |
$strsth2 .= " and $column between '$colfilter[0]' and '$colfilter[1]' " ; |
| 257 |
} elsif ($colfilter[1]) { |
257 |
} elsif ($colfilter[1]) { |
|
Lines 314-322
sub calculate {
Link Here
|
| 314 |
WHERE 1"; |
314 |
WHERE 1"; |
| 315 |
|
315 |
|
| 316 |
@$filters[0]=~ s/\*/%/g if (@$filters[0]); |
316 |
@$filters[0]=~ s/\*/%/g if (@$filters[0]); |
| 317 |
$strcalc .= " AND old_issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] ); |
317 |
$strcalc .= " AND old_issues.issuedate > '" . @$filters[0] ."'" if ( @$filters[0] ); |
| 318 |
@$filters[1]=~ s/\*/%/g if (@$filters[1]); |
318 |
@$filters[1]=~ s/\*/%/g if (@$filters[1]); |
| 319 |
$strcalc .= " AND old_issues.timestamp < '" . @$filters[1] ."'" if ( @$filters[1] ); |
319 |
$strcalc .= " AND old_issues.issuedate < '" . @$filters[1] ."'" if ( @$filters[1] ); |
| 320 |
@$filters[2]=~ s/\*/%/g if (@$filters[2]); |
320 |
@$filters[2]=~ s/\*/%/g if (@$filters[2]); |
| 321 |
$strcalc .= " AND old_issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] ); |
321 |
$strcalc .= " AND old_issues.returndate > '" . @$filters[2] ."'" if ( @$filters[2] ); |
| 322 |
@$filters[3]=~ s/\*/%/g if (@$filters[3]); |
322 |
@$filters[3]=~ s/\*/%/g if (@$filters[3]); |