Bugzilla – Attachment 78581 Details for
Bug 16111
RSS feed for OPAC search results has wrong content type
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16111: (follow-up) Fixes for simplicity and validation
Bug-16111-follow-up-Fixes-for-simplicity-and-valid.patch (text/plain), 24.86 KB, created by
Owen Leonard
on 2018-09-11 21:12:12 UTC
(
hide
)
Description:
Bug 16111: (follow-up) Fixes for simplicity and validation
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-09-11 21:12:12 UTC
Size:
24.86 KB
patch
obsolete
>From ed566617d82ce1be66ad4a2499cbd55a6bb17f58 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 17 Jul 2018 15:54:06 +0000 >Subject: [PATCH] Bug 16111: (follow-up) Fixes for simplicity and validation > >This patch simplifies the OPAC search results feed template by adding >BLOCKs for a couple of repeated sections. The same is done for the feed >URL in the search results template. > >This patch also makes some changes to the markup of the rss and Atom >feeds to improve their validity. > >To test, apply the patch and perform a search in the OPAC. Clicking the >RSS icon at the top of the search results page should bring up the RSS >feed, which should render correctly. > >If you validate the source it should return only a couple of >"recommendations:" > - "Self reference doesn't match document location" > - "Unregistered link relationship: search" > >Perform the same test with the Atom feed by modifying the URL of the RSS >feed in your browser so that it ends in "format=atom" instead of >"format=rss" > >The Atom feed has some more serious validation issues but should be >functional. >--- > .../bootstrap/en/modules/opac-opensearch.tt | 241 ++++++++++++--------- > .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 10 +- > 2 files changed, 147 insertions(+), 104 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >index 5aafb25..3d25b94 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -1,109 +1,150 @@ > <?xml version='1.0' encoding='utf-8' ?> > [% USE Koha %] >+[% BLOCK item_description %] >+ <![CDATA[ >+ [% IF ( OPACAmazonCoverImages ) %] >+ [% IF ( SEARCH_RESULT.normalized_isbn ) %] >+ <img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn | html %].01.TZZZZZZZ.jpg" alt="" /> >+ [% END %] >+ [% END %] >+ [% IF ( SyndeticsEnabled ) %] >+ [% IF ( SyndeticsCoverImages ) %] >+ [% IF ( SEARCH_RESULT.content_identifier_exists ) %] >+ <img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | html %]/SC.GIF&client=[% SEARCH_RESULT.SyndeticsClientCode %]&type=xw10[% IF ( SEARCH_RESULT.normalized_upc ) %]&upc=[% SEARCH_RESULT.normalized_upc | html %][% END %][% IF ( SEARCH_RESULT.normalized_oclc ) %]&oclc=[% SEARCH_RESULT.normalized_oclc | html %][% END %]" alt="" /> >+ [% ELSE %] >+ <img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | html %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% SEARCH_RESULT.normalized_upc | html %]&oclc=[% SEARCH_RESULT.normalized_oclc | html %]" alt="" /> >+ [% END %] >+ [% END %] >+ [% END %] >+ [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >+ [% IF ( BakerTaylorEnabled ) %] >+ [% IF bt_id %] >+ <a href="https://[% BakerTaylorBookstoreURL | url %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | html %]" /></a> >+ [% END %] >+ [% END %] >+ <p> >+ [% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %] >+ [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %] >+ [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %] >+ [% IF ( SEARCH_RESULT.publicationyear ) %] >+ [% SEARCH_RESULT.publicationyear | html %] >+ [% ELSE %] >+ [% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %] >+ [% END %] >+ [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages | html %][% END %] >+ [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes | html %][% END %] >+ [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size | html %]. [% END %] >+ [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %] >+ </p> >+ [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] >+ <p><a href="[% OPACBaseURL %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p> >+ [% END %] >+ ]]> >+[% END %] >+[% BLOCK feed_url %][% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi |uri %]&count=[% countrss |uri %]&offset=[% offset %]&sort_by=acqdate_dsc&format=[% END %] >+ > [% IF ( opensearchdescription ) %] >-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> >- <ShortName>[% LibraryName | html %] Search</ShortName> >- <Description>Search the [% LibraryName | html %]</Description> >- <Tags>koha opac [% LibraryName | html %]</Tags> >- <Contact>[% KohaAdminEmailAddress | html %]</Contact> >- <Url type="application/rss+xml" >- template="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss"/> >-</OpenSearchDescription> > >-[% ELSE %] >+ <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> >+ <ShortName>[% LibraryName | html %] Search</ShortName> >+ <Description>Search the [% LibraryName | html %]</Description> >+ <Tags>koha opac [% LibraryName | html %]</Tags> >+ <Contact>[% KohaAdminEmailAddress | html %]</Contact> >+ <Url type="application/rss+xml" >+ template="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss"/> >+ </OpenSearchDescription> > >-[% IF ( rss ) %] >-<rss version="2.0" >- xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" >- xmlns:dc="http://purl.org/dc/elements/1.1/" >- xmlns:atom="http://www.w3.org/2005/Atom"> >- <channel> >- <title><![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]></title> >- <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss</link> >- <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&sort_by=[% sort_by | uri %]&format=atom"/> >- <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] at [% LibraryName | html %]]]></description> >- <opensearch:totalResults>[% total | html %]</opensearch:totalResults> >- <opensearch:startIndex>[% offset | html %]</opensearch:startIndex> >- [% IF ( results_per_page ) %] >- <opensearch:itemsPerPage>[% results_per_page | html %]</opensearch:itemsPerPage> >- [% ELSE %] >- <opensearch:itemsPerPage>20</opensearch:itemsPerPage> >- [% END %] >- [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] >- <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html |uri %][% SEARCH_RESULT.limit_cgi | html |uri %]&sort_by=[% SEARCH_RESULT.sort_by |uri %]&format=opensearchdescription"/> >- <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |uri %][% SEARCH_RESULT.limit_desc |uri %]" startPage="[% SEARCH_RESULT.page | html %]" /> >- <item> >- <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title> >- <dc:identifier>ISBN [% SEARCH_RESULT.isbn | html %]</dc:identifier> >- <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]</link> >- <description><![CDATA[ >-[% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn | html %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %] >-[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %]<img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | html %]/SC.GIF&client=[% SEARCH_RESULT.SyndeticsClientCode | html %]&type=xw10[% IF ( SEARCH_RESULT.normalized_upc ) %]&upc=[% SEARCH_RESULT.normalized_upc | html %][% END %][% IF ( SEARCH_RESULT.normalized_oclc ) %]&oclc=[% SEARCH_RESULT.normalized_oclc | html %][% END %]" alt="" /> > [% ELSE %] >-<img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn | html %]/SC.GIF&client=[% SyndeticsClientCode | html %]&type=xw10&upc=[% SEARCH_RESULT.normalized_upc | html %]&oclc=[% SEARCH_RESULT.normalized_oclc | html %]" alt="" /> >-[% END %][% END %][% END %] >+ [% IF ( rss ) %] >+ <rss version="2.0" >+ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" >+ xmlns:dc="http://purl.org/dc/elements/1.1/" >+ xmlns:atom="http://www.w3.org/2005/Atom"> >+ <channel> >+ <title><![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]></title> >+ <link>[% PROCESS feed_url %]rss</link> >+ <atom:link rel="self" type="application/rss+xml" href="[% PROCESS feed_url %]rss"/> >+ <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] at [% LibraryName | html %]]]></description> >+ <opensearch:totalResults>[% total | html %]</opensearch:totalResults> >+ <opensearch:startIndex>[% offset | html %]</opensearch:startIndex> >+ [% IF ( results_per_page ) %] >+ <opensearch:itemsPerPage>[% results_per_page | html %]</opensearch:itemsPerPage> >+ [% ELSE %] >+ <opensearch:itemsPerPage>20</opensearch:itemsPerPage> >+ [% END %] >+ <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&sort_by=[% sort_by | uri %]&format=opensearchdescription"/> >+ <opensearch:Query role="request" searchTerms="[% query_desc | uri %][% limit_desc | uri %]" startPage="[% page | html %]" /> >+ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] >+ <item> >+ <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title> >+ <dc:identifier>ISBN [% SEARCH_RESULT.isbn | html %]</dc:identifier> >+ <link> >+ [% IF ( BiblioDefaultViewmarc ) %] >+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %] >+ [% ELSE %] >+ [% IF ( BiblioDefaultViewisbd ) %] >+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %] >+ [% ELSE %] >+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %] >+ [% END %] >+ [% END %] >+ </link> >+ <description> >+ [% PROCESS item_description %] >+ </description> >+ <guid>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</guid> >+ </item> >+ [% END %] >+ </channel> >+ </rss> >+ [% END # /IF rss %] > >-[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] >-[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | html %]" /></a>[% END %][% END %] >- <p>[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %] >- [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %] >- [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %][% END %] >- [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages | html %][% END %] >- [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes | html %][% END %] >- [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size | html %]. [% END %] >- [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %] >- </p> >-[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] >-<p><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p> >-[% END %] >- ]]></description> >- <guid>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</guid> >- </item> >- [% END %] >- </channel> >-</rss> >-[% END %] >+ [% IF ( atom ) %] >+ <feed xmlns="http://www.w3.org/2005/Atom" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"> >+ <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=atom</id> >+ <title>[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]</title> >+ <link href="[% PROCESS feed_url %]atom"/> >+ [% IF ( timestamp ) %]<updated>[% timestamp | html %]</updated>[% END %] >+ <author> >+ <name>[% LibraryName | html %]</name> >+ </author> >+ <!-- <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id> --> >+ <opensearch:totalResults>[% total | html %]</opensearch:totalResults> >+ <opensearch:startIndex>[% page | html %]</opensearch:startIndex> >+ [% IF ( results_per_page ) %] >+ <opensearch:itemsPerPage>[% results_per_page | html %]</opensearch:itemsPerPage> >+ [% ELSE %] >+ <opensearch:itemsPerPage>20</opensearch:itemsPerPage> >+ [% END %] >+ <opensearch:Query role="request" searchTerms="[% query_desc | url %][% limit_desc | url%]" startPage="[% page | html %]" /> >+ <link rel="alternate" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=[% page | html %]&format=atom" type="application/atom+xml"/> >+ <link rel="self" href="[% PROCESS feed_url %]atom" type="application/atom+xml"/> >+ <link rel="first" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=1&format=atom" type="application/atom+xml"/> >+ <link rel="previous" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=2&format=atom" type="application/atom+xml"/> >+ <link rel="next" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=4&format=atom" type="application/atom+xml"/> >+ <link rel="last" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=42299&format=atom" type="application/atom+xml"/> >+ <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/> > >-[% IF ( atom ) %] >-<feed xmlns="http://www.w3.org/2005/Atom" >- xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"> >- <id>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=atom</id> >- <title>[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]</title> >- <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&format=atom"/> >- <updated>[% timestamp %]</updated> >- <author> >- <name>[% LibraryName | html %]</name> >- </author> >- <!-- <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id> --> >- <opensearch:totalResults>[% total | html %]</opensearch:totalResults> >- <opensearch:startIndex>[% page | html %]</opensearch:startIndex> >- [% IF ( results_per_page ) %] >- <opensearch:itemsPerPage>[% results_per_page | html %]</opensearch:itemsPerPage> >- [% ELSE %] >- <opensearch:itemsPerPage>20</opensearch:itemsPerPage> >- [% END %] >- <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc | html %] [% SEARCH_RESULT.limit_desc | html %]" startPage="[% page | html %]" /> >- <link rel="alternate" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html %][% SEARCH_RESULT.limit_cgi | html %]pw=[% page %]&format=atom" type="application/atom+xml"/> >- <link rel="self" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html %][% SEARCH_RESULT.limit_cgi | html %]&format=atom" type="application/atom+xml"/> >- <link rel="first" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html %][% SEARCH_RESULT.limit_cgi | html %]pw=1&format=atom" type="application/atom+xml"/> >- <link rel="previous" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html %][% SEARCH_RESULT.limit_cgi | html %]pw=2&format=atom" type="application/atom+xml"/> >- <link rel="next" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html %][% SEARCH_RESULT.limit_cgi | html %]pw=4&format=atom" type="application/atom+xml"/> >- <link rel="last" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | html %][% SEARCH_RESULT.limit_cgi | html %]pw=42299&format=atom" type="application/atom+xml"/> >- <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/> >+ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] >+ <entry> >+ <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title> >+ [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %] >+ <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]" /> >+ [% ELSE %] >+ [% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %] >+ <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]" /> >+ [% ELSE %] >+ <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]" /> >+ [% END %] >+ [% END %] >+ [% IF ( SEARCH_RESULT.dateaccessioned ) %]<updated>[% SEARCH_RESULT.dateaccessioned | html %]</updated>[% END %] >+ <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</id> >+ <summary type="html"> >+ [% PROCESS item_description %] >+ </summary> >+ </entry> >+ [% END %] >+ </feed> >+ [% END # /IF atom %] > >- [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] >- <entry> >- <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title> >- <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]</link> >- <!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> --> >- <updated>[% SEARCH_RESULT.timestamp | html %]</updated> >- <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</id> >- <content type="text"> >- >- </content> >- </entry> >- [% END %] >- </feed> >-[% END %] >- >-[% END %] >+[% END # /IF opensearchdescription %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index 60202fe8..055a206 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -17,8 +17,10 @@ > [% Asset.css("css/jquery.rating.css") | $raw %] > [% END %] > [% END %] >- >-<link rel="alternate" type="application/rss+xml" title="[% LibraryName | html %] Search RSS feed" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | uri %]&count=[% countrss | uri %]&sort_by=acqdate_dsc&format=rss" /> >+[% BLOCK rss_feed %] >+ [% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&count=[% countrss |uri %]&offset=[% offset | html %]&sort_by=acqdate_dsc&format=rss >+[% END %] >+<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS feed" href="[% PROCESS rss_feed %]" /> > </head> > > [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %] >@@ -43,7 +45,7 @@ > <strong>No results found!</strong> > <p> > [% IF ( searchdesc ) %] >- No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&format=rss" class="rsssearchlink noprint"><img src="[% interface %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> >+ No results found for that in [% LibraryName | html %] catalog. <a href="[% PROCESS rss_feed %]" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> > [% ELSE %] > You did not specify any search criteria. > [% END %] >@@ -87,7 +89,7 @@ > [% END %] > ). > [% END %] >- <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&count=[% countrss | html %]&sort_by=acqdate_dsc&format=rss" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> >+ <a href="[% PROCESS rss_feed %]" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> > [% END # / IF total %] > </p> > [% END # / IF searchdesc %] >-- >2.1.4
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 16111
:
49400
|
49587
|
49629
|
49837
|
76148
|
76160
|
76161
|
76162
|
77057
|
77058
|
77059
|
77060
|
78578
|
78579
|
78580
|
78581
|
78689
|
81285
|
81286
|
81287
|
81288
|
92050
|
92362
|
92363
|
92366
|
92435
|
92436
|
92437
|
92438
|
92439
|
92618
|
92619
|
92620
|
92621
|
92622
|
92623
|
92624