diff --git a/composer.lock b/composer.lock
index b18bec1b890a1ce678cc496b6f5ada297bf286ad..cda8b49042d2c2d1cf9d6d103b8d27ba2acab1c0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -334,12 +334,12 @@
"source": {
"type": "git",
"url": "https://github.com/summon/Summon.php.git",
- "reference": "b71b189d93bf48b73beb539575b072e998d736e6"
+ "reference": "2acfaf80bdd6414dec17478418d7c213e220575d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/summon/Summon.php/zipball/b71b189d93bf48b73beb539575b072e998d736e6",
- "reference": "b71b189d93bf48b73beb539575b072e998d736e6",
+ "url": "https://api.github.com/repos/summon/Summon.php/zipball/2acfaf80bdd6414dec17478418d7c213e220575d",
+ "reference": "2acfaf80bdd6414dec17478418d7c213e220575d",
"shasum": ""
},
"type": "library",
@@ -362,7 +362,7 @@
"source": "https://github.com/summon/Summon.php/tree/master",
"issues": "https://github.com/summon/Summon.php/issues"
},
- "time": "2013-09-05 14:14:28"
+ "time": "2013-09-26 19:09:03"
},
{
"name": "symfony/yaml",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 32c5e61e6e58d89ecccfea17d56ea9e52f519036..ffb9f4bf257195725e9f2ffbe22ee4f26b4ed903 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -1,7 +1,7 @@
<?php
-// autoload.php generated by Composer
+// autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitff3ce8a0cd797fb5648abbbd452fdeac::getLoader();
+return ComposerAutoloaderInit8ebfbe0172ac5af231c5e492fc1e6383::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 9b295b332aeb43e326bda161dc8fa9317026ea72..c54c94816de6e02891a17846f752c92cb61a236b 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1,6 +1,6 @@
<?php
-// autoload_classmap.php generated by Composer
+// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 51846d6df7a36fac63a98c2b2783a4aa1764f6c2..395ec7bd8b3c53a8f95bceb967648589f5b81c2a 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -1,6 +1,6 @@
<?php
-// autoload_namespaces.php generated by Composer
+// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index ddc3a5a832db2ea289adacfb43ad394733840e9b..37c06aaed4e2a2dffbb584eab8c8349887581bea 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -1,8 +1,8 @@
<?php
-// autoload_real.php generated by Composer
+// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitff3ce8a0cd797fb5648abbbd452fdeac
+class ComposerAutoloaderInit8ebfbe0172ac5af231c5e492fc1e6383
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitff3ce8a0cd797fb5648abbbd452fdeac
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitff3ce8a0cd797fb5648abbbd452fdeac', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit8ebfbe0172ac5af231c5e492fc1e6383', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitff3ce8a0cd797fb5648abbbd452fdeac', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit8ebfbe0172ac5af231c5e492fc1e6383', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/include_paths.php b/vendor/composer/include_paths.php
index 812b0a19f77d3f8774e739b170d4abc5b396e023..f571a41430aa3a1d72deda8290ebea08cc449513 100644
--- a/vendor/composer/include_paths.php
+++ b/vendor/composer/include_paths.php
@@ -1,6 +1,6 @@
<?php
-// include_paths.php generated by Composer
+// include_paths.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b01a766cbd78b0c87e8a3c5b77530c5895592748..6cadac496fa33fc3eba91006cc93276abe53e70b 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -545,44 +545,6 @@
"issues": "https://github.com/zendframework/zf2/issues"
}
},
- {
- "name": "serialssolutions/summon",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
- "source": {
- "type": "git",
- "url": "https://github.com/summon/Summon.php.git",
- "reference": "b71b189d93bf48b73beb539575b072e998d736e6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/summon/Summon.php/zipball/b71b189d93bf48b73beb539575b072e998d736e6",
- "reference": "b71b189d93bf48b73beb539575b072e998d736e6",
- "shasum": ""
- },
- "time": "2013-09-05 14:14:28",
- "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": "pear-pear.php.net/File_MARC",
"version": "0.7.3",
@@ -657,5 +619,43 @@
"php",
"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"
+ }
}
]
diff --git a/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php b/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php
index 3b10a4914c4f3d622ce9d09c0f7a19407a20616d..8495264b9677a6ee49469cf9355b223840b5c386 100644
--- a/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php
+++ b/vendor/serialssolutions/summon/SerialsSolutions/Summon/Query.php
@@ -63,6 +63,12 @@ class SerialsSolutions_Summon_Query
*/
protected $filters = array();
+ /**
+ * An array of group filters to be applied
+ * @var array
+ */
+ protected $groupFilters = array();
+
/**
* An array of range filters to be applied
* @var array
@@ -111,6 +117,12 @@ class SerialsSolutions_Summon_Query
*/
protected $highlightEnd = '';
+ /**
+ * Preferred search language (affects relevancy ranking)
+ * @var string
+ */
+ protected $language = 'en';
+
/**
* Constructor
*
@@ -153,7 +165,8 @@ class SerialsSolutions_Summon_Query
's.ps' => $this->pageSize,
's.pn' => $this->pageNumber,
's.ho' => $this->holdings ? 'true' : 'false',
- 's.dym' => $this->didYouMean ? 'true' : 'false'
+ 's.dym' => $this->didYouMean ? 'true' : 'false',
+ 's.l' => $this->language,
);
if (!empty($this->facets)) {
$options['s.ff'] = $this->facets;
@@ -161,6 +174,9 @@ class SerialsSolutions_Summon_Query
if (!empty($this->filters)) {
$options['s.fvf'] = $this->filters;
}
+ if (!empty($this->groupFilters)) {
+ $options['s.fvgf'] = $this->groupFilters;
+ }
if (!empty($this->rangeFilters)) {
$options['s.rf'] = $this->rangeFilters;
}
@@ -190,6 +206,18 @@ class SerialsSolutions_Summon_Query
$this->filters[] = $f;
}
+ /**
+ * Add a group filter
+ *
+ * @param string $f Filter to apply
+ *
+ * @return void
+ */
+ public function addGroupFilter($f)
+ {
+ $this->groupFilters[] = $f;
+ }
+
/**
* Add a range filter
*