Attachment #92618 for bug #16111

View | Details | Raw Unified | Return to bug 16111
Collapse All | Expand All




   <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}&amp;pw={startPage?}&amp;format=rss"/>
</OpenSearchDescription>

[% ELSE %]

[% 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 href=[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss</link>
     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;sort_by=[% sort_by | uri %]&amp;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>

       <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
     [% END %]
	 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]&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>[% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]</title>
       <dc:identifier>ISBN [% SEARCH_RESULT.isbn | html %]</dc:identifier>
        [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]
            <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]" />
        [% ELSIF ( 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 %]
       <description><![CDATA[
[% IF ( AdlibrisEnabled && SEARCH_RESULT.normalized_isbn ) %]
    <img src="[% AdlibrisURL | html %]?isbn=[% SEARCH_RESULT.normalized_isbn | html %]" alt="Adlibris cover image" />

[% 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 | $raw %][% limit_cgi | $raw %]&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 | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss2"/>
   <updated>[% timestamp | html %]</updated>
   <author>
     <name>[% LibraryName | html %]</name>

   [% 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 | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]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 | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]&amp;format=atom" type="application/atom+xml"/>
   <link rel="first" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | $raw  %][% SEARCH_RESULT.limit_cgi | $raw %]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 | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]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 | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]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 | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]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 %] [% 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>
     <content type="text"><!-- put content here -->
     </content>
     <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</id>
     <content type="text">

     </content>
   </entry>
   [% END %]
 </feed>




[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]

<link rel="alternate" type="application/rss+xml" title="[% LibraryName | html %] Search RSS feed" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;count=[% countrss |uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" />
</head>
[% BLOCK cssinclude %][% END %]
[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]

                        <p>
                            [% IF ( searchdesc ) %]
                                No results found for that in [% LibraryName | html %] catalog.
                                <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss" class="rsssearchlink noprint">
                                    <i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>
                                </a>
                            [% ELSE %]

                                [% END %]
                            ).
                        [% END %]
                        <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss" class="rsssearchlink noprint">
                            <i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>
                        </a>
                    [% END # / IF total %]

Lines 72-78 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (-2 / +2 lines)
72	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>	72	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>
73	<td><span title="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</span></td>	73	<td><span title="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</span></td>
74	<td>	74	<td>
75	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&[% s.query_cgi \| $raw %]&count=[% countrss \| uri %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink">	75	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&[% s.query_cgi \| $raw %]&count=[% countrss \| uri %]&sort_by=acqdate_dsc&format=rss" class="rsssearchlink">
76	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>	76	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>
77	</a>	77	</a>
78	<a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi \| $raw %]">[% s.query_desc \| html %]</a>	78	<a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi \| $raw %]">[% s.query_desc \| html %]</a>
Lines 117-123 Link Here
117	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>	117	<td><input type="checkbox" name="id" value="[% s.id \| html %]" /></td>
118	<td><span title="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</span></td>	118	<td><span title="[% s.time \| html %]">[% s.time \|$KohaDates with_hours => 1 %]</span></td>
119	<td>	119	<td>
120	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&[% s.query_cgi \| $raw %]&count=[% countrss \| uri %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink">	120	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&[% s.query_cgi \| $raw %]&count=[% countrss \| uri %]&sort_by=acqdate_dsc&format=rss" class="rsssearchlink">
121	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>	121	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>
122	</a>	122	</a>
123	<a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi \| $raw %]">	123	<a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi \| $raw %]">

Return to bug 16111

Lines 11-30 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt (-20 / +27 lines)
11	<Tags>koha opac [% LibraryName \| html %]</Tags>	11	<Tags>koha opac [% LibraryName \| html %]</Tags>
12	<Contact>[% KohaAdminEmailAddress \| html %]</Contact>	12	<Contact>[% KohaAdminEmailAddress \| html %]</Contact>
13	<Url type="application/rss+xml"	13	<Url type="application/rss+xml"
14	template="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss2"/>	14	template="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss"/>
15	</OpenSearchDescription>	15	</OpenSearchDescription>
16		16
17	[% ELSE %]	17	[% ELSE %]
18		18
19	[% IF ( rss2 ) %]	19	[% IF ( rss ) %]
20	<rss version="2.0"	20	<rss version="2.0"
21	xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"	21	xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
22	xmlns:dc="http://purl.org/dc/elements/1.1/"	22	xmlns:dc="http://purl.org/dc/elements/1.1/"
23	xmlns:atom="http://www.w3.org/2005/Atom">	23	xmlns:atom="http://www.w3.org/2005/Atom">
24	<channel>	24	<channel>
25	<title><![CDATA[[% LibraryName \| html %] Search [% IF ( query_desc ) %]for '[% query_desc \| html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc \| html %]'[% END %]]]></title>	25	<title><![CDATA[[% LibraryName \| html %] Search [% IF ( query_desc ) %]for '[% query_desc \| html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc \| html %]'[% END %]]]></title>
26	<link>[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]&format=rss2</link>	26	<link href=[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=rss</link>
27	<atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]&sort_by=[% sort_by \| uri %]&format=rss2"/>	27	<atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&sort_by=[% sort_by \| uri %]&format=atom"/>
28	<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>	28	<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>
29	<opensearch:totalResults>[% total \| html %]</opensearch:totalResults>	29	<opensearch:totalResults>[% total \| html %]</opensearch:totalResults>
30	<opensearch:startIndex>[% offset \| html %]</opensearch:startIndex>	30	<opensearch:startIndex>[% offset \| html %]</opensearch:startIndex>
Lines 34-45 Link Here
34	<opensearch:itemsPerPage>20</opensearch:itemsPerPage>	34	<opensearch:itemsPerPage>20</opensearch:itemsPerPage>
35	[% END %]	35	[% END %]
36	[% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]	36	[% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
37	<atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| url %]&sort_by=[% SEARCH_RESULT.sort_by \|uri %]&format=opensearchdescription"/>	37	<atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]&sort_by=[% SEARCH_RESULT.sort_by \|uri %]&format=opensearchdescription"/>
38	<opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc \|uri %][% SEARCH_RESULT.limit_desc \|uri %]" startPage="[% SEARCH_RESULT.page \| html %]" />	38	<opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc \|uri %][% SEARCH_RESULT.limit_desc \|uri %]" startPage="[% SEARCH_RESULT.page \| html %]" />
39	<item>	39	<item>
40	<title>[% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]</title>	40	<title>[% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]</title>
41	<dc:identifier>ISBN [% SEARCH_RESULT.isbn \| html %]</dc:identifier>	41	<dc:identifier>ISBN [% SEARCH_RESULT.isbn \| html %]</dc:identifier>
42	<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>	42	[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]
		43	<link href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| html %]" />
		44	[% ELSIF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %]
		45	<link href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| html %]" />
		46	[% ELSE %]
		47	<link href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| html %]" />
		48	[% END %]
