Bugzilla – Attachment 33055 Details for
Bug 11876
Add a diff view to staged MARC records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 11876: (qa-followup) some minor changes
PASSED-QA-Bug-11876-qa-followup-some-minor-changes.patch (text/plain), 5.30 KB, created by
Kyle M Hall
on 2014-10-31 12:31:21 UTC
(
hide
)
Description:
[PASSED QA] Bug 11876: (qa-followup) some minor changes
Filename:
MIME Type:
Creator:
Kyle M Hall
Created:
2014-10-31 12:31:21 UTC
Size:
5.30 KB
patch
obsolete
>From 5234bddf5a27cb9f5b6aef23b44e9c96c0b65d82 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Thu, 25 Sep 2014 13:59:44 +0200 >Subject: [PATCH] [PASSED QA] Bug 11876: (qa-followup) some minor changes > >- GetImportBiblios: prepare the query is useless here >- use Modern::Perl >- Remove useless indentation level in pl file and redirect to 404 if > required params are not given. > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/ImportBatch.pm | 10 ++-- > tools/showdiffmarc.pl | 98 ++++++++++++++++++++++++------------------------ > 2 files changed, 54 insertions(+), 54 deletions(-) > >diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm >index 51a0585..b8d2560 100644 >--- a/C4/ImportBatch.pm >+++ b/C4/ImportBatch.pm >@@ -1029,11 +1029,11 @@ sub GetImportBiblios { > > my $dbh = C4::Context->dbh; > my $query = "SELECT * FROM import_biblios WHERE import_record_id = ?"; >- my $sth = $dbh->prepare_cached($query); >- $sth->execute($import_record_id); >- my $results = $sth->fetchall_arrayref({}); >- $sth->finish(); >- return $results; >+ return $dbh->selectall_arrayref( >+ $query, >+ { Slice => {} }, >+ $import_record_id >+ ); > > } > >diff --git a/tools/showdiffmarc.pl b/tools/showdiffmarc.pl >index 3b12795..33881ba 100755 >--- a/tools/showdiffmarc.pl >+++ b/tools/showdiffmarc.pl >@@ -19,8 +19,7 @@ > # with Koha; if not, write to the Free Software Foundation, Inc., > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > >-use strict; >-use warnings; >+use Modern::Perl; > > # standard or CPAN modules used > use CGI qw(:standard); >@@ -43,59 +42,60 @@ my $importid = $input->param('importid'); > my $batchid = $input->param('batchid'); > > >-if ( $biblionumber and $importid ) { >- >- # Init vars >- my ($recordBiblionumber, $recordImportid, $biblioTitle, $importTitle, $formatted1, $formatted2, >- $errorFormatted1, $errorFormatted2); >- >- >- # Prepare template >- my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >- { >- template_name => "tools/showdiffmarc.tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => { tools => 'manage_staged_marc' }, >- debug => 1, >- } >- ); >+if ( not $biblionumber or not $importid ) { >+ print $input->redirect("/cgi-bin/koha/errors/404.pl"); >+ exit; >+} > >+# Init vars >+my ($recordBiblionumber, $recordImportid, $biblioTitle, $importTitle, $formatted1, $formatted2, >+ $errorFormatted1, $errorFormatted2); > >- $recordBiblionumber =GetMarcBiblio($biblionumber); >- if( $recordBiblionumber ) { >- $formatted1 = $recordBiblionumber->as_formatted; >- my $data = GetBiblioData($biblionumber); >- $biblioTitle = $data->{title}; >- } else { >- $errorFormatted1 = 1; >- } > >- my ($marc,$encoding) = GetImportRecordMarc($importid); >- if( $marc ) { >- $recordImportid = MARC::Record->new_from_usmarc($marc) ; >- $formatted2 = $recordImportid->as_formatted; >- my $biblio = GetImportBiblios($importid); >- $importTitle = $biblio->[0]->{'title'}; >- } else { >- $errorFormatted2 = 1; >+# Prepare template >+my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >+ { >+ template_name => "tools/showdiffmarc.tt", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => { tools => 'manage_staged_marc' }, >+ debug => 1, > } >+); > > >- $template->param( SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, >- BIBLIONUMBER => $biblionumber, >- IMPORTID => $importid, >- BIBLIOTITLE => $biblioTitle, >- IMPORTTITLE => $importTitle, >- MARC_FORMATTED1 => $formatted1, >- MARC_FORMATTED2 => $formatted2, >- ERROR_FORMATTED1 => $errorFormatted1, >- ERROR_FORMATTED2 => $errorFormatted2, >- batchid => $batchid >- ); >+$recordBiblionumber =GetMarcBiblio($biblionumber); >+if( $recordBiblionumber ) { >+ $formatted1 = $recordBiblionumber->as_formatted; >+ my $data = GetBiblioData($biblionumber); >+ $biblioTitle = $data->{title}; >+} else { >+ $errorFormatted1 = 1; >+} > >- output_html_with_http_headers $input, $cookie, $template->output; >+my ($marc,$encoding) = GetImportRecordMarc($importid); >+if( $marc ) { >+ $recordImportid = MARC::Record->new_from_usmarc($marc) ; >+ $formatted2 = $recordImportid->as_formatted; >+ my $biblio = GetImportBiblios($importid); >+ $importTitle = $biblio->[0]->{'title'}; > } else { >- exit; >+ $errorFormatted2 = 1; > } >+ >+ >+$template->param( >+ SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, >+ BIBLIONUMBER => $biblionumber, >+ IMPORTID => $importid, >+ BIBLIOTITLE => $biblioTitle, >+ IMPORTTITLE => $importTitle, >+ MARC_FORMATTED1 => $formatted1, >+ MARC_FORMATTED2 => $formatted2, >+ ERROR_FORMATTED1 => $errorFormatted1, >+ ERROR_FORMATTED2 => $errorFormatted2, >+ batchid => $batchid >+); >+ >+output_html_with_http_headers $input, $cookie, $template->output; >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11876
:
25743
|
30590
|
30591
|
30787
|
30797
|
30798
|
30799
|
30800
|
31835
|
31847
|
31871
|
31872
|
31873
|
31874
|
32987
|
32995
|
33052
|
33053
|
33054
| 33055 |
33056