Registry rewritten, exception added #2

[core.git] / inc / classes / main / criteria / dataset / class_DataSetCriteria.php

diff --git a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
index f342606e89de681a876c35553d509fa7c219e5f0..da22ede83488672ab502bffcab6ab4af24b21395 100644 (file)
--- a/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/classes/main/criteria/dataset/class_DataSetCriteria.php
@@ -5,7 +5,7 @@
  * @see                        DatabaseFrontendInterface - An interface for database frontends (front-end to the application)
  * @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, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -26,7 +26,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
        /**
         * Table name
         */
-       private $tableName = "";
+       private $tableName = '';
 
        /**
         * Table columns (criteria) to store
@@ -36,12 +36,12 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
        /**
         * Unique key
         */
-       private $uniqueKey = "";
+       private $uniqueKey = '';
 
        /**
         * Primary key
         */
-       private $primaryKey = "";
+       private $primaryKey = '';
 
        /**
         * Protected constructor
@@ -90,7 +90,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
         */
        public function addConfiguredCriteria ($criteriaKey, $configEntry) {
                // Add configuration entry as criteria
-               $value = $this->getConfigInstance()->readConfig($configEntry);
+               $value = $this->getConfigInstance()->getConfigEntry($configEntry);
                $this->addCriteria($criteriaKey, $value);
        }