Attachment 81286 Details for Bug 16111 – Bug 16111: Fix atom support

[patch] Bug 16111: Fix atom support

Bug-16111-Fix-atom-support.patch (text/plain), 6.84 KB, created by Andrew Isherwood on 2018-10-26 13:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2018-10-26 13:22:59 UTC

Size: 6.84 KB

patch

obsolete

>From e5fcc8809fe0a887e571dd66a84c56845f9d480d Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 31 Mar 2016 13:28:02 +0100
>Subject: [PATCH] Bug 16111: Fix atom support
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>---
> .../bootstrap/en/modules/opac-opensearch.tt        | 31 +++++++++++-----------
> 1 file changed, 16 insertions(+), 15 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 c577c50aa4..7bca50de4d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>@@ -30,7 +30,7 @@
>        <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 |uri %][% SEARCH_RESULT.limit_cgi |uri %]&amp;sort_by=[% SEARCH_RESULT.sort_by |uri %]&amp;format=opensearchdescription"/>
>+     <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 %]&amp;sort_by=[% SEARCH_RESULT.sort_by |uri %]&amp;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>
>@@ -67,10 +67,10 @@
> [% 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 %]&amp;format=atom</id>
>+   <id>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;format=atom</id>
>    <title>[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]</title>
>-    <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;format=rss2"/>
>-   <updated>[% timestamp | html %]</updated>
>+    <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;format=atom"/>
>+   <updated>[% timestamp %]</updated>
>    <author>
>      <name>[% LibraryName | html %]</name>
>    </author>
>@@ -82,24 +82,25 @@
>    [% ELSE %]
>      <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
>    [% END %]
>-   <opensearch:Query role="request" searchTerms="[% query_desc | html %] [% limit_desc | html %]" startPage="[% page | html %]" />
>-   <link rel="alternate" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=[% page | html %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="self" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;format=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&amp;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&amp;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&amp;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&amp;format=atom" type="application/atom+xml"/>
>+   <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 %]&amp;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 %]&amp;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&amp;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&amp;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&amp;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&amp;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 %]</title>
>-     <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]"/>
>+     <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>
>      
>      <updated>[% SEARCH_RESULT.timestamp | html %]</updated>
>-     <content type="text">
>-     </content>
>      <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</id>
>+     <content type="text">
>+
>+     </content>
>    </entry>
>    [% END %]
>  </feed>
>-- 
>2.11.0

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