[Koha-patches] [PATCH 1/2] [SIGNED-OFF] Proposed fix for Bug 5106 - Simplify MARC view choices in the OPAC
Frédéric Demians
f.demians at tamil.fr
Tue Dec 7 22:39:48 CET 2010
From: Owen Leonard <oleonard at myacpl.org>
- Eliminates the "Extended MARC View" tab
- Points the "MARC View" tab to opac-MARCDetail.pl as it is when XSLT is off
- Offers a "view plain" link on opac-MARCDetail.pl. Clicking this link
replaces the standard labeled MARC view with an unformatted view similar to the
one displayed in the pop-up modal MARC view.
- When viewing the "plain view," clicking the "view labeled" link will return
you to the standard labeled MARC view.
- Adds a new XSL file for displaying MARC data in a slightly-more-formatted
manner (compared to one big <pre></pre> block).
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
---
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 3 +
.../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 22 +---
.../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 107 +++++++++++++-------
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 8 --
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 5 +-
.../prog/en/xslt/MARC21slim2OPACMARCdetail.xsl | 55 ++++++++++
koha-tmpl/opac-tmpl/prog/images/loading.gif | Bin 0 -> 3208 bytes
opac/opac-showmarc.pl | 35 +++++--
8 files changed, 157 insertions(+), 78 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl
create mode 100644 koha-tmpl/opac-tmpl/prog/images/loading.gif
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index f47c8c2..87ca620 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1970,3 +1970,6 @@ div.ft {
list-style:disc outside url("../../images/item-bullet.gif");
padding:0.2em 0;
}
+#plainmarc table { border: 0; margin: .7em 0 0 0; font-family: monospace; font-size: 95%; }
+#plainmarc th { background-color : #FFF; border: 0; white-space: nowrap; text-align:left; vertical-align: top; padding: 2px; }
+#plainmarc td { border: 0; padding : 2px; vertical-align: top; }
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index 039e2ea..ab4a776 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -7,14 +7,6 @@
});
//]]>
</script>
-<!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" --><script type="text/javascript">
- var GB_ROOT_DIR = "/opac-tmpl/prog/en/lib/greybox/";
-</script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/AJS.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/AJS_fx.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/gb_scripts.js"></script>
-<link href="/opac-tmpl/prog/en/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" />
-<!-- /TMPL_IF -->
</head>
<body id="opac-isbddetail">
@@ -24,21 +16,17 @@
<div id="yui-main">
- <div class="yui-b"><div id="opac-detail" class="yui-ge">
+ <div class="yui-b">
+ <div id="opac-detail" class="yui-ge">
<div class="yui-u first">
<div class="container">
<div id="catalogue_detail_biblio">
<h1 style="float:left;margin:0 1em 1em 0;">ISBD View</h1> <div id="views">
- <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span> <!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" -->
-<span class="view"><a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">MARC View</a></span>
- <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Expanded MARC View</a></span>
-<!-- TMPL_ELSE -->
-<span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span>
-<!-- /TMPL_IF --> <span class="view"><span id="ISBDview">ISBD View</span></span>
-</div>
+ <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span> <span class="view"><span id="ISBDview">ISBD View</span></span></div>
+
<div id="isbdcontents"><!-- TMPL_VAR name="ISBD" --></div>
-
+
</div>
</div>
</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index 319d0d7..5a0d04e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -1,12 +1,43 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" --><script type="text/javascript">
- var GB_ROOT_DIR = "/opac-tmpl/prog/en/lib/greybox/";
+<!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" -->
+<script type="text/javascript">
+//<![CDATA[
+$(document).ready(function(){
+ $.ajaxSetup({
+ error:function(x,e){
+ switch (x.status) {
+ case 200: break;
+ default:
+ $('#switchview').parent().html("<div class=\"dialog alert\">"+_("Sorry, plain view is temporarily unavailable")+".</div>");
+ $("#plainmarc").hide();
+ $("#labeledmarc").show();
+ break;
+ }
+ }
+ });
+
+ var loaded = 0;
+ $("#switchview").toggle(
+ function () {
+ $(this).text(_("view labeled"));
+ $("#labeledmarc").hide();
+ if(!loaded){
+ $("#plainmarc").show().html("<div style=\"margin:1em;padding:1em;border:1px solid #EEE;font-size:150%;\"><img src=\"/opac-tmpl/prog/images/loading.gif\" /> "+_("Loading")+"...</div>").load("/cgi-bin/koha/opac-showmarc.pl","id=<!-- TMPL_VAR name="biblionumber" -->&viewas=html");
+ loaded = 1;
+ } else {
+ $("#plainmarc").show();
+ }
+ },
+ function () {
+ $(this).text(_("view plain"));
+ $("#labeledmarc").show();
+ $("#plainmarc").hide();
+ }
+ );
+});
+//]]>
</script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/AJS.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/AJS_fx.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/gb_scripts.js"></script>
-<link href="/opac-tmpl/prog/en/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" />
<!-- /TMPL_IF -->
</head>
<body id="opac-marcdetail">
@@ -15,28 +46,25 @@
<div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
<div id="yui-main">
<div class="yui-b"><div id="opac-detail" class="yui-ge">
<div class="yui-u first">
<div class="container">
<div id="catalogue_detail_biblio">
- <h1 style="float:left;margin: 0 1em 1em 0;">MARC View</h1>
- <div id="views">
- <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span>
-
-<!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" -->
-<span class="view"><a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">MARC View</a></span>
- <span class="view"><span id="MARCview">Expanded MARC View</span></span>
-<!-- TMPL_ELSE -->
-<span class="view"><span id="MARCview">MARC View</span>
-<!-- /TMPL_IF -->
+ <h2 style="float:left;margin: 0 1em 1em 0;">MARC View</h2>
+ <div id="views">
+ <span class="view"><a id="Normalview" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Normal View</a></span>
- <!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF -->
+<span class="view"><span id="MARCview">MARC View</span></span>
+<!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF -->
</div>
- <h1 style="clear:both;"><!-- TMPL_VAR NAME="bibliotitle" --> (Record no. <!-- TMPL_VAR NAME="biblionumber" -->)</h1>
- <table id="marc">
+ <h3 style="clear:both;"><!-- TMPL_VAR NAME="bibliotitle" --> (Record no. <!-- TMPL_VAR NAME="biblionumber" -->)</h3>
+ <!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" -->
+ <div>[ <a id="switchview" href="/cgi-bin/koha/opac-showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->&viewas=html">view plain</a> ]</div>
+ <div id="plainmarc"></div><!-- /TMPL_IF -->
+ <div id="labeledmarc">
+ <table id="marc">
<!-- TMPL_LOOP name="0XX" -->
<tr><th colspan="2"><!-- TMPL_VAR name="tag" --></th></tr>
<!-- TMPL_LOOP name="subfield" -->
@@ -136,9 +164,10 @@
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
</table>
+ </div>
<!-- TMPL_IF NAME="item_header_loop" -->
<table id="items">
- <caption>Copies</caption>
+ <caption>Copies</caption>
<tr>
<!-- TMPL_LOOP name="item_header_loop" -->
<th>
@@ -157,23 +186,23 @@
</div>
</div>
</div>
- <div class="yui-u">
- <div class="container">
+ <div class="yui-u">
+ <div class="container">
<ul id="action">
<!-- TMPL_UNLESS NAME="norequests" -->
<!-- TMPL_IF NAME="opacuserlogin" -->
- <!-- TMPL_IF NAME="RequestOnOpac" -->
- <!-- TMPL_IF NAME="AllowOnShelfHolds" -->
- <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li>
- <!-- TMPL_ELSE -->
- <!-- TMPL_IF NAME="ItemsIssued" -->
- <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li>
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
-
- <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="RequestOnOpac" -->
+ <!-- TMPL_IF NAME="AllowOnShelfHolds" -->
+ <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li>
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_IF NAME="ItemsIssued" -->
+ <li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
+
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
Print
@@ -190,11 +219,11 @@
</a></li><!-- /TMPL_IF -->
</ul>
- <div id="export">
- <form method="get" action="/cgi-bin/koha/opac-export.pl">
- <label for="format">Save Record:</label>
- <select name="format" id="format">
- <option value="">-- Choose Format --</option>
+ <div id="export">
+ <form method="get" action="/cgi-bin/koha/opac-export.pl">
+ <label for="format">Save Record:</label>
+ <select name="format" id="format">
+ <option value="">-- Choose Format --</option>
<option value="mods">MODS (XML)</option>
<option value="dc">Dublin Core (XML)</option>
<option value="marcxml">MARCXML</option>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 084c484..a30cff4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -47,14 +47,6 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
<style type="text/css">
#addtagl { display: none; }
</style>
-<!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" --><script type="text/javascript">
- var GB_ROOT_DIR = "/opac-tmpl/prog/en/lib/greybox/";
-</script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/AJS.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/AJS_fx.js"></script>
-<script type="text/javascript" src="/opac-tmpl/prog/en/lib/greybox/gb_scripts.js"></script>
-<link href="/opac-tmpl/prog/en/lib/greybox/gb_styles.css" rel="stylesheet" type="text/css" />
-<!-- /TMPL_IF -->
</head>
<body id="opac-detail">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 8334a02..554079b 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -171,10 +171,9 @@
</xsl:choose>
<div id="views">
<span class="view"><span id="Normalview">Normal View</span> </span>
- <span class="view"><a id="MARCviewPop" href="/cgi-bin/koha/opac-showmarc.pl?id={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC" rel="gb_page_center[600,500]">MARC View</a></span>
- <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC">Expanded MARC View</a></span>
+ <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}" title="MARC">MARC View</a></span>
<xsl:if test="$ShowISBD!='0'">
- <span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">Card View (ISBD)</a></span>
+ <span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber={marc:datafield[@tag=999]/marc:subfield[@code='c']}">ISBD View</a></span>
</xsl:if>
</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl
new file mode 100644
index 0000000..ee4058a
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="html"/>
+
+ <xsl:template match="/">
+ <html>
+ <xsl:apply-templates/>
+ </html>
+ </xsl:template>
+
+ <xsl:template match="marc:record">
+ <table>
+ <tr>
+ <th style="white-space:nowrap">
+ 000
+ </th>
+ <td colspan="2"></td>
+ <td>
+ <xsl:value-of select="marc:leader"/>
+ </td>
+ </tr>
+ <xsl:apply-templates select="marc:datafield|marc:controlfield"/>
+ </table>
+ </xsl:template>
+
+ <xsl:template match="marc:controlfield">
+ <tr>
+ <th style="white-space:nowrap">
+ <xsl:value-of select="@tag"/>
+ </th>
+ <td colspan="2"></td>
+ <td>
+ <xsl:value-of select="."/>
+ </td>
+ </tr>
+ </xsl:template>
+
+ <xsl:template match="marc:datafield">
+ <tr>
+ <th style="white-space:nowrap">
+ <xsl:value-of select="@tag"/>
+ </th>
+ <td><xsl:value-of select="@ind1"/></td>
+ <td><xsl:value-of select="@ind2"/></td>
+ <td><xsl:apply-templates select="marc:subfield"/></td>
+ </tr>
+ </xsl:template>
+
+ <xsl:template match="marc:subfield">
+ <strong>_<xsl:value-of select="@code"/></strong> <xsl:value-of select="."/>
+ <xsl:choose>
+ <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when><xsl:otherwise><br /></xsl:otherwise></xsl:choose>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/images/loading.gif b/koha-tmpl/opac-tmpl/prog/images/loading.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3c2f7c058836808f7f1f5f9a4bdf37d4e5f9284a
GIT binary patch
literal 3208
zcmc(ic~Dc=9>*`aOO|`};l05I0veErPzymNWmO?SfPgFlg5pAq3huH91c9)G1Y`|i
z4JZjDhG<1Z5!{L(f?6D`8``H2sCB`;j(xVT^L)Wphk5_LnZEPqnRDmP=X1Wl at 66!`
z`n$Ttvj7(G763kc_y7RFrAwCz3JSWqx*8f9xLj^@boA)x=);E(&z?OyXU-f5f{bVW
zSl0ix;3aK}PuV15r6r~$u;RDIr*GdCFLF%Wxp^00{VN2}j0dehpey_$SMt2W{1!QK
zKojHE!m014ehNU3O@{&#<F%8+kA(uMZIeG{))GPTRz at CQNY*Y|IpM%@adNu6L$ljj
zTy^0)jycKH!*+nfGih`r1v*&&9>81Ry?oX#6DZ$$v0J3e>A35z_WBvJ<_#BKo;WU|
zlhe}qUa=5u3mwW&3lJ7s?M1x36dY=FTw|QvgGz$IR&C=!53NBJpfA=OKGM`_RmbT%
znZm9NNG{r+6zds~<Csef6rHM}o>vIJC01Jq2Sfd~xI=Y0{MfaQy<Ydc{}CGAm|XY>
zn2ZzlCpfx2_e$RKF6Y3;lDC^Ctng6>y!>|IX5edIqlS+<Os2C>PO-<fP7WW6^>?8+
z`B&W3L?HdjNFjrNI!Jn^_xX`vLz8IS;`MxK?2dHilQLyLW(Kk1FgksCojER<ykOSA
zqCm$WXU6aIBl0^GL;y}(V&WWr;)i|Fh&h`ihW65-oOxS0GFlmZdkKF_CMO##^33(5
z7Oc^%ktI~7Yt{TVh?dc&X*<*|Yw4<4bAVHOnt7IgqLQiCg%ye$@xg at 4=hYYMwu$@j
zM2p(Xl#H_G>sJ!?iEkw+`1cDYq6akXxle%?J<sA2h{tQ%%U%J4t at 7e`^Q*tCY+iNX
z>r<{{=0nz`Kk-S^@n0J8?VXMIkDd80qP5Zm)#`}B<I2cICCaVA1)2RfJXyq=5tp$L
z`uQ;$XT;oIYEEMXch7DOBo)5iAszP94{o5JfZ*M at Hj0MkLhClu*_6C>9q`aYD-x25
zc at QMAn3TmSh+$G`MJqYrrZlSzXqzXwkxe}q+R{=~MXl6{TMe0tZ;lxDwHaEwS~Tn)
z%Z4-bbN=m#CC+_Hj=V at B(_K9qdqPDt^t)b6FaB0hLKPppyu1i6y5o8OFfai$3|@Hf
z;}f9$JoCBho5!)9?In}=Wi7?^t?W>oEX>UI<Qc8C;=+tspArC0S1^_SHil+$c#FAT
zlxb59>sE7wEM6JuV|urBCNX|~_fosA>efw^cee6+8#zdilg;yU=9%o2Tr8vKU(UXB
z3kWh_IQ#Dlz2mDX28*Vsv~^2N0 at -2rA5dndqT#a_FD7Mja*;&mNGTuQl4hBa#RlbU
zyNJdn0&7;IFttot;-xlVx<gHeu@>#2#Rt0hHS8Yc?$hTuI$Ax^85FTg>Ou?^asn^v
zc4TamL;dN)1SL|wK5J+}IUv2WZek)s&{URu5`W(KbZO#xJ-h7I%bmY at -Nh&FUD-3b
zWYh3hA$_f%(+^E&|9Jfl`pIECdq1scZFL2~(DjE!P`xQick6HdB~DW0RW%CJs%Egc
z5*vQ&0+H<+8=2yLP{*8J|AcQU5HKERhC^Yc8+NlT`wE?W{KMilM$MR*u`F^Vg|y0P
zH$vvm4^8of<JVgzLm5`veeFW(>It;5X%DqHWn*2F7FBENb*Qjev#6oN7p$rX0Wr+o
zs`8{oPY+ryQp?#Sq!&YSG)vgY_Gs^!%G7))-)}L!8*2e#qa^10fs}hSj~-QC at -4P~
z6qFe9!gDNk%%gbp7$K<>c~-GPNqH$TKYQ-6`*N1g%+J>kPgn4EssJL|j0Ip5#AY?s
zRM6Erzwp(Dilg}V_^V)%qWGU*#U9ns-X-MKY<m)}-X|%*UB*-K^VpKu_kr|$6SKq3
zBxuD9;VM*CDoL%Bxu|F_FC^vtLOsIH5Hi15x{giS<&?D7YP*|Vu%e1UYHG<Ia|>l|
zwFePZV^uR!FKtm8+&~Gt)DlKfaDSp(XD8Bx>sdSsxd$cN6#7_!m=A>Xob*j5%IRbb
zL+IeOburN9EZZ>Z9V|2W!Ll&m3Wh3Gp-TYt&PcD{jknNG3RUzoTSoVzE3-^Q04Zo>
zo;@!8+wSODeZ97yngE&Z;n_3~QezZYX6lH()hmh|!W>Kvk9*v*4a;;;uE^_s5$88j
z at v}80$2lr=(S2WP{rV(s;4ea&y7i}<7XxY=T&X^_9 at OJUZ0sn8#??REOF5?yT1o`-
zcy<DL5doHz!f9E{<fTfmQX!}Y%M-=i;%0X+Jx>532%O{1)9c9x=V!U)kdGqd6mgst
zjK)D-dV{YE!y_F;(H;WUcZBDP7GSpl>Q%HuunND8;a5<kIK*d+K(2!Fz!Oh#=$<^p
z>kUr6+R98O-cNL&bM=ik$%oZJ^bN~{`Ou$DNS at CB>aXDEiy1~>dAVzrxJXf|%q~{3
zV+sT$5OlN3ch~51Ia#f2Dy#?LDRKz$p>(uvXKchk3lKrb!5U$BE`ni$=yiZPfK<rg
zYnb_U6o&@}i_mL*z<q)|&?x|~J;0yf-2?K6*z?EVKOIQ7yoM|oQiY8*%#1O^7E*?u
z-p<?SWb>&CDbpRi{y#a8x>Lvn-cH8Z2YFcxCWPvAg{g4_(vBgWOcI!oCDiIr*tgFD
z0>S>ZbG=}lo*<*B9x-NM2+WPPzk!<HMsV7_V&uli1OX4Z at xU8D;?H~^37()8z&rfK
zS%FTfNiC(G!Ur8JIh=}>bHFPppF5E{UBX{72*x15C{|HfBzB=y)?!u4((=0EgFLA_
z6`T@*qVPu%h`}%=g4~IcPci+B9 at -2D7oZGStf5opdO-$lH-c!vJHV>+`Sv#v^E=-M
zy2;5mj{xJ#ck$qxWMVRMnc%^tr=x`E2j(mK&uiab at cCNZ3*<F(DU6ZBzMlqxHl6>;
z{}ciWc1dFPu?S2#l*O}QL#Hy~RyUEaitnx6%8J5aG?N#&&2ooOFi*BoP^rKruGE6e
zcty2q{Z3UiqprS6E6a<naF;v52(rgLB$r7ex3}|BCE38KZgP=@Uqa`$qwQoaKn2eM
zQx?{@cjSX0H_X#1igFi>4e(ctyDh^*`q;E_{?+fE^2WEl1@`Khci${^T>BfB-uBvB
zW<T=_QndWj1fbL5|7!xGus>Rm+Rso1^=^H?Vo|byTTbgxVWRzkrjj8ud(@m}8ax_s
zY?YdiajB#$UkG9tIz0b*bBDr_s}UX3GqXvExGLdpADx_<N=|a(vSM72{6LTOg_bEO
z96HaBni;B6$=#yKh^D3SfLn`xNz(xaq;6~MP}O=w*YKQZASmhKGMJPz{dL(6=Wx4z
zxY#0O*W7OW^ch&P^V*<rZcHEOj%Tm^GTLEyhuKe%xnTWR==CH4 at TPOcaz|iNbzSr;
hkbP~>i0<KBBG(f4)sTH|??)*v#tHD4dIx-5{{eRIt*Zb4
literal 0
HcmV?d00001
diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index b379917..9c70d56 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -63,17 +63,30 @@ if ($importid) {
}
if ($view eq 'card') {
-$xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
-my $xslfile = C4::Context->config('opachtdocs')."/prog/en/xslt/compact.xsl";
-my $parser = XML::LibXML->new();
-my $xslt = XML::LibXSLT->new();
-my $source = $parser->parse_string($xmlrecord);
-my $style_doc = $parser->parse_file($xslfile);
-my $stylesheet = $xslt->parse_stylesheet($style_doc);
-my $results = $stylesheet->transform($source);
-my $newxmlrecord = $stylesheet->output_string($results);
-#warn $newxmlrecord;
-print $input->header(), $newxmlrecord;
+ $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
+ my $xslfile = C4::Context->config('opachtdocs')."/prog/en/xslt/compact.xsl";
+ my $parser = XML::LibXML->new();
+ my $xslt = XML::LibXSLT->new();
+ my $source = $parser->parse_string($xmlrecord);
+ my $style_doc = $parser->parse_file($xslfile);
+ my $stylesheet = $xslt->parse_stylesheet($style_doc);
+ my $results = $stylesheet->transform($source);
+ my $newxmlrecord = $stylesheet->output_string($results);
+ #warn $newxmlrecord;
+ print $input->header(), $newxmlrecord;
+ exit;
+} elsif ($view eq 'html'){
+ $xmlrecord = GetXmlBiblio($biblionumber) unless $xmlrecord;
+ my $xslfile = C4::Context->config('opachtdocs')."/prog/en/xslt/MARC21slim2OPACMARCdetail.xsl";
+ my $parser = XML::LibXML->new();
+ my $xslt = XML::LibXSLT->new();
+ my $source = $parser->parse_string($xmlrecord);
+ my $style_doc = $parser->parse_file($xslfile);
+ my $stylesheet = $xslt->parse_stylesheet($style_doc);
+ my $results = $stylesheet->transform($source);
+ my $newxmlrecord = $stylesheet->output_string($results);
+ #warn $newxmlrecord;
+ print $input->header(), $newxmlrecord;
exit;
} else {
$record =GetMarcBiblio($biblionumber) unless $record;
--
1.7.3.2
More information about the Koha-patches
mailing list