[Koha-patches] [PATCH] Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display"

Owen Leonard Wed, 10 Sep 2008 06:11:37 -0700

---
 catalogue/MARCdetail.pl                            |    4 ++--
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)


diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 1b4860a..d10d4ba 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -181,8 +181,8 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
                 if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
                     ->{isurl} )
                 {
-                    $subfield_data{marc_value} =
-                      "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+                    $subfield_data{marc_value} = $subf[$i][1];
+                                       $subfield_data{is_url} = 1;
                 }
                 elsif ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
                     ->{kohafield} eq "biblioitems.isbn" )
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl 
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index f88478b..267aa12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -89,7 +89,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR 
NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -119,7 +119,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -149,7 +149,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -179,7 +179,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -209,7 +209,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" 
-->"> alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -239,7 +239,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -269,7 +269,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -299,7 +299,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -329,7 +329,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
@@ -359,7 +359,7 @@ function Changefwk(FwkList) {
                     <span class="subfield-label">&nbsp;
                     <!-- TMPL_UNLESS name="hide_marc" --><b><!-- TMPL_VAR 
NAME="marc_subfield" --></b><!-- /TMPL_UNLESS -->
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- 
TMPL_VAR NAME="short_desc" --></span></span>
-                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->
+                    <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR 
NAME="marc_value" escape="url" -->"><!-- TMPL_VAR NAME="marc_value" 
escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" 
ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a 
href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR 
NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" 
ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" 
alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
-- 
1.5.5.GIT

_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches

[Koha-patches] [PATCH] Fix for Bug 2596, "restore ability to hyperlink URL fields in MARC detail display"

Reply via email to