From 769536d19c0c298cb99765360949b23fee829efb Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 24 Apr 2013 15:44:38 -0400
Subject: [PATCH] Minor comment/style improvements.
---
module/VuFind/src/VuFind/Search/Favorites/Params.php | 8 ++++++--
module/VuFind/src/VuFind/Search/MixedList/Params.php | 5 +++--
module/VuFind/src/VuFind/Search/Solr/Params.php | 11 +++++++++++
module/VuFind/src/VuFind/Search/SolrAuth/Params.php | 3 +--
module/VuFind/src/VuFind/Search/SolrAuthor/Params.php | 3 +--
.../src/VuFind/Search/SolrAuthorFacets/Params.php | 3 +--
.../VuFind/src/VuFind/Search/SolrReserves/Params.php | 3 +--
module/VuFind/src/VuFind/Search/Summon/Params.php | 5 +++++
module/VuFind/src/VuFind/Search/Tags/Params.php | 3 +--
9 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/module/VuFind/src/VuFind/Search/Favorites/Params.php b/module/VuFind/src/VuFind/Search/Favorites/Params.php
index 1b0a7eb26b5..d7548db7ab0 100644
--- a/module/VuFind/src/VuFind/Search/Favorites/Params.php
+++ b/module/VuFind/src/VuFind/Search/Favorites/Params.php
@@ -26,7 +26,6 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Search\Favorites;
-use VuFind\Search\Base\Params as BaseParams;
/**
* Search Favorites Parameters
@@ -37,8 +36,13 @@ use VuFind\Search\Base\Params as BaseParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org Main Site
*/
-class Params extends BaseParams
+class Params extends \VuFind\Search\Base\Params
{
+ /**
+ * Auth manager
+ *
+ * @var \VuFind\Auth\Manager
+ */
protected $account;
/**
diff --git a/module/VuFind/src/VuFind/Search/MixedList/Params.php b/module/VuFind/src/VuFind/Search/MixedList/Params.php
index 3bcd546011e..900456bf600 100644
--- a/module/VuFind/src/VuFind/Search/MixedList/Params.php
+++ b/module/VuFind/src/VuFind/Search/MixedList/Params.php
@@ -26,7 +26,6 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Search\MixedList;
-use VuFind\Search\Base\Params as BaseParams;
/**
* Search Mixed List Parameters
@@ -37,10 +36,12 @@ use VuFind\Search\Base\Params as BaseParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org Main Site
*/
-class Params extends BaseParams
+class Params extends \VuFind\Search\Base\Params
{
/**
* Array of target record ids
+ *
+ * @var array
*/
protected $recordsToRequest;
diff --git a/module/VuFind/src/VuFind/Search/Solr/Params.php b/module/VuFind/src/VuFind/Search/Solr/Params.php
index 3c38ddfd341..bc939d534ac 100644
--- a/module/VuFind/src/VuFind/Search/Solr/Params.php
+++ b/module/VuFind/src/VuFind/Search/Solr/Params.php
@@ -40,18 +40,29 @@ class Params extends \VuFind\Search\Base\Params
{
/**
* Facet result limit
+ *
+ * @var int
*/
protected $facetLimit = 30;
+
/**
* Offset for facet results
+ *
+ * @var int
*/
protected $facetOffset = null;
+
/**
* Prefix for facet searching
+ *
+ * @var string
*/
protected $facetPrefix = null;
+
/**
* Sorting order for facet search results
+ *
+ * @var string
*/
protected $facetSort = null;
diff --git a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
index d8cf08c0ed8..064801adf34 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuth/Params.php
@@ -26,7 +26,6 @@
* @link http://www.vufind.org Main Page
*/
namespace VuFind\Search\SolrAuth;
-use VuFind\Search\Solr\Params as SolrParams;
/**
* Solr Authority Search Parameters
@@ -37,6 +36,6 @@ use VuFind\Search\Solr\Params as SolrParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://www.vufind.org Main Page
*/
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
{
}
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
index f84e5806f99..e819103a962 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthor/Params.php
@@ -26,7 +26,6 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Search\SolrAuthor;
-use VuFind\Search\Solr\Params as SolrParams;
/**
* Author Search Options
@@ -37,7 +36,7 @@ use VuFind\Search\Solr\Params as SolrParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org Main Site
*/
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
{
/**
* Support method for _initSearch() -- handle basic settings.
diff --git a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
index 36ee5927f82..97c116a0430 100644
--- a/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrAuthorFacets/Params.php
@@ -26,7 +26,6 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Search\SolrAuthorFacets;
-use VuFind\Search\Solr\Params as SolrParams;
/**
* AuthorFacets Search Parameters
@@ -37,7 +36,7 @@ use VuFind\Search\Solr\Params as SolrParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org Main Site
*/
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
{
/**
* Set parameters based on a search object
diff --git a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
index d05ff81c4eb..9575d93243d 100644
--- a/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
+++ b/module/VuFind/src/VuFind/Search/SolrReserves/Params.php
@@ -27,7 +27,6 @@
* @link http://www.vufind.org Main Page
*/
namespace VuFind\Search\SolrReserves;
-use VuFind\Search\Solr\Params as SolrParams;
/**
* Solr Reserves Search Parameters
@@ -39,6 +38,6 @@ use VuFind\Search\Solr\Params as SolrParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://www.vufind.org Main Page
*/
-class Params extends SolrParams
+class Params extends \VuFind\Search\Solr\Params
{
}
\ No newline at end of file
diff --git a/module/VuFind/src/VuFind/Search/Summon/Params.php b/module/VuFind/src/VuFind/Search/Summon/Params.php
index 6520d4815a6..22cb37fc219 100644
--- a/module/VuFind/src/VuFind/Search/Summon/Params.php
+++ b/module/VuFind/src/VuFind/Search/Summon/Params.php
@@ -40,10 +40,15 @@ class Params extends \VuFind\Search\Base\Params
{
/**
* Settings for all the facets
+ *
+ * @var array
*/
protected $fullFacetSettings = array();
+
/**
* Settings for the date facet only
+ *
+ * @var array
*/
protected $dateFacetSettings = array();
diff --git a/module/VuFind/src/VuFind/Search/Tags/Params.php b/module/VuFind/src/VuFind/Search/Tags/Params.php
index 272e10ab378..be52762991e 100644
--- a/module/VuFind/src/VuFind/Search/Tags/Params.php
+++ b/module/VuFind/src/VuFind/Search/Tags/Params.php
@@ -26,7 +26,6 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Search\Tags;
-use VuFind\Search\Base\Params as BaseParams;
/**
* Search Tags Parameters
@@ -37,7 +36,7 @@ use VuFind\Search\Base\Params as BaseParams;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link http://vufind.org Main Site
*/
-class Params extends BaseParams
+class Params extends \VuFind\Search\Base\Params
{
/**
* Load all recommendation settings from the relevant ini file. Returns an
--
GitLab