43	<description><![CDATA[	49	<description><![CDATA[
44	[% IF ( AdlibrisEnabled && SEARCH_RESULT.normalized_isbn ) %]	50	[% IF ( AdlibrisEnabled && SEARCH_RESULT.normalized_isbn ) %]
45	<img src="[% AdlibrisURL \| html %]?isbn=[% SEARCH_RESULT.normalized_isbn \| html %]" alt="Adlibris cover image" />	51	<img src="[% AdlibrisURL \| html %]?isbn=[% SEARCH_RESULT.normalized_isbn \| html %]" alt="Adlibris cover image" />
Lines 75-83 Link Here
75	[% IF ( atom ) %]	81	[% IF ( atom ) %]
76	<feed xmlns="http://www.w3.org/2005/Atom"	82	<feed xmlns="http://www.w3.org/2005/Atom"
77	xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">	83	xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
78	<id>[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| html %]&format=atom</id>	84	<id>[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=atom</id>
79	<title>[% LibraryName \| html %] Search [% IF ( query_desc ) %]for '[% query_desc \| html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc \| html %]'[% END %]</title>	85	<title>[% LibraryName \| html %] Search [% IF ( query_desc ) %]for '[% query_desc \| html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc \| html %]'[% END %]</title>
80	<link href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]&format=rss2"/>	86	<link href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=rss2"/>
81	<updated>[% timestamp \| html %]</updated>	87	<updated>[% timestamp \| html %]</updated>
82	<author>	88	<author>
83	<name>[% LibraryName \| html %]</name>	89	<name>[% LibraryName \| html %]</name>
Lines 90-113 Link Here
90	[% ELSE %]	96	[% ELSE %]
91	<opensearch:itemsPerPage>20</opensearch:itemsPerPage>	97	<opensearch:itemsPerPage>20</opensearch:itemsPerPage>
92	[% END %]	98	[% END %]
93	<opensearch:Query role="request" searchTerms="[% query_desc \| html %] [% limit_desc \| html %]" startPage="[% page \| html %]" />	99	<opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc \| html %] [% SEARCH_RESULT.limit_desc \| html %]" startPage="[% page \| html %]" />
94	<link rel="alternate" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]pw=[% page \| uri %]&format=atom" type="application/atom+xml"/>	100	<link rel="alternate" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]pw=[% page %]&format=atom" type="application/atom+xml"/>
95	<link rel="self" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]&format=atom" type="application/atom+xml"/>	101	<link rel="self" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]&format=atom" type="application/atom+xml"/>
96	<link rel="first" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]pw=1&format=atom" type="application/atom+xml"/>	102	<link rel="first" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]pw=1&format=atom" type="application/atom+xml"/>
97	<link rel="previous" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]pw=2&format=atom" type="application/atom+xml"/>	103	<link rel="previous" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]pw=2&format=atom" type="application/atom+xml"/>
98	<link rel="next" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]pw=4&format=atom" type="application/atom+xml"/>	104	<link rel="next" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]pw=4&format=atom" type="application/atom+xml"/>
99	<link rel="last" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| url %]pw=42299&format=atom" type="application/atom+xml"/>	105	<link rel="last" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi \| $raw %][% SEARCH_RESULT.limit_cgi \| $raw %]pw=42299&format=atom" type="application/atom+xml"/>
100	<link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>	106	<link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL \| html %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
101		107
102	[% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]	108	[% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
103	<entry>	109	<entry>
104	<title>[% SEARCH_RESULT.title \| html %]</title>	110	<title>[% SEARCH_RESULT.title \| html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield \| html %][% END %]</title>
105	<link href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| uri %]"/>	111	<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>
106	<!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> -->	112	<!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> -->
107	<updated>[% SEARCH_RESULT.timestamp \| html %]</updated>	113	<updated>[% SEARCH_RESULT.timestamp \| html %]</updated>
108	<content type="text"><!-- put content here -->
109	</content>
110	<id>[% OPACBaseURL \| html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| html %]</id>	114	<id>[% OPACBaseURL \| html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| html %]</id>
		115	<content type="text">
		116
		117	</content>
111	</entry>	118	</entry>
112	[% END %]	119	[% END %]
113	</feed>	120	</feed>

Lines 24-30 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-3 / +3 lines)
24	[% END %]</title>	24	[% END %]</title>
25	[% INCLUDE 'doc-head-close.inc' %]	25	[% INCLUDE 'doc-head-close.inc' %]
26		26
27	<link rel="alternate" type="application/rss+xml" title="[% LibraryName \| html %] Search RSS feed" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&count=[% countrss \|uri %]&sort_by=acqdate_dsc&format=rss2" />	27	<link rel="alternate" type="application/rss+xml" title="[% LibraryName \| html %] Search RSS feed" href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&count=[% countrss \|uri %]&sort_by=acqdate_dsc&format=rss" />
28	</head>	28	</head>
29	[% BLOCK cssinclude %][% END %]	29	[% BLOCK cssinclude %][% END %]
30	[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]	30	[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
Lines 61-67 Link Here
61	<p>	61	<p>
62	[% IF ( searchdesc ) %]	62	[% IF ( searchdesc ) %]
63	No results found for that in [% LibraryName \| html %] catalog.	63	No results found for that in [% LibraryName \| html %] catalog.
64	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=rss2" class="rsssearchlink noprint">	64	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=rss" class="rsssearchlink noprint">
65	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>	65	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>
66	</a>	66	</a>
67	[% ELSE %]	67	[% ELSE %]
Lines 107-113 Link Here
107	[% END %]	107	[% END %]
108	).	108	).
109	[% END %]	109	[% END %]
110	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=rss2" class="rsssearchlink noprint">	110	<a href="[% OPACBaseURL \| url %]/cgi-bin/koha/opac-search.pl?[% query_cgi \| $raw %][% limit_cgi \| $raw %]&format=rss" class="rsssearchlink noprint">
111	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>	111	<i class="fa fa-rss rsssearchicon" title="Subscribe to this search"></i>
112	</a>	112	</a>
113	[% END # / IF total %]	113	[% END # / IF total %]

Lines 118-123 else { Link Here

(-)a/opac/opac-search.pl (-3 / +5 lines)
118	$template_name = 'opac-advsearch.tt';	118	$template_name = 'opac-advsearch.tt';
119	$template_type = 'advsearch';	119	$template_type = 'advsearch';
120	}	120	}
		121
		122	$format = 'rss' if $format =~ /rss/;
		123
121	# load the template	124	# load the template
122	($template, $borrowernumber, $cookie) = get_template_and_user({	125	($template, $borrowernumber, $cookie) = get_template_and_user({
123	template_name => $template_name,	126	template_name => $template_name,
Lines 142-148 if($cgi->cookie("bib_list")){ Link Here
142	@cart_list = split(/\//, $cart_list);	145	@cart_list = split(/\//, $cart_list);
143	}	146	}
144		147
145	if ($format eq 'rss2' or $format eq 'opensearchdescription' or $format eq 'atom') {	148	if ($format eq 'rss' or $format eq 'opensearchdescription' or $format eq 'atom') {
146	$template->param($format => 1);	149	$template->param($format => 1);
147	$template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime)) if ($format eq 'atom');	150	$template->param(timestamp => strftime("%Y-%m-%dT%H:%M:%S-00:00", gmtime)) if ($format eq 'atom');
148	# FIXME - the timestamp is a hack - the biblio update timestamp should be used for each	151	# FIXME - the timestamp is a hack - the biblio update timestamp should be used for each
Lines 769-775 for (my $i=0;$i<@servers;$i++) { Link Here
769	}	772	}
770		773
771	## If there's just one result, redirect to the detail page	774	## If there's just one result, redirect to the detail page
772	if ($total == 1 && $format ne 'rss2'	775	if ($total == 1 && $format ne 'rss'
773	&& $format ne 'opensearchdescription' && $format ne 'atom') {	776	&& $format ne 'opensearchdescription' && $format ne 'atom') {
774	my $biblionumber=$newresults[0]->{biblionumber};	777	my $biblionumber=$newresults[0]->{biblionumber};
775	if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {	778	if (C4::Context->preference('BiblioDefaultView') eq 'isbd') {
776	-