Attachment 91895 Details for Bug 21518 – Bug 21518: Material type "three-dimensional artifact" displays as "visual material"

[patch] Bug 21518: Material type "three-dimensional artifact" displays as "visual material"

Bug-21518-Material-type-three-dimensional-artifact.patch (text/plain), 12.27 KB, created by Lucas Gass on 2019-07-31 16:31:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass

Created: 2019-07-31 16:31:39 UTC

Size: 12.27 KB

patch

obsolete

>From 89d12d3b48e77baebb14c8ed3cda1f25fd448742 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 31 Jul 2019 12:38:16 +0000
>Subject: [PATCH] Bug 21518: Material type "three-dimensional artifact"
> displays as "visual material"
>
>This patch makes a few corrections to the staff client MARC21 XSLT so
>that the correct material type icons are displayed for pictures and
>realia. The more-specific material type handling has been adapted from
>the corresponding XSL files in the OPAC.
>
>To test you must have default XSLT enabled and the DisplayIconsXSLT and
>DisplayOPACiconsXSLT system preferences enabled.
>
> - Apply the patch and locate records with "type of record" specified in
>   the leader as 'g', 'k', and 'r'.
>
>   A sample MARC file will be attached to the bug report with one of
>   each type of record. Import the records and search your catalog for
>   "Bug_21518."
>
> - View the records in search results and their detail pages, both in
>   the OPAC and the staff client. In all cases the correct material type
>   icon should be displayed.
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> .../prog/en/xslt/MARC21slim2intranetDetail.xsl            |  13 +++++++++----
> .../prog/en/xslt/MARC21slim2intranetResults.xsl           |   4 +++-
> koha-tmpl/intranet-tmpl/prog/img/famfamfam/OB.png         | Bin 0 -> 825 bytes
> koha-tmpl/intranet-tmpl/prog/img/famfamfam/PK.png         | Bin 0 -> 606 bytes
> .../intranet-tmpl/prog/img/famfamfam/silk/object.png      | Bin 0 -> 825 bytes
> .../intranet-tmpl/prog/img/famfamfam/silk/picture.png     | Bin 0 -> 606 bytes
> koha-tmpl/opac-tmpl/lib/famfamfam/PK.png                  | Bin 0 -> 606 bytes
> 7 files changed, 12 insertions(+), 5 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/OB.png
> create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/PK.png
> create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/object.png
> create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/picture.png
> create mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/PK.png
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>index a9b1812eb5..2fe196d659 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>@@ -61,8 +61,11 @@
>                 <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
>                 <xsl:when test="$leader6='m'">CF</xsl:when>
>                 <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
>-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
>-                <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
>+                <xsl:when test="$leader6='g'">VM</xsl:when>
>+                <xsl:when test="$leader6='k'">PK</xsl:when>
>+                <xsl:when test="$leader6='r'">OB</xsl:when>
>+                <xsl:when test="$leader6='i'">SO</xsl:when>
>+                <xsl:when test="$leader6='j'">MU</xsl:when>
>                 <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
>             </xsl:choose>
>         </xsl:variable>
>@@ -82,11 +85,13 @@
>                     </xsl:choose>
>                 </xsl:when>
>                 <xsl:when test="$leader6='t'">Book</xsl:when>
>-                <xsl:when test="$leader6='o'">Kit</xsl:when>				
>+                <xsl:when test="$leader6='o'">Kit</xsl:when>
>                 <xsl:when test="$leader6='p'">Mixed materials</xsl:when>
>                 <xsl:when test="$leader6='m'">Computer file</xsl:when>
>                 <xsl:when test="$leader6='e' or $leader6='f'">Map</xsl:when>
>-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">Visual material</xsl:when>
>+                <xsl:when test="$leader6='g'">Film</xsl:when>
>+                <xsl:when test="$leader6='k'">Picture</xsl:when>
>+                <xsl:when test="$leader6='r'">Object</xsl:when>
>                 <xsl:when test="$leader6='j'">Music</xsl:when>
>                 <xsl:when test="$leader6='i'">Sound</xsl:when>
>                 <xsl:when test="$leader6='c' or $leader6='d'">Score</xsl:when>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
>index 18dfb83e37..2ba9c1ff5f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
>@@ -503,7 +503,9 @@
>                 <xsl:when test="$leader6='p'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype mt_icon_MX"/>Mixed materials</xsl:when>
>                 <xsl:when test="$leader6='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype mt_icon_CF"/> Computer file</xsl:when>
>                 <xsl:when test="$leader6='e' or $leader6='f'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/map.png" alt="map" title="map" class="materialtype mt_icon_MP"/> Map</xsl:when>
>-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype mt_icon_VM"/> Visual material</xsl:when>
>+                <xsl:when test="$leader6='g'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="Film" class="materialtype mt_icon_VM"/> Film</xsl:when>
>+                <xsl:when test="$leader6='k'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/picture.png" alt="Picture" class="materialtype mt_icon_GR"/> Picture</xsl:when>
>+                <xsl:when test="$leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/object.png" alt="Object" title="Object" class="materialtype mt_icon_OB"/> Object</xsl:when>
>                 <xsl:when test="$leader6='c' or $leader6='d'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/music.png" alt="score" title="score" class="materialtype mt_icon_PR"/> Score</xsl:when>
>                 <xsl:when test="$leader6='i'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype mt_icon_MU"/> Sound</xsl:when>
>                 <xsl:when test="$leader6='j'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype mt_icon_MU"/> Music</xsl:when>
>diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/OB.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/OB.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..0905f933b87ab32f21098d7db8d603209730c753
>GIT binary patch
>literal 825
>zcmV-91IGM`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
>zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%Sl8*R5;6}
>zliyELVHn5hu6f<x&~^9DtF|_`OhtwSnj8^^@@wh=&H_=l%y23?0)JGXsHCD9N~K~Z
>za~hU9UFOVOQ?a4K1uM#RbH1JPI#;XNO&8Dh?0ui_=lMSG4*>wd|HNMlZ|>D)M67h?
>zOIjz3DJbk0=97q(mSBd~-ilc0Oupt^z$#N6O&at_s8u-PL@9<ril#}P(3B%tX~43%
>zDta#9qg2Fxv08EB?7)$_3^9q21fTP3{N4v~4jVS=E)zhV*Op;)Rc9I;TA6uJk6qz)
>zq<ualwG}w#M&Lzfuw#`HajJ+LDHj~z3IW{q7^4j#D{NyXFaZPhL^tpw7{WKV3yBI9
>zv7D^Z<8zUei1|_WCHcPqnw~P&F?|=l#V%M!X+q}#X?F+GPA5_=%{Y`75%D2ad<yv8
>zfzn%y+07|9rW?VGRAT350qLA}cj9Y%J5o({#7ksE$O8_z?pva4)?{;EH8=Y+1nM3+
>zmOd?DY9oZ<rG9h=>M^gQuq(+UH^IB$&*DHP!HzH+vkEzC?S52tN1$mKhziPkOR=y$
>zhl#aO1Xly_M?EkN>tM6E5T&Ht4dh{0oQr6Q1b3J=sM^ACOsvD=TSP81#0oTC1v|Df
>zgpp-GhL(KrE_8t&(jeFR1W%(osQ12tvSpHp_}~HR_8G{VUO;FILQv(<XKCH)xVBG)
>zt~n?AUwg<|<lDwDvlc^OejA?2cc|%m4MS%HMfT@JT-rJfQC;x#@tmBTTrjlh6iOGB
>zuJ9>P-b)es<jNif=C<&di$~KNkT*{fF~vFJ0mQ+dFHzsBy`*<&FN$kNS#S6~JmF0|
>z<Q&}R>=)ZlJM#c>{Wx-rgY3D#Ol9rJl39A<60Xo5cneo(9g5a4q>ayzV-7%Ue2}0_
>z&TIets{Cl`n(nefrZ+9F8|N&Kp}^StU2b+&pVj;XvgEdBL3Wlp00000NkvXXu0mjf
>DwZ3{L
>
>literal 0
>HcmV?d00001
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/PK.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/PK.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..4a158fef7e0da8fd19525f574f2c4966443866cf
>GIT binary patch
>literal 606
>zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
>zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@JU2LR5;6}
>zlRaxxK@^6cGxy%T_a+Owkd0v@QIddQ5yVtR|A2*sja5=uNcw<{Kf>Q2rnAt>LM%-F
>zK|rtwgcU)}7x~z1Hrcs5bH*ZO$!>xO8K#?==bZPQ_ecnV>#P`H`QzGaRhd62G_&rC
>zTLU$c7_x*nFP_dW#Q+*);mM<k(JaeEB>HE?j)HexK784D4x9l_tfpz2$@1y}9rkF+
>zI+J5N<Vh13l>MWeZyObc!d+rUc=>D+uOdAOg#%+Ej6h+wn5^xPmVVH*Eu446Y0A_@
>zo$rlds-+sL10Db<V2ohHE~Vsv!_y|#cPO00g*IuL(zZDxxgijG#`FV32u`uSOUGGG
>zyOu&7UIFP6)Ds)w;?J3$(cuh`F-ogFOd!Fk$2yNliFT_@xin4`83=M&LI`IP%F#`J
>zZEaJ@HW?Z=q~bW<A7Xo}PQ5ZkY~*qd!bL!GgYo=6Ki5{MmVYDOlXOP8HN8MNtK(Js
>zV$s*Z`raa56|c%2yUX0fZ4_v1Zu9B*6?&woD)4!rgAfql@$6FXAeuSkq`gPB`IXwk
>zMdqWVFPY~)#sG3fUVUE0=T&TN`ieXbn3yHfM7x!HV-G;&FDjhxOOKr^h$9I-Kq;1Y
>s?^hagg%30TGn{b*iQz4PTz8!R00wW`ldl!TzW@LL07*qoM6N<$g6(7tz5oCK
>
>literal 0
>HcmV?d00001
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/object.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/object.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..0905f933b87ab32f21098d7db8d603209730c753
>GIT binary patch
>literal 825
>zcmV-91IGM`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
>zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%Sl8*R5;6}
>zliyELVHn5hu6f<x&~^9DtF|_`OhtwSnj8^^@@wh=&H_=l%y23?0)JGXsHCD9N~K~Z
>za~hU9UFOVOQ?a4K1uM#RbH1JPI#;XNO&8Dh?0ui_=lMSG4*>wd|HNMlZ|>D)M67h?
>zOIjz3DJbk0=97q(mSBd~-ilc0Oupt^z$#N6O&at_s8u-PL@9<ril#}P(3B%tX~43%
>zDta#9qg2Fxv08EB?7)$_3^9q21fTP3{N4v~4jVS=E)zhV*Op;)Rc9I;TA6uJk6qz)
>zq<ualwG}w#M&Lzfuw#`HajJ+LDHj~z3IW{q7^4j#D{NyXFaZPhL^tpw7{WKV3yBI9
>zv7D^Z<8zUei1|_WCHcPqnw~P&F?|=l#V%M!X+q}#X?F+GPA5_=%{Y`75%D2ad<yv8
>zfzn%y+07|9rW?VGRAT350qLA}cj9Y%J5o({#7ksE$O8_z?pva4)?{;EH8=Y+1nM3+
>zmOd?DY9oZ<rG9h=>M^gQuq(+UH^IB$&*DHP!HzH+vkEzC?S52tN1$mKhziPkOR=y$
>zhl#aO1Xly_M?EkN>tM6E5T&Ht4dh{0oQr6Q1b3J=sM^ACOsvD=TSP81#0oTC1v|Df
>zgpp-GhL(KrE_8t&(jeFR1W%(osQ12tvSpHp_}~HR_8G{VUO;FILQv(<XKCH)xVBG)
>zt~n?AUwg<|<lDwDvlc^OejA?2cc|%m4MS%HMfT@JT-rJfQC;x#@tmBTTrjlh6iOGB
>zuJ9>P-b)es<jNif=C<&di$~KNkT*{fF~vFJ0mQ+dFHzsBy`*<&FN$kNS#S6~JmF0|
>z<Q&}R>=)ZlJM#c>{Wx-rgY3D#Ol9rJl39A<60Xo5cneo(9g5a4q>ayzV-7%Ue2}0_
>z&TIets{Cl`n(nefrZ+9F8|N&Kp}^StU2b+&pVj;XvgEdBL3Wlp00000NkvXXu0mjf
>DwZ3{L
>
>literal 0
>HcmV?d00001
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/picture.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/picture.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..4a158fef7e0da8fd19525f574f2c4966443866cf
>GIT binary patch
>literal 606
>zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
>zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@JU2LR5;6}
>zlRaxxK@^6cGxy%T_a+Owkd0v@QIddQ5yVtR|A2*sja5=uNcw<{Kf>Q2rnAt>LM%-F
>zK|rtwgcU)}7x~z1Hrcs5bH*ZO$!>xO8K#?==bZPQ_ecnV>#P`H`QzGaRhd62G_&rC
>zTLU$c7_x*nFP_dW#Q+*);mM<k(JaeEB>HE?j)HexK784D4x9l_tfpz2$@1y}9rkF+
>zI+J5N<Vh13l>MWeZyObc!d+rUc=>D+uOdAOg#%+Ej6h+wn5^xPmVVH*Eu446Y0A_@
>zo$rlds-+sL10Db<V2ohHE~Vsv!_y|#cPO00g*IuL(zZDxxgijG#`FV32u`uSOUGGG
>zyOu&7UIFP6)Ds)w;?J3$(cuh`F-ogFOd!Fk$2yNliFT_@xin4`83=M&LI`IP%F#`J
>zZEaJ@HW?Z=q~bW<A7Xo}PQ5ZkY~*qd!bL!GgYo=6Ki5{MmVYDOlXOP8HN8MNtK(Js
>zV$s*Z`raa56|c%2yUX0fZ4_v1Zu9B*6?&woD)4!rgAfql@$6FXAeuSkq`gPB`IXwk
>zMdqWVFPY~)#sG3fUVUE0=T&TN`ieXbn3yHfM7x!HV-G;&FDjhxOOKr^h$9I-Kq;1Y
>s?^hagg%30TGn{b*iQz4PTz8!R00wW`ldl!TzW@LL07*qoM6N<$g6(7tz5oCK
>
>literal 0
>HcmV?d00001
>
>diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/PK.png b/koha-tmpl/opac-tmpl/lib/famfamfam/PK.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..4a158fef7e0da8fd19525f574f2c4966443866cf
>GIT binary patch
>literal 606
>zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
>zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@JU2LR5;6}
>zlRaxxK@^6cGxy%T_a+Owkd0v@QIddQ5yVtR|A2*sja5=uNcw<{Kf>Q2rnAt>LM%-F
>zK|rtwgcU)}7x~z1Hrcs5bH*ZO$!>xO8K#?==bZPQ_ecnV>#P`H`QzGaRhd62G_&rC
>zTLU$c7_x*nFP_dW#Q+*);mM<k(JaeEB>HE?j)HexK784D4x9l_tfpz2$@1y}9rkF+
>zI+J5N<Vh13l>MWeZyObc!d+rUc=>D+uOdAOg#%+Ej6h+wn5^xPmVVH*Eu446Y0A_@
>zo$rlds-+sL10Db<V2ohHE~Vsv!_y|#cPO00g*IuL(zZDxxgijG#`FV32u`uSOUGGG
>zyOu&7UIFP6)Ds)w;?J3$(cuh`F-ogFOd!Fk$2yNliFT_@xin4`83=M&LI`IP%F#`J
>zZEaJ@HW?Z=q~bW<A7Xo}PQ5ZkY~*qd!bL!GgYo=6Ki5{MmVYDOlXOP8HN8MNtK(Js
>zV$s*Z`raa56|c%2yUX0fZ4_v1Zu9B*6?&woD)4!rgAfql@$6FXAeuSkq`gPB`IXwk
>zMdqWVFPY~)#sG3fUVUE0=T&TN`ieXbn3yHfM7x!HV-G;&FDjhxOOKr^h$9I-Kq;1Y
>s?^hagg%30TGn{b*iQz4PTz8!R00wW`ldl!TzW@LL07*qoM6N<$g6(7tz5oCK
>
>literal 0
>HcmV?d00001
>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21518: 91889 | 91890 | 91895 | 91930