[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.10-6-g076e4ef

Wed Oct 2 10:25:52 CEST 2019

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 "main Koha release repository".

The branch, 18.11.x has been updated
       via  076e4eff0544844582dfbbd98edd4192995d57f4 (commit)
       via  1ffce2e17ad6c1bef13f81e08dc2487283eb697f (commit)
       via  4b07f9eac57e4abadf4baca773a09c491b52dd58 (commit)
       via  a5cc18716f26cb0ab277fed36e61b70e551fbabe (commit)
       via  3fd466b2d513fa219bc02e80a730e5f5ed5337b7 (commit)
       via  a3e2bfe51bee65c1e1a337877f25990deaa475c5 (commit)
      from  2815387d25496a3683d5d5b01eb1560911e4b0d7 (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 076e4eff0544844582dfbbd98edd4192995d57f4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Sep 6 09:47:19 2019 +0000

    Bug 16111: (QA follow-up) Few additional corrections

    [1] Refining the regex on the format parameter in opac-search.pl
    [2] Adding a colon to dc:identifier. The Dublin Core specs gives me this
        example:
        Identifier="ISBN:0385424728"
    [3] Replacing last occurrence of rss2 in the rss template

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 2bbd811027172af1adb68f9904071951056ecbda)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit ad787464c913339dacbda41d4cc1a259ac21e53c)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 1ffce2e17ad6c1bef13f81e08dc2487283eb697f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Sep 6 09:02:38 2019 +0000

    Bug 16111: (QA follow-up) Changes related to partial revert

    When reverting the & change, we need to go back to html filter for
    query_cgi and limit_cgi. In this patch I only replaced it where it is
    needed. The template contains more references to SEARCH_RESULT.query_cgi
    and SEARCH_RESULT.limit_cgi which are useless, since searchResults does
    not return these hash keys at all.

    This patch fixes one occurrence where SEARCH_RESULT was copied outside
    the loop that defines the template variable.

    Obviously, the code for RSS still needs more attention.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 062c3f9ab2e25b64dad1d4356a976a1416204c05)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 33c0504bb9437b84f36ede00b762fafebb2c80fc)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 4b07f9eac57e4abadf4baca773a09c491b52dd58
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 19 01:51:04 2019 +0000

    Bug 16111: Further fixes to the RSS to make feed work

    - fixed links per the WC3 spec
    - fixed a problem in the ATOM link

    To test:
    do a search, click the RSS icon - it shows xml in most browsers but wont
    do RSS type things.
    Apply this patch, restart the things
    refresh the page, it should do RSS things (i.e. firefox should render it
            as a nice looking thing, rather than raw XML.)

    noting that there are a couple of validation errors still, but they
    don't seem to be show stopping and moreover I wasn't sure how to fix them:

    Misplaced Item
    Self reference doesn't match document location (this is a "for widest
            compatibility you should fix" kind of thing)

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit fafd719dd34aeb4e96377f4404a53df589138efd)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit df9272bbef539b04640439bda6a9c6a8f7bc6b8c)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit a5cc18716f26cb0ab277fed36e61b70e551fbabe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 19 18:24:56 2019 -0400

    Bug 16111: [CHANGED] Replace link href by link in rss part

    Original patch title: Replace & with &

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

    EDIT:
    Reverting the changes to C4/Search and opac-search.pl.
    This requires a few changes, as supplied in the 5th patch.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 0e1e5ca31fab861c85c9b6e0d3b788f0208402d4)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 48aaf09849a7d0785b54e10cc84c72b03d288ab0)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 3fd466b2d513fa219bc02e80a730e5f5ed5337b7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 19 16:33:06 2019 -0400

    Bug 16111: Adjust some more filters

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 4de5d3dd428a23605e6dc49bfc05bfe780f647dc)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 2a036ec11fcb297068fc7e81073f7acaaf15690e)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit a3e2bfe51bee65c1e1a337877f25990deaa475c5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jun 18 17:31:27 2018 -0300

    Bug 16111: Fix content type for RSS feed

    Test plan:
    GET http://catalogue/cgi-bin/koha/opac-search.pl?idx=kw&q=perl&count=50&sort_by=acqdate_dsc&format=rss2

    => Without this patch it returns content type text/html
    => With this patch it returns text/xml

    GET http://catalogue/cgi-bin/koha/opac-search.pl?idx=kw&q=perl&count=50&sort_by=acqdate_dsc&format=rss
    => Without this patch it does not work
    => With this patch it returns text/xml

    Bug 16111: Fix atom support
    Bug 16111: Remove 'rss2' which should be 'rss' or 'atom'
    Bug 16111: Replace <link> with <link href...

    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b946e996ff208e71bbfd5cfb7714f9a656065093)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 5a30719f84857832fc737c287173cdaec5fb30e9)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 .../bootstrap/en/modules/opac-opensearch.tt        |   59 +++++++++++---------
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |    6 +-
 .../bootstrap/en/modules/opac-search-history.tt    |    4 +-
 opac/opac-search.pl                                |    7 ++-
 4 files changed, 43 insertions(+), 33 deletions(-)

hooks/post-receive
-- 
main Koha release repository