Bugzilla – Attachment 36762 Details for
Bug 13591
Rss sample templates have hardcoded urls
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
0001-Bug-13591-Pass-OPACBaseURL-to-rss-creation-process.patch (text/plain), 6.81 KB, created by
Colin Campbell
on 2015-03-10 12:25:05 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Colin Campbell
Created:
2015-03-10 12:25:05 UTC
Size:
6.81 KB
patch
obsolete
>From 5e0f7fce4f9cd0709cc3fed0c5d42283782cda7e Mon Sep 17 00:00:00 2001 >From: Colin Campbell <colin.campbell@ptfs-europe.com> >Date: Tue, 10 Mar 2015 12:15:28 +0000 >Subject: [PATCH] Bug 13591 Pass OPACBaseURL to rss creation process > >Links in rss templates were hardcoded to library.org.nz. Should pass and >use the system's OPACBaseURL. >--- > misc/cronjobs/rss/lastAcquired-1.0.tt | 8 ++++---- > misc/cronjobs/rss/lastAcquired-2.0.tt | 4 ++-- > misc/cronjobs/rss/lastAcquired.tt | 2 +- > misc/cronjobs/rss/longestUnseen.tt | 2 +- > misc/cronjobs/rss/mostReserved.tt | 2 +- > misc/cronjobs/rss/rss.pl | 1 + > 6 files changed, 10 insertions(+), 9 deletions(-) > >diff --git a/misc/cronjobs/rss/lastAcquired-1.0.tt b/misc/cronjobs/rss/lastAcquired-1.0.tt >index 566b614..c6ff6f7 100644 >--- a/misc/cronjobs/rss/lastAcquired-1.0.tt >+++ b/misc/cronjobs/rss/lastAcquired-1.0.tt >@@ -18,21 +18,21 @@ > <items> > <rdf:Seq> > [% FOREACH i IN ITEMS %] >- <rdf:li resource="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% ibiblionumber %]"/> >+ <rdf:li resource="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% ibiblionumber %]"/> > [% END %] > </rdf:Seq> > </items> > </channel> > > [% FOREACH i IN ITEMS %] >- <item rdf:about="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]"> >+ <item rdf:about="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]"> > <title>[% i.TITLE %][% IF i.AUTHOR %] by [% i.AUTHOR %][% END %]</title> >- <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]</link> >+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber %]</link> > <description><![CDATA[[% TITLE %][% IF i.AUTHOR %] by [% i.AUTHOR %][% END %] > <br>[% place %] [% i.publishercode %] [% i.publicationyear %] > <br>[% pages %] [% i.illus %] [% i.size %] > [% IF i.notes %]<br><br>[% i.notes %][% END %]<br> >-<a href="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]">View Details</a> | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber %]">Reserve this Item</a>[% IF i.author %] | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] >+<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]">View Details</a> | <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] > ]]></description> > </item> > [% END %] >diff --git a/misc/cronjobs/rss/lastAcquired-2.0.tt b/misc/cronjobs/rss/lastAcquired-2.0.tt >index 45f7e0e..820b26d 100644 >--- a/misc/cronjobs/rss/lastAcquired-2.0.tt >+++ b/misc/cronjobs/rss/lastAcquired-2.0.tt >@@ -20,12 +20,12 @@ > [% FOREACH i IN ITEMS %] > <item> > <title>[% i.TITLE %][% IF i.AUTHOR %] by [% i.AUTHOR %][% END %]</title> >- <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]</link> >+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]</link> > <description><![CDATA[[% i.TITLE %][% IF i.AUTHOR %] by [% i.AUTHOR %][% END %] > <br>[% IF i.publishercode %][% i.place %] [% i.publishercode %] [% publicationyear %]<br>[% END %] > [% IF i.pages %][% i.pages %][% i.illus %][% i.size %][% END %] > [% IF i.notes %]<p>[% i.notes %]</p>[% END %]<br> >-<a href="http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]">View Details</a> | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber %]">Reserve this Item</a>[% IF i.author %] | <a href="http://opac.library.org.nz/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] >+<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]">View Details</a> | <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] > ]]></description> > </item> > [% END %] >diff --git a/misc/cronjobs/rss/lastAcquired.tt b/misc/cronjobs/rss/lastAcquired.tt >index fb8de72..c06413f 100644 >--- a/misc/cronjobs/rss/lastAcquired.tt >+++ b/misc/cronjobs/rss/lastAcquired.tt >@@ -21,7 +21,7 @@ > [% FOREACH i IN ITEMS %] > <item> > <title>[% i.TITLE %], by [% i.AUTHOR %]</title> >- <link>http://opac.library.org.nz/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]</link> >+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber %]</link> > > </item> > [% END %] >diff --git a/misc/cronjobs/rss/longestUnseen.tt b/misc/cronjobs/rss/longestUnseen.tt >index 4f70e9b..8e2395a 100644 >--- a/misc/cronjobs/rss/longestUnseen.tt >+++ b/misc/cronjobs/rss/longestUnseen.tt >@@ -21,7 +21,7 @@ > [% FOREACH i IN ITEMS %] > <item> > <title>[% i.TITLE %], by [% i.AUTHOR %]</title> >- <link>http://opac.library.org.nz/cgi-bin/koha/opac-searchresults.pl?isbn=[% i.ISBN %]</link> >+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-searchresults.pl?isbn=[% i.ISBN %]</link> > > </item> > [% END %] >diff --git a/misc/cronjobs/rss/mostReserved.tt b/misc/cronjobs/rss/mostReserved.tt >index 3687451..d25205a 100644 >--- a/misc/cronjobs/rss/mostReserved.tt >+++ b/misc/cronjobs/rss/mostReserved.tt >@@ -21,7 +21,7 @@ > [% FOREACH i IN ITEMS %] > <item> > <title>[% TITLE %], by [% AUTHOR %]</title> >- <link>http://opac.library.org.nz/cgi-bin/koha/opac-searchresults.pl?isbn=[% ISBN %]</link> >+ <link>[% OPACBaseURL %]/cgi-bin/koha/opac-searchresults.pl?isbn=[% ISBN %]</link> > > </item> > [% END %] >diff --git a/misc/cronjobs/rss/rss.pl b/misc/cronjobs/rss/rss.pl >index 355d74a..60e34fb 100755 >--- a/misc/cronjobs/rss/rss.pl >+++ b/misc/cronjobs/rss/rss.pl >@@ -41,6 +41,7 @@ my $feed = Template->new(); > my %channel = getConf("channel"); > my %image = getConf("image"); > my $vars = { >+ OPACBaseURL => C4::Context->preference('OPACBaseURL'), > CHANNELTITLE => $channel{'title'}, > CHANNELLINK => $channel{'link'}, > CHANNELDESC => $channel{'desc'}, >-- >2.1.0 >
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 13591
:
36762
|
38902
|
38972