Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 10853: All existing routing to get a CSV should return a MARC csv

Browse source 
Test plan:
Verify that existing CSV lists list MARC CSV profiles and not SQL CSV
profiles.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Jonathan Druart 2013-09-23 14:58:58 +02:00 committed by Galen Charlton
parent 06c5d812bd
commit 5ad6350616
7 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
C4/Csv.pm
View file

@ -98,12 +98,17 @@ sub GetMarcFieldsForCsv {
# Returns informations aboout csv profiles suitable for html templates
sub GetCsvProfilesLoop {
# List of existing profiles
my ( $type ) = @_;
# List of existing profiles
my $dbh = C4::Context->dbh;
my $sth;
my $query = "SELECT export_format_id, profile FROM export_format";
if ( $type ) {
$query .= " WHERE type = ?";
}
$sth = $dbh->prepare($query);
$sth->execute();
$sth->execute( $type ? $type : () );
return $sth->fetchall_arrayref({});
}

2
C4/VirtualShelves/Page.pm
View file

@ -458,7 +458,7 @@ sub shelfpage {
shelvesloopall => [ ( @shelvesloop, @shelveslooppriv ) ],
numberCanManage => $numberCanManage,
"BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
csv_profiles => GetCsvProfilesLoop()
csv_profiles => GetCsvProfilesLoop('marc')
);
if ( $shelfnumber
or $shelves

2
basket/basket.pl
View file

@ -121,7 +121,7 @@ my $resultsarray = \@results;
$template->param(
BIBLIO_RESULTS => $resultsarray,
csv_profiles => GetCsvProfilesLoop(),
csv_profiles => GetCsvProfilesLoop('marc'),
bib_list => $bib_list,
);

2
basket/downloadcart.pl
View file

@ -89,7 +89,7 @@ if ($bib_list && $format) {
print $output;
} else {
$template->param(csv_profiles => GetCsvProfilesLoop());
$template->param(csv_profiles => GetCsvProfilesLoop('marc'));
$template->param(bib_list => $bib_list);
output_html_with_http_headers $query, $cookie, $template->output;
}

2
opac/opac-downloadcart.pl
View file

@ -89,7 +89,7 @@ if ($bib_list && $format) {
print $output;
} else {
$template->param(csv_profiles => GetCsvProfilesLoop());
$template->param(csv_profiles => GetCsvProfilesLoop('marc'));
$template->param(bib_list => $bib_list);
output_html_with_http_headers $query, $cookie, $template->output;
}

2
opac/opac-downloadshelf.pl
View file

@ -94,7 +94,7 @@ if ( ShelfPossibleAction( (defined($borrowernumber) ? $borrowernumber : -1), $sh
print $output;
} else {
$template->param(csv_profiles => GetCsvProfilesLoop());
$template->param(csv_profiles => GetCsvProfilesLoop('marc'));
$template->param(shelfid => $shelfid);
output_html_with_http_headers $query, $cookie, $template->output;
}

2
virtualshelves/downloadshelf.pl
View file

@ -88,7 +88,7 @@ if ($shelfid && $format) {
print $output;
}
else {
$template->param(csv_profiles => GetCsvProfilesLoop());
$template->param(csv_profiles => GetCsvProfilesLoop('marc'));
$template->param(shelfid => $shelfid);
output_html_with_http_headers $query, $cookie, $template->output;
}