diff --git a/composer.json b/composer.json index eb5e8af8a0c85cacaf36a01c1e46f0644dd0b666..bd2024d9394c018d12b3a15253cc05766588de45 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "pear/http_request2": "2.3.0", "pear/validate_ispn": "dev-master", "phing/phing": "2.16.0", - "serialssolutions/summon": "1.0.0", + "serialssolutions/summon": "1.1.0", "symfony/yaml": "3.2.7", "swagger-api/swagger-ui": "2.2.10", "vufind-org/vufindcode": "1.0.3", diff --git a/composer.lock b/composer.lock index 0b194d671cb157b706a1c0365fa7b2a424085ccb..ee44a6f2f230c302bcf5edb533286e377c143bf4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "89f8da24bbbc9fd75d4956a8aabfa930", + "content-hash": "78c3a34eff4a677dec9c84389ce9bbfb", "packages": [ { "name": "aferrandini/phpqrcode", @@ -1085,16 +1085,16 @@ }, { "name": "serialssolutions/summon", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/summon/Summon.php.git", - "reference": "ce26752adfded96aff2f4422991078eedfc740a5" + "reference": "170beb3b0505f2047613b101213379537e651ea2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/summon/Summon.php/zipball/ce26752adfded96aff2f4422991078eedfc740a5", - "reference": "ce26752adfded96aff2f4422991078eedfc740a5", + "url": "https://api.github.com/repos/summon/Summon.php/zipball/170beb3b0505f2047613b101213379537e651ea2", + "reference": "170beb3b0505f2047613b101213379537e651ea2", "shasum": "" }, "type": "library", @@ -1114,7 +1114,7 @@ } ], "description": "Library for interacting with Serials Solutions' Summon API.", - "time": "2013-11-13T19:07:09+00:00" + "time": "2017-05-17T20:36:35+00:00" }, { "name": "swagger-api/swagger-ui", @@ -1259,36 +1259,36 @@ }, { "name": "vufind-org/vufindharvest", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/vufind-org/vufindharvest.git", - "reference": "1eca7578ec1685ad5bf0d952c24e9e180ee10f5a" + "reference": "c59e0a64b59873120c5cda32cbb8654629a8320e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vufind-org/vufindharvest/zipball/1eca7578ec1685ad5bf0d952c24e9e180ee10f5a", - "reference": "1eca7578ec1685ad5bf0d952c24e9e180ee10f5a", + "url": "https://api.github.com/repos/vufind-org/vufindharvest/zipball/c59e0a64b59873120c5cda32cbb8654629a8320e", + "reference": "c59e0a64b59873120c5cda32cbb8654629a8320e", "shasum": "" }, "require": { - "php": ">=5.4", + "php": ">=5.6", "zendframework/zend-console": ">=2.2", "zendframework/zend-http": ">=2.2" }, "require-dev": { "friendsofphp/php-cs-fixer": "1.11.6", - "phing/phing": "2.15.2", - "phpdocumentor/phpdocumentor": "2.8.5", - "phploc/phploc": "2.0.6", - "phpmd/phpmd": "2.4.2", - "phpunit/phpunit": "4.8.27", - "sebastian/phpcpd": "2.0.0", - "squizlabs/php_codesniffer": "2.6.0" + "phing/phing": "2.16.0", + "phpdocumentor/phpdocumentor": "2.9.0", + "phploc/phploc": "3.0.1", + "phpmd/phpmd": "2.6.0", + "phpunit/phpunit": "5.7.15", + "sebastian/phpcpd": "2.0.4", + "squizlabs/php_codesniffer": "2.8.1" }, "type": "library", "autoload": { - "psr-0": { + "psr-4": { "VuFindHarvest\\": "src/" } }, @@ -1305,7 +1305,7 @@ ], "description": "VuFind Harvest Tools", "homepage": "https://vufind.org/", - "time": "2016-12-16T16:19:52+00:00" + "time": "2017-04-06T18:31:39+00:00" }, { "name": "vufind-org/vufindhttp", @@ -1792,16 +1792,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.3.10", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "83e8d98b9915de76c659ce27d683c02a0f99fa90" + "reference": "b03f285a333f51e58c95cce54109a4a9ed691436" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/83e8d98b9915de76c659ce27d683c02a0f99fa90", - "reference": "83e8d98b9915de76c659ce27d683c02a0f99fa90", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/b03f285a333f51e58c95cce54109a4a9ed691436", + "reference": "b03f285a333f51e58c95cce54109a4a9ed691436", "shasum": "" }, "require": { @@ -1809,17 +1809,19 @@ "psr/http-message": "~1.0" }, "provide": { - "psr/http-message-implementation": "~1.0.0" + "psr/http-message-implementation": "1.0" }, "require-dev": { + "ext-dom": "*", + "ext-libxml": "*", "phpunit/phpunit": "^4.6 || ^5.5", "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev", - "dev-develop": "1.4-dev" + "dev-master": "1.4-dev", + "dev-develop": "1.5-dev" } }, "autoload": { @@ -1838,7 +1840,7 @@ "psr", "psr-7" ], - "time": "2017-01-23T04:53:24+00:00" + "time": "2017-04-06T16:18:34+00:00" }, { "name": "zendframework/zend-dom", @@ -2106,27 +2108,27 @@ }, { "name": "zendframework/zend-form", - "version": "2.10.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-form.git", - "reference": "ca2b2f9e1bdc5511d06967d755cbb793708a2d7b" + "reference": "1ca3ab771abd533d440646ec1cc082fccad976a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-form/zipball/ca2b2f9e1bdc5511d06967d755cbb793708a2d7b", - "reference": "ca2b2f9e1bdc5511d06967d755cbb793708a2d7b", + "url": "https://api.github.com/repos/zendframework/zend-form/zipball/1ca3ab771abd533d440646ec1cc082fccad976a1", + "reference": "1ca3ab771abd533d440646ec1cc082fccad976a1", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^7.0 || ^5.6", "zendframework/zend-hydrator": "^1.1 || ^2.1", "zendframework/zend-inputfilter": "^2.6", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.0.8 || ^5.7.15", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-captcha": "^2.7.1", "zendframework/zend-code": "^2.6 || ^3.0", @@ -2179,7 +2181,7 @@ "form", "zf2" ], - "time": "2017-02-23T16:03:25+00:00" + "time": "2017-04-26T21:27:43+00:00" }, { "name": "zendframework/zend-http", @@ -4687,16 +4689,16 @@ }, { "name": "jms/serializer", - "version": "1.6.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "5e9008cbb0bac2986979d905a87ae48efcf578c4" + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/5e9008cbb0bac2986979d905a87ae48efcf578c4", - "reference": "5e9008cbb0bac2986979d905a87ae48efcf578c4", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/4fad8bbbe76e05de3b79ffa3db027058ed3813ff", + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff", "shasum": "" }, "require": { @@ -4735,7 +4737,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -4745,7 +4747,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache2" + "Apache-2.0" ], "authors": [ { @@ -4762,7 +4764,7 @@ "serialization", "xml" ], - "time": "2017-03-24T13:11:23+00:00" + "time": "2017-05-15T08:35:42+00:00" }, { "name": "justinrainbow/json-schema", @@ -4953,16 +4955,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", "shasum": "" }, "require": { @@ -4991,7 +4993,7 @@ "object", "object graph" ], - "time": "2017-01-26T22:05:40+00:00" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "nikic/php-parser", @@ -6430,6 +6432,7 @@ "keywords": [ "git" ], + "abandoned": true, "time": "2017-01-23T20:57:12+00:00" }, { @@ -6847,16 +6850,16 @@ }, { "name": "symfony/config", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "35b7dfa089d7605eb1fdd46281b3070fb9f38750" + "reference": "0b8541d18507d10204a08384640ff6df3c739ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/35b7dfa089d7605eb1fdd46281b3070fb9f38750", - "reference": "35b7dfa089d7605eb1fdd46281b3070fb9f38750", + "url": "https://api.github.com/repos/symfony/config/zipball/0b8541d18507d10204a08384640ff6df3c739ebe", + "reference": "0b8541d18507d10204a08384640ff6df3c739ebe", "shasum": "" }, "require": { @@ -6899,20 +6902,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-04-04T15:24:26+00:00" + "time": "2017-04-12T14:07:15+00:00" }, { "name": "symfony/console", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "86407ff20855a5eaa2a7219bd815e9c40a88633e" + "reference": "2cfcbced8e39e2313ed4da8896fc8c59a56c0d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/86407ff20855a5eaa2a7219bd815e9c40a88633e", - "reference": "86407ff20855a5eaa2a7219bd815e9c40a88633e", + "url": "https://api.github.com/repos/symfony/console/zipball/2cfcbced8e39e2313ed4da8896fc8c59a56c0d7e", + "reference": "2cfcbced8e39e2313ed4da8896fc8c59a56c0d7e", "shasum": "" }, "require": { @@ -6960,20 +6963,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-04-03T20:37:06+00:00" + "time": "2017-04-26T01:38:53+00:00" }, { "name": "symfony/css-selector", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c" + "reference": "02983c144038e697c959e6b06ef6666de759ccbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c", - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/02983c144038e697c959e6b06ef6666de759ccbc", + "reference": "02983c144038e697c959e6b06ef6666de759ccbc", "shasum": "" }, "require": { @@ -7013,7 +7016,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-02-21T09:12:04+00:00" + "time": "2017-05-01T14:55:58+00:00" }, { "name": "symfony/debug", @@ -7074,16 +7077,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "923bb014708b666e4092c9ba39993895c9c8fcd7" + "reference": "5e00857475b6d1fa31ff4c76f1fddf1cfa9e8d59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/923bb014708b666e4092c9ba39993895c9c8fcd7", - "reference": "923bb014708b666e4092c9ba39993895c9c8fcd7", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5e00857475b6d1fa31ff4c76f1fddf1cfa9e8d59", + "reference": "5e00857475b6d1fa31ff4c76f1fddf1cfa9e8d59", "shasum": "" }, "require": { @@ -7133,20 +7136,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-04-04T07:26:27+00:00" + "time": "2017-04-26T01:39:17+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "88b65f0ac25355090e524aba4ceb066025df8bd2" + "reference": "7fc8e2b4118ff316550596357325dfd92a51f531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/88b65f0ac25355090e524aba4ceb066025df8bd2", - "reference": "88b65f0ac25355090e524aba4ceb066025df8bd2", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fc8e2b4118ff316550596357325dfd92a51f531", + "reference": "7fc8e2b4118ff316550596357325dfd92a51f531", "shasum": "" }, "require": { @@ -7193,7 +7196,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-04-03T20:37:06+00:00" + "time": "2017-04-26T16:56:54+00:00" }, { "name": "symfony/filesystem", @@ -7246,16 +7249,16 @@ }, { "name": "symfony/finder", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "7131327eb95d86d72039fd1216226c28f36fd02a" + "reference": "16d55394b31547e4a8494551b85c9b9915545347" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/7131327eb95d86d72039fd1216226c28f36fd02a", - "reference": "7131327eb95d86d72039fd1216226c28f36fd02a", + "url": "https://api.github.com/repos/symfony/finder/zipball/16d55394b31547e4a8494551b85c9b9915545347", + "reference": "16d55394b31547e4a8494551b85c9b9915545347", "shasum": "" }, "require": { @@ -7291,7 +7294,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-03-20T08:46:40+00:00" + "time": "2017-04-12T14:07:15+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -7354,16 +7357,16 @@ }, { "name": "symfony/process", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "41336b20b52f5fd5b42a227e394e673c8071118f" + "reference": "aff35fb3dee799c84a7313c576b72208b046ef8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/41336b20b52f5fd5b42a227e394e673c8071118f", - "reference": "41336b20b52f5fd5b42a227e394e673c8071118f", + "url": "https://api.github.com/repos/symfony/process/zipball/aff35fb3dee799c84a7313c576b72208b046ef8d", + "reference": "aff35fb3dee799c84a7313c576b72208b046ef8d", "shasum": "" }, "require": { @@ -7399,20 +7402,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-03-04T12:20:59+00:00" + "time": "2017-04-12T14:07:15+00:00" }, { "name": "symfony/stopwatch", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b" + "reference": "e02577b841394a78306d7b547701bb7bb705bad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9e4369666d02ee9b8830da878b7f6a769eb96f4b", - "reference": "9e4369666d02ee9b8830da878b7f6a769eb96f4b", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e02577b841394a78306d7b547701bb7bb705bad5", + "reference": "e02577b841394a78306d7b547701bb7bb705bad5", "shasum": "" }, "require": { @@ -7448,7 +7451,7 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2017-02-18T17:06:33+00:00" + "time": "2017-04-12T14:07:15+00:00" }, { "name": "symfony/translation", @@ -7516,16 +7519,16 @@ }, { "name": "symfony/validator", - "version": "v2.8.19", + "version": "v2.8.20", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "43f617ee200af4f4dedbb0782c6c689e06994286" + "reference": "e125c9ec86d615231817302115a1558cd74d9aa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/43f617ee200af4f4dedbb0782c6c689e06994286", - "reference": "43f617ee200af4f4dedbb0782c6c689e06994286", + "url": "https://api.github.com/repos/symfony/validator/zipball/e125c9ec86d615231817302115a1558cd74d9aa1", + "reference": "e125c9ec86d615231817302115a1558cd74d9aa1", "shasum": "" }, "require": { @@ -7585,20 +7588,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2017-03-23T16:08:03+00:00" + "time": "2017-04-12T14:07:15+00:00" }, { "name": "theseer/fdomdocument", - "version": "1.6.1", + "version": "1.6.5", "source": { "type": "git", "url": "https://github.com/theseer/fDOMDocument.git", - "reference": "d9ad139d6c2e8edf5e313ffbe37ff13344cf0684" + "reference": "8dcfd392135a5bd938c3c83ea71419501ad9855d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/d9ad139d6c2e8edf5e313ffbe37ff13344cf0684", - "reference": "d9ad139d6c2e8edf5e313ffbe37ff13344cf0684", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/8dcfd392135a5bd938c3c83ea71419501ad9855d", + "reference": "8dcfd392135a5bd938c3c83ea71419501ad9855d", "shasum": "" }, "require": { @@ -7625,7 +7628,7 @@ ], "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", "homepage": "https://github.com/theseer/fDOMDocument", - "time": "2015-05-27T22:58:02+00:00" + "time": "2017-04-21T14:50:31+00:00" }, { "name": "twig/twig", diff --git a/config/vufind/Summon.ini b/config/vufind/Summon.ini index 910d04f484948cfe07e4ac5aad5b9ba06f6fce61..3318d70b9bbb5551c7b41cdbba9a67df0cda900d 100644 --- a/config/vufind/Summon.ini +++ b/config/vufind/Summon.ini @@ -115,6 +115,7 @@ dateRange[] = PublicationDate ;IsPeerReviewed:true = peer_reviewed_limit IsScholarly:true = scholarly_limit IsFullText:true = fulltext_limit +openAccessFilter:true = open_access_limit excludeNewspapers:true = exclude_newspapers holdingsOnly:false = add_other_libraries queryExpansion:true = include_synonyms diff --git a/languages/en.ini b/languages/en.ini index 11406ac1ee67880513b1f998705777049514b0fa..dbe123d1893ba07fc60fccf511e9d24532e5b4b6 100644 --- a/languages/en.ini +++ b/languages/en.ini @@ -705,6 +705,7 @@ on_reserve = "Reserves - Ask at Circulation" on_topic = "%%count%% item(s) on this topic" Online Access = "Online Access" online_resources = "Full Text" +open_access_limit = "Limit to Open Access content" operator_contains = "contains" operator_exact = "is (exact)" OR = "OR" diff --git a/module/VuFind/src/VuFind/Search/Summon/Params.php b/module/VuFind/src/VuFind/Search/Summon/Params.php index 48077bf2e39f0591ef395ff95577e1a4a062f285..dd4ec33a6f79df864c513b7bafe3c414f296267f 100644 --- a/module/VuFind/src/VuFind/Search/Summon/Params.php +++ b/module/VuFind/src/VuFind/Search/Summon/Params.php @@ -266,6 +266,13 @@ class Params extends \VuFind\Search\Base\Params $params->set( 'expand', strtolower(trim($safeValue)) == 'true' ); + } else if ($filt['field'] == 'openAccessFilter') { + // Special case -- "open access filter" is a separate + // parameter from other facets. + $params->set( + 'openAccessFilter', + strtolower(trim($safeValue)) == 'true' + ); } else if ($filt['field'] == 'excludeNewspapers') { // Special case -- support a checkbox for excluding // newspapers: