[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 746bd28c045d38313e5b8c66eefd5adb6b3bec0f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  746bd28c045d38313e5b8c66eefd5adb6b3bec0f (commit)
       via  a1cfeda380e2ddd1f2de12a73ef616fbdb6a108c (commit)
      from  8ca1ea0a1abb6bf391135801cf1f808b331fb4cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 746bd28c045d38313e5b8c66eefd5adb6b3bec0f
Author: Ben Shum <bshum at biblio.org>
Date:   Thu Feb 6 00:33:33 2014 -0500

    OpenSearch release note
    
    Add a short release note about the return of OpenSearch support.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt b/docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt
new file mode 100644
index 0000000..82e983b
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt
@@ -0,0 +1,5 @@
+Restore OpenSearch Support
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+Restore previously held functionality from JSPAC to support OpenSearch in TPAC. 
+This allows users to easily add the Evergreen search engine to their browser's 
+built-in set of search engines.

commit a1cfeda380e2ddd1f2de12a73ef616fbdb6a108c
Author: Dan Scott <dscott at laurentian.ca>
Date:   Tue Jan 14 23:46:41 2014 -0500

    Restore OpenSearch support and use TPAC search
    
    This enables users to easily add the Evergreen search engine to their browser's
    built-in set of search engines, and most importantly directs searches to the
    TPAC instead of the weird old Supercat interface.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
index 3888226..873b956 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
@@ -1201,6 +1201,7 @@ sub opensearch_osd {
     my $lib = shift;
     my $class = shift;
     my $base = shift;
+    my $host = shift;
 
     if ($version eq '1.0') {
         print <<OSD;
@@ -1243,7 +1244,7 @@ Content-type: application/opensearchdescription+xml; charset=utf-8
   <Url type="application/x-marcxml+xml"
        template="$base/1.1/$lib/marcxml/$class/?searchTerms={searchTerms}&amp;startPage={startPage?}&amp;startIndex={startIndex?}&amp;count={count?}&amp;searchLang={language?}"/>
   <Url type="text/html"
-       template="$base/1.1/$lib/html-full/$class/?searchTerms={searchTerms}&amp;startPage={startPage?}&amp;startIndex={startIndex?}&amp;count={count?}&amp;searchLang={language?}"/>
+       template="https://$host/eg/opac/results?locg=$lib;query={searchTerms};page={startPage?};startIndex={startIndex?};count={count?};searchLang={language?}"/>
   <LongName>Search $lib</LongName>
   <Query role="example" searchTerms="harry+potter" />
   <Developer>Mike Rylander for GPLS/PINES</Developer>
@@ -1301,7 +1302,7 @@ sub opensearch_feed {
             $class = 'keyword';
         }
 
-        return opensearch_osd($version, $lib, $class, $base);
+        return opensearch_osd($version, $lib, $class, $base, $host);
     }
 
 
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index ae44122..eaed67e 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -13,6 +13,7 @@
         <link rel="stylesheet" type="text/css" href="[% ctx.opac_root %]/css/style.css" />
         <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
         <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
+        <link type="application/opensearchdescription+xml" rel='search' title="[% l('Evergreen OpenSearch') %]" href="/opac/extras/opensearch/1.1/[% ctx.get_aou(ctx.search_ou).shortname %]/-/osd.xml" />
         [% IF want_dojo %]
         <style type="text/css">
             @import "[% ctx.media_prefix %]/js/dojo/dijit/themes/tundra/tundra.css";

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm |    5 +++--
 Open-ILS/src/templates/opac/parts/base.tt2        |    1 +
 docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt       |    5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/OpenSearch.txt


hooks/post-receive
-- 
Evergreen ILS