X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fcriteria%2Fclass_SearchCriteria.php;h=faeb8be698188dfb71d383405a4c2bee9b24d3ea;hp=f6d7378bff0aed73fa78fe7c33db315e533a2a94;hb=5bf79580029c4f6ee71e6c9e7890169e4b344def;hpb=8cfd068024443570a0f324e4271637537cff2d88

diff --git a/inc/classes/main/criteria/class_SearchCriteria.php b/inc/classes/main/criteria/class_SearchCriteria.php
index f6d7378..faeb8be 100644
--- a/inc/classes/main/criteria/class_SearchCriteria.php
+++ b/inc/classes/main/criteria/class_SearchCriteria.php
@@ -6,7 +6,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -21,7 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria {
 	/**
@@ -48,12 +48,6 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set part description
-		$this->setObjectDescription("Search criteria class");
-
-		// Create unique ID number
-		$this->generateUniqueId();
-
 		// Clean up a little
 		$this->removeNumberFormaters();
 		$this->removeSystemArray();
@@ -79,8 +73,8 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 	 * @param	$criteriaValue	Criteria value
 	 * @return	void
 	 */
-	public function addCriteria ($criteriaKey, $criteriaValue) {
-		$this->searchCriteria[$criteriaKey] = $criteriaValue;
+	public final function addCriteria ($criteriaKey, $criteriaValue) {
+		$this->searchCriteria[(string)$criteriaKey] = (string)$criteriaValue;
 	}
 
 	/**
@@ -90,7 +84,7 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 	 * @param	$configEntry	Configuration entry
 	 * @return	void
 	 */
-	public function addConfiguredCriteria ($criteriaKey, $configEntry) {
+	public final function addConfiguredCriteria ($criteriaKey, $configEntry) {
 		// Add the configuration entry as a criteria
 		$value = $this->getConfigInstance()->readConfig($configEntry);
 		$this->addCriteria($criteriaKey, $value);
@@ -101,6 +95,7 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 	 *
 	 * @param	$limit	Search limit
 	 * @return	void
+	 * @todo	Find a nice casting here. (int) allows until and including 32766.
 	 */
 	public final function setLimit ($limit) {
 		$this->limit = $limit;
@@ -120,6 +115,7 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 	 *
 	 * @param	$skip	Search skip
 	 * @return	void
+	 * @todo	Find a nice casting here. (int) allows until and including 32766.
 	 */
 	public final function setSkip ($skip) {
 		$this->skip = $skip;
@@ -194,9 +190,9 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 		$counted = 0;
 
 		// Walk through all entries
-		foreach ($entryArray as $key=>$entry) {
+		foreach ($entryArray as $key => $entry) {
 			// Then walk through all search criteria
-			foreach ($this->searchCriteria as $criteriaKey=>$criteriaValue) {
+			foreach ($this->searchCriteria as $criteriaKey => $criteriaValue) {
 				// Is the element found and does it match?
 				if (($key == $criteriaKey) && ($criteriaValue == $entry)) {
 					// Then count this one up
@@ -205,7 +201,7 @@ class SearchCriteria extends BaseFrameworkSystem implements LocalSearchCriteria
 			} // END - foreach
 		} // END - foreach
 
-		// Now check if the criteria matches
+		// Now check if expected criteria counts match
 		$matches = ($counted == count($this->searchCriteria));
 
 		// Return the result