my $has_obsolete_reports;
for my $report ( @$reports ) {
$report->{results} = C4::Reports::Guided::get_results( $report->{id} );
- if ( $report->{savedsql} =~ m|marcxml| ) {
+ if ( $report->{savedsql} =~ m|biblioitems| and $report->{savedsql} =~ m|marcxml| ) {
$report->{seems_obsolete} = 1;
$has_obsolete_reports++;
}
}
$template->param(
- 'saved1' => 1,
- 'savedreports' => $reports,
- 'usecache' => $usecache,
- 'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),
- filters => $filter,
- has_obsolete_reports => $has_obsolete_reports,
+ 'saved1' => 1,
+ 'savedreports' => $reports,
+ 'usecache' => $usecache,
+ 'groups_with_subgroups' => groups_with_subgroups( $group, $subgroup ),
+ filters => $filter,
+ has_obsolete_reports => $has_obsolete_reports,
);
}
'save_successful' => 1,
'reportname' => $reportname,
'id' => $id,
+ 'editsql' => 1,
+ 'sql' => $sql,
+ 'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
+ 'notes' => $notes,
+ 'cache_expiry' => $cache_expiry,
+ 'public' => $public,
+ 'usecache' => $usecache,
);
logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog");
}
'save_successful' => 1,
'reportname' => $name,
'id' => $id,
+ 'editsql' => 1,
+ 'sql' => $sql,
+ 'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
+ 'notes' => $notes,
+ 'cache_expiry' => $cache_expiry,
+ 'public' => $public,
+ 'usecache' => $usecache,
);
}
}
my $offset = 0;
my $report_id = $input->param('reports');
my @sql_params = $input->multi_param('sql_params');
+ my @param_names = $input->multi_param('param_name');
+
# offset algorithm
if ($input->param('page')) {
$offset = ($input->param('page') - 1) * $limit;
my @split = split /<<|>>/,$sql;
my @tmpl_parameters;
my @authval_errors;
+ my %uniq_params;
for(my $i=0;$i<($#split/2);$i++) {
my ($text,$authorised_value) = split /\|/,$split[$i*2+1];
+ my $sep = $authorised_value ? "|" : "";
+ if( defined $uniq_params{$text.$sep.$authorised_value} ){
+ next;
+ } else { $uniq_params{$text.$sep.$authorised_value} = "$i"; }
my $input;
my $labelid;
if ( not defined $authorised_value ) {
};
}
- push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid };
+ push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid, 'name' => $text.$sep.$authorised_value };
}
$template->param('sql' => $sql,
'name' => $name,
'reports' => $report_id,
);
} else {
- # OK, we have parameters, or there are none, we run the report
- # if there were parameters, replace before running
- # split on ??. Each odd (2,4,6,...) entry should be a parameter to fill
- my @split = split /<<|>>/,$sql;
- my @tmpl_parameters;
- for(my $i=0;$i<$#split/2;$i++) {
- my $quoted = $sql_params[$i];
- # if there are special regexp chars, we must \ them
- $split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
- if ($split[$i*2+1] =~ /\|\s*date\s*$/) {
- $quoted = output_pref({ dt => dt_from_string($quoted), dateformat => 'iso', dateonly => 1 }) if $quoted;
- }
- $quoted = C4::Context->dbh->quote($quoted);
- $sql =~ s/<<$split[$i*2+1]>>/$quoted/;
- }
+ my $sql = get_prepped_report( $sql, \@param_names, \@sql_params);
my ( $sth, $errors ) = execute_query( $sql, $offset, $limit, undef, $report_id );
my $total = nb_rows($sql) || 0;
unless ($sth) {
'name' => $name,
'notes' => $notes,
'errors' => defined($errors) ? [ $errors ] : undef,
- 'pagination_bar' => pagination_bar($url, $totpages, $input->param('page')),
+ 'pagination_bar' => pagination_bar($url, $totpages, scalar $input->param('page')),
'unlimited_total' => $total,
'sql_params' => \@sql_params,
+ 'param_names' => \@param_names,
);
}
}
elsif ($phase eq 'Export'){
# export results to tab separated text or CSV
- my $sql = $input->param('sql'); # FIXME: use sql from saved report ID#, not new user-supplied SQL!
- my $format = $input->param('format');
- my $reportname = $input->param('reportname');
+ my $report_id = $input->param('report_id');
+ my $report = get_saved_report($report_id);
+ my $sql = $report->{savedsql};
+ my @param_names = $input->multi_param('param_name');
+ my @sql_params = $input->multi_param('sql_params');
+ my $format = $input->param('format');
+ my $reportname = $input->param('reportname');
my $reportfilename = $reportname ? "$reportname-reportresults.$format" : "reportresults.$format" ;
+
+ $sql = get_prepped_report( $sql, \@param_names, \@sql_params );
my ($sth, $q_errors) = execute_query($sql);
unless ($q_errors and @$q_errors) {
my ( $type, $content );
);
}
-elsif ($phase eq 'Create Compound Report'){
- $template->param( 'savedreports' => get_saved_reports(),
- 'compound' => 1,
- );
-}
-
-elsif ($phase eq 'Save Compound'){
- my $master = $input->param('master');
- my $subreport = $input->param('subreport');
- my ($mastertables,$subtables) = create_compound($master,$subreport);
- $template->param( 'save_compound' => 1,
- master=>$mastertables,
- subsql=>$subtables
- );
-}
-
# pass $sth, get back an array of names for the column headers
sub header_cell_values {
my $sth = shift or return ();
}
}
}
+
+# pass $sth and sql_params, get back an executable query
+sub get_prepped_report {
+ my ($sql, $param_names, $sql_params ) = @_;
+ my %lookup;
+ @lookup{@$param_names} = @$sql_params;
+ my @split = split /<<|>>/,$sql;
+ my @tmpl_parameters;
+ for(my $i=0;$i<$#split/2;$i++) {
+ my $quoted = @$param_names ? $lookup{ $split[$i*2+1] } : @$sql_params[$i];
+ # if there are special regexp chars, we must \ them
+ $split[$i*2+1] =~ s/(\||\?|\.|\*|\(|\)|\%)/\\$1/g;
+ if ($split[$i*2+1] =~ /\|\s*date\s*$/) {
+ $quoted = output_pref({ dt => dt_from_string($quoted), dateformat => 'iso', dateonly => 1 }) if $quoted;
+ }
+ $quoted = C4::Context->dbh->quote($quoted);
+ $sql =~ s/<<$split[$i*2+1]>>/$quoted/;
+ }
+ return $sql;
+}