renamed lib-local.php -> lib-lfdb.php because it really loads the "legendary"

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

diff --git a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
index 2745239433474cf09ec96c9caced5bdb72b26e6b..867e6551d354c14eeeb13e2f2688379fe852f757 100644 (file)
--- a/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
+++ b/inc/main/classes/criteria/dataset/class_DataSetCriteria.php
@@ -1,10 +1,17 @@
 <?php
+// Own namespace
+namespace CoreFramework\Criteria\DataSet;
+
+// Import framework stuff
+use CoreFramework\Criteria\BaseCriteria;
+use CoreFramework\Criteria\Storing\StoreableCriteria;
+
 /**
  * A set of data storeable in databases
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -118,7 +125,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
                $primaryKeys = $this->getPrimaryKeys();
 
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: tableName=' . $this->getTableName() . ',primaryKey=' . $primaryKey . ',primaryKeys()=' . count($primaryKeys));
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: tableName=' . $this->getTableName() . ',primaryKey=' . $primaryKey . ',primaryKeys()=' . count($primaryKeys));
 
                /*
                 * If this is not set, this could mean a badly written frontend as
@@ -139,7 +146,7 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
                        } // END - foreach
 
                        // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: tableName=' . $this->getTableName() . ',return=' . $return . ' - EXIT!');
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: tableName=' . $this->getTableName() . ',return=' . $return . ' - EXIT!');
 
                        // Return it
                        return $return;
@@ -148,13 +155,13 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
                        return $primaryKey;
                } else {
                        // @TODO Issue a warning
-                       self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: Primary key not set for table ' . $this->getTableName() . ', please fix your table. Falling back to unique key ...');
+                       self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: Primary key not set for table ' . $this->getTableName() . ', please fix your table. Falling back to unique key ...');
 
                        // Get unique key
                        $uniqueKey = trim($this->getCriteriaElemnent($this->getUniqueKey()));
 
                        // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: tableName=' . $this->getTableName() . ',uniqueKey=' . $uniqueKey);
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: tableName=' . $this->getTableName() . ',uniqueKey=' . $uniqueKey);
 
                        // Is it empty, too?
                        if (empty($uniqueKey)) {
@@ -214,7 +221,5 @@ class DataSetCriteria extends BaseCriteria implements StoreableCriteria {
                // Return it
                return $this->primaryKeys;
        }
-}
 
-// [EOF]
-?>
+}