From dafc70c1e394c078c3120c93003ec6bb2c9df221 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 8 Nov 2013 09:01:00 -0500
Subject: [PATCH] Updated Summon dependency.
---
composer.lock | 8 +-
vendor/autoload.php | 2 +-
vendor/composer/autoload_real.php | 6 +-
vendor/composer/installed.json | 76 +++++++++----------
.../summon/SerialsSolutions/Summon/Query.php | 9 +++
5 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/composer.lock b/composer.lock
index 09b34fff9b6..8cdc59d6b25 100644
--- a/composer.lock
+++ b/composer.lock
@@ -358,12 +358,12 @@
"source": {
"type": "git",
"url": "https://github.com/summon/Summon.php.git",
- "reference": "2acfaf80bdd6414dec17478418d7c213e220575d"
+ "reference": "18840ee36537889269e22e4ef69561461547b6f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/summon/Summon.php/zipball/2acfaf80bdd6414dec17478418d7c213e220575d",
- "reference": "2acfaf80bdd6414dec17478418d7c213e220575d",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/18840ee36537889269e22e4ef69561461547b6f1",
+ "reference": "18840ee36537889269e22e4ef69561461547b6f1",
"shasum": ""
},
"type": "library",
@@ -386,7 +386,7 @@
"source": "https://github.com/summon/Summon.php/tree/master",
"issues": "https://github.com/summon/Summon.php/issues"
},
- "time": "2013-09-26 19:09:03"
+ "time": "2013-11-08 13:57:56"
},
{
"name": "symfony/yaml",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 3b08781e704..0b9a203e27e 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9::getLoader();
+return ComposerAutoloaderInit9d8033630a6ee5af71c27fda7477a7e0::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 43cbf7f1d2e..85d807c7a00 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9
+class ComposerAutoloaderInit9d8033630a6ee5af71c27fda7477a7e0
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit9d8033630a6ee5af71c27fda7477a7e0', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit051c0821dd0a7122afa1b731228664e9', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit9d8033630a6ee5af71c27fda7477a7e0', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 7d5c3d20821..b40f6167729 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -514,44 +514,6 @@
"qrcode"
]
},
- {
- "name": "serialssolutions/summon",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/summon/Summon.php.git",
- "reference": "2acfaf80bdd6414dec17478418d7c213e220575d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/summon/Summon.php/zipball/2acfaf80bdd6414dec17478418d7c213e220575d",
- "reference": "2acfaf80bdd6414dec17478418d7c213e220575d",
- "shasum": ""
- },
- "time": "2013-09-26 19:09:03",
- "type": "library",
- "installation-source": "source",
- "autoload": {
- "psr-0": {
- "SerialsSolutions": ""
- }
- },
- "license": [
- "GPL-2.0"
- ],
- "authors": [
- {
- "name": "Demian Katz",
- "email": "demian.katz@villanova.edu"
- }
- ],
- "description": "Library for interacting with Serials Solutions' Summon API.",
- "support": {
- "source": "https://github.com/summon/Summon.php/tree/master",
- "issues": "https://github.com/summon/Summon.php/issues"
- }
- },
{
"name": "jasig/phpcas",
"version": "dev-master",
@@ -681,5 +643,43 @@
"/"
],
"description": "The standard for machine-readable cataloging (MARC) records is documented at http://loc.gov/marc/. This package enables you to read existing MARC records from a file, string, or (using the YAZ extension), from a Z39.50 source. You can also use this package to create new MARC records.\n\nThis package is based on the PHP MARC package, originally called \"php-marc\", that is part of the Emilda Project (http://www.emilda.org). Christoffer Landtman generously agreed to make the \"php-marc\" code available under the GNU LGPL so it could be used as the basis of this PEAR package."
+ },
+ {
+ "name": "serialssolutions/summon",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/summon/Summon.php.git",
+ "reference": "18840ee36537889269e22e4ef69561461547b6f1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/18840ee36537889269e22e4ef69561461547b6f1",
+ "reference": "18840ee36537889269e22e4ef69561461547b6f1",
+ "shasum": ""
+ },
+ "time": "2013-11-08 13:57:56",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "psr-0": {
+ "SerialsSolutions": ""
+ }
+ },
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Demian Katz",
+ "email": "demian.katz@villanova.edu"
+ }
+ ],
+ "description": "Library for interacting with Serials Solutions' Summon API.",
+ "support": {
+ "source": "https://github.com/summon/Summon.php/tree/master",
+ "issues": "https://github.com/summon/Summon.php/issues"
+ }
}
]
diff --git a/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php b/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php
index 8495264b967..799735b7f19 100644
--- a/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php
+++ b/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php
@@ -123,6 +123,12 @@ class SerialsSolutions_Summon_Query
*/
protected $language = 'en';
+ /**
+ * Query expansion setting
+ * @var bool
+ */
+ protected $expand = false;
+
/**
* Constructor
*
@@ -183,6 +189,9 @@ class SerialsSolutions_Summon_Query
if (!empty($this->sort)) {
$options['s.sort'] = $this->sort;
}
+ if ($this->expand) {
+ $options['s.exp'] = 'true';
+ }
if ($this->highlight) {
$options['s.hl'] = 'true';
$options['s.hs'] = $this->highlightStart;
--
GitLab