Bugzilla – Attachment 126080 Details for
Bug 11175
Show the parent record's component parts in the detailed views
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11175: (QA follow-up) Account for difference in simple_search return
Bug-11175-QA-follow-up-Account-for-difference-in-s.patch (text/plain), 3.11 KB, created by
Martin Renvoize (ashimema)
on 2021-10-12 09:36:19 UTC
(
hide
)
Description:
Bug 11175: (QA follow-up) Account for difference in simple_search return
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-10-12 09:36:19 UTC
Size:
3.11 KB
patch
obsolete
>From 7a5846d32338e1b07e2d102761e422b3dd6b8461 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 12 Oct 2021 09:49:34 +0100 >Subject: [PATCH] Bug 11175: (QA follow-up) Account for difference in > simple_search return > >Thanks to a comment from Andrew, I discovered that the return from >simple_search_compat actually differs depending on if you are using >ElasticSearch or Zebra. The 'results' arrayref contains MARC::Record >objects for ES and raw marc strings if you are using Zebra. This is >actually already dealt with in the misnamed new_record_from_zebra >function inside C4::Search.. so this patch simply replaces our >MARC::Record instantiation code with a call to that function. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Signed-off-by: Andrew Nugged <nugged@gmail.com> >--- > catalogue/detail.pl | 4 ++-- > opac/opac-detail.pl | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 2495352c6b..cb2d00734c 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -39,7 +39,7 @@ use C4::Reserves; > use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); > use C4::XISBN qw( get_xisbns ); > use C4::External::Amazon qw( get_amazon_tld ); >-use C4::Search qw( z3950_search_args enabled_staff_search_views ); >+use C4::Search qw( z3950_search_args enabled_staff_search_views new_record_from_zebra ); > use C4::Tags qw( get_tags ); > use C4::XSLT qw( XSLTParse4Display ); > use Koha::DateUtils qw( format_sqldatetime ); >@@ -217,7 +217,7 @@ if ( $showcomp eq 'both' || $showcomp eq 'staff' ) { > if ( my $components = $biblio->get_marc_components(300) ) { > my $parts; > for my $part ( @{$components} ) { >- $part = MARC::Record->new_from_xml( $part, 'UTF-8' ); >+ $part = C4::Search::new_record_from_zebra( 'biblioserver', $part ); > > push @{$parts}, > XSLTParse4Display( >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index 05f8967dad..43d675222d 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -32,6 +32,7 @@ use C4::Koha qw( > GetNormalizedOCLCNumber > GetNormalizedUPC > ); >+use C4::Search qw( new_record_from_zebra ); > use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); > use C4::Output qw( parametrized_url output_html_with_http_headers ); > use C4::Biblio qw( >@@ -233,7 +234,6 @@ if ($OpacBrowseResults) { > my $session = get_session($query->cookie("CGISESSID")); > my %paging = (previous => {}, next => {}); > if ($session->param('busc')) { >- use C4::Search; > use URI::Escape qw( uri_escape_utf8 uri_unescape ); > > # Rebuild the string to store on session >@@ -663,7 +663,7 @@ if ( $showcomp eq 'both' || $showcomp eq 'opac' ) { > if ( my $components = $biblio->get_marc_components(300) ) { > my $parts; > for my $part ( @{$components} ) { >- $part = MARC::Record->new_from_xml( $part, 'UTF-8' ); >+ $part = C4::Search::new_record_from_zebra( 'biblioserver', $part ); > > push @{$parts}, > XSLTParse4Display( >-- >2.20.1
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 11175
:
22612
|
22649
|
23049
|
24788
|
24789
|
24790
|
24791
|
26402
|
26403
|
26404
|
26405
|
26766
|
26767
|
78022
|
78023
|
78024
|
79687
|
79803
|
79809
|
79810
|
105631
|
105641
|
105703
|
105706
|
105707
|
106692
|
112838
|
112839
|
112840
|
112841
|
112846
|
112847
|
112851
|
112852
|
112853
|
112854
|
112855
|
112856
|
112857
|
113649
|
113650
|
113962
|
113964
|
114326
|
114327
|
114328
|
114329
|
114330
|
114331
|
114332
|
114333
|
114334
|
116819
|
116820
|
116821
|
116822
|
116823
|
116824
|
116825
|
116826
|
116827
|
116828
|
119499
|
119506
|
120206
|
122707
|
122708
|
122709
|
122710
|
122711
|
122712
|
122713
|
122714
|
122715
|
122716
|
122717
|
122718
|
123081
|
123082
|
123083
|
123084
|
123085
|
123086
|
123087
|
123088
|
123089
|
123090
|
123091
|
123092
|
123093
|
123406
|
123410
|
123508
|
123509
|
123510
|
123511
|
123512
|
123513
|
123514
|
123515
|
123516
|
123517
|
123518
|
123519
|
123520
|
123521
|
123522
|
123523
|
123524
|
123541
|
123542
|
123543
|
123544
|
123545
|
123546
|
123547
|
123548
|
123549
|
123550
|
123551
|
123552
|
123553
|
123554
|
123555
|
123556
|
123557
|
123562
|
123564
|
123569
|
123570
|
123571
|
123572
|
123573
|
123574
|
123582
|
123583
|
123608
|
123609
|
123611
|
123612
|
123613
|
123614
|
123617
|
123618
|
123619
|
123620
|
123621
|
123622
|
123623
|
123624
|
123625
|
123626
|
123627
|
123628
|
123629
|
123630
|
123631
|
123632
|
123633
|
123634
|
123635
|
123636
|
123637
|
123638
|
123736
|
123737
|
123738
|
123739
|
123740
|
123741
|
123742
|
123743
|
123744
|
123745
|
123746
|
123747
|
123748
|
123749
|
123750
|
123751
|
123752
|
123753
|
123754
|
123755
|
123756
|
124134
|
124135
|
124136
|
124137
|
124138
|
124139
|
124140
|
124141
|
124142
|
124143
|
124144
|
124145
|
124146
|
124147
|
124148
|
124149
|
124150
|
124151
|
124152
|
124153
|
124154
|
124155
|
124382
|
124383
|
124384
|
124385
|
124386
|
124387
|
124388
|
124389
|
124390
|
124391
|
124392
|
124393
|
124394
|
124395
|
124396
|
124397
|
124398
|
124399
|
124400
|
124401
|
124402
|
124403
|
124404
|
124534
|
124535
|
124536
|
124537
|
124538
|
124539
|
124540
|
124541
|
124542
|
124544
|
124545
|
124546
|
124547
|
124548
|
124549
|
124550
|
124551
|
124552
|
124553
|
124554
|
124555
|
124556
|
124557
|
126057
|
126058
|
126059
|
126060
|
126061
|
126062
|
126063
|
126064
|
126065
|
126066
|
126067
|
126068
|
126069
|
126070
|
126071
|
126072
|
126073
|
126074
|
126075
|
126076
|
126077
|
126078
|
126079
|
126080
|
126081
|
126084
|
126441
|
126442
|
126443
|
126687
|
126688
|
126689
|
126690
|
126692
|
126693
|
126694
|
126695
|
126696
|
126697
|
126698
|
126699
|
126700
|
126701
|
126702
|
126703
|
126704
|
126705
|
126706
|
126707
|
126708
|
126709
|
126710
|
126711
|
126712
|
126713
|
126714
|
126715
|
126716
|
126717
|
126718
|
126719
|
126720
|
126721
|
126722
|
126723
|
126724
|
126725
|
126726
|
126727
|
126728
|
126729
|
126730
|
126731
|
126732
|
126733
|
126734
|
126735
|
126736
|
126737
|
126738
|
126739
|
126740
|
126741
|
126742
|
126743
|
126744
|
126745
|
126816
|
126817
|
126869
|
126870
|
126871
|
126872
|
126873
|
126874
|
126875
|
126876
|
126877
|
126878
|
126879
|
126880
|
126881
|
126882
|
126883
|
126884
|
126885
|
126886
|
126887
|
126888
|
126889
|
126890
|
126891
|
126892
|
126893
|
126894
|
126895
|
126897
|
126898
|
126904
|
126911
|
126912
|
126913