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

[patch] Bug 16111: Fix atom support

Bug-16111-Fix-atom-support.patch (text/plain), 5.08 KB, created by Jonathan Druart on 2018-06-18 20:51:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-06-18 20:51:39 UTC

Size: 5.08 KB

patch

obsolete

>From 098cf0203585182ec6b76e4faaa785b4c8158e42 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
>
>---
> .../bootstrap/en/modules/opac-opensearch.tt        | 25 +++++++++++-----------
> 1 file changed, 13 insertions(+), 12 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 ce887f65d1..a9be7d7099 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>@@ -69,7 +69,7 @@
>        xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
>    <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 %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;format=rss2"/>
>+    <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>
>@@ -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 %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=[% page %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="self" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="first" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=1&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="previous" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=2&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="next" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=4&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="last" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi %][% limit_cgi %]pw=42299&amp;format=atom" type="application/atom+xml"/>
>+   <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |url %] [% SEARCH_RESULT.limit_desc |url%]" startPage="[% page |html %]" />
>+   <link rel="alternate" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]pw=[% page %]&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="self" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="first" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]pw=1&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="previous" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]pw=2&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="next" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]pw=4&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="last" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi %][% SEARCH_RESULT.limit_cgi %]pw=42299&amp;format=atom" type="application/atom+xml"/>
>    <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
> 
>    [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
>    <entry>
>-     <title>[% SEARCH_RESULT.title |html %]</title>
>-     <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]"/>
>+     <title>[% SEARCH_RESULT.title |html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield |html %][% END %]</title>
>+     <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% END %][% END %]</link>
>      
>      <updated>[% SEARCH_RESULT.timestamp %]</updated>
>-     <content type="text">
>-     </content>
>      <id>[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]</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