Feature/nex 334/global newsql schema branch

common/class.Utils.php

@@ -1,7 +1,4 @@
 <?php
-use oat\oatbox\PhpSerializable;
-use oat\oatbox\service\ServiceManager;
-use oat\generis\model\kernel\uri\UriProvider;
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -23,6 +20,10 @@
  *
  */
 
+use oat\oatbox\PhpSerializable;
+use oat\oatbox\service\ServiceManager;
+use oat\generis\model\kernel\uri\UriProvider;
+
 /**
  *
  * Generis Object Oriented API - common/class.Utils.php

common/ext/class.GenerisInstaller.php

@@ -17,8 +17,9 @@
  * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
  *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
  * 				 2013-2014 (update and modification) Open Assessment Technologies SA;
- * 
  */
+
+use core_kernel_api_ModelFactory as ModelFactory;
 use oat\generis\model\data\ModelManager;
 use oat\generis\model\kernel\persistence\smoothsql\search\ComplexSearchService;
 use oat\oatbox\service\ServiceManager;
@@ -48,16 +49,20 @@ public function install()
         }
 
         $this->installLoadDefaultConfig();
+
+        // Id of the writable model.
+        $modelFactory = $this->getServiceManager()->get(ModelFactory::SERVICE_ID);
+        $writableModelId = $modelFactory->getModelId(LOCAL_NAMESPACE);
 
         $model = new \core_kernel_persistence_smoothsql_SmoothModel(array(
             \core_kernel_persistence_smoothsql_SmoothModel::OPTION_PERSISTENCE => 'default',
-            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_READABLE_MODELS => array('1'),
-            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_WRITEABLE_MODELS => array('1'),
-            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_NEW_TRIPLE_MODEL => '1',
+            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_READABLE_MODELS => [$writableModelId],
+            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_WRITEABLE_MODELS => [$writableModelId],
+            \core_kernel_persistence_smoothsql_SmoothModel::OPTION_NEW_TRIPLE_MODEL => $writableModelId,
             \core_kernel_persistence_smoothsql_SmoothModel::OPTION_SEARCH_SERVICE => ComplexSearchService::SERVICE_ID,
             \core_kernel_persistence_smoothsql_SmoothModel::OPTION_CACHE_SERVICE => common_cache_Cache::SERVICE_ID
         ));
-        $model->setServiceLocator(ServiceManager::getServiceManager());
+        $model->setServiceLocator($this->getServiceManager());
         ModelManager::setModel($model);
 
         $this->installOntology();

common/ext/class.Namespace.php

@@ -1,23 +1,23 @@
-<?php
-/**  
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; under version 2
- * of the License (non-upgradable).
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- * 
- * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
- *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
- * 
- */
+<?php
+/**  
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 
+ * Copyright (c) 2008-2010 (original work) Deutsche Institut für Internationale Pädagogische Forschung (under the project TAO-TRANSFER);
+ *               2009-2012 (update and modification) Public Research Centre Henri Tudor (under the project TAO-SUSTAIN & TAO-DEV);
+ * 
+ */
 
 /**
  * Short description of class common_ext_Namespace
@@ -40,130 +40,81 @@ class common_ext_Namespace
      * @access protected
      * @var int
      */
-    protected $modelId = 0;
+    protected $modelId;
 
     /**
      * the namespace URI
      *
      * @access protected
      * @var string
      */
-    protected $uri = '';
+    protected $uri;
 
     // --- OPERATIONS ---
 
     /**
      * Create a namespace instance
      *
-     * @access public
-     * @author Jerome Bogaerts, <[email protected]>
-     * @param  int id
-     * @param  string uri
-     * @return mixed
+     * @param string|int id
+     * @param string uri
      */
-    public function __construct($id = 0, $uri = '')
+    public function __construct($id, $uri = '')
     {
-
-
-    	if($id > 0){
-    		$this->modelId = $id;
-    	}
-    	if(!empty($uri)){
-    		$this->uri = $uri;
-    	}
-
-
+  		$this->modelId = $id;
+   		$this->uri = $uri;
     }
 
     /**
      * Get the identifier of the namespace instance
      *
-     * @access public
-     * @author Jerome Bogaerts, <[email protected]>
-     * @return int
+     * @return string|int
      */
     public function getModelId()
     {
-        $returnValue = (int) 0;
-
-
-
-        $returnValue = $this->modelId;
-
-
-
-        return (int) $returnValue;
+        return $this->modelId;
     }
 
     /**
      * Get the namespace URI
      *
-     * @access public
-     * @author Jerome Bogaerts, <[email protected]>
      * @return string
      */
     public function getUri()
     {
-        $returnValue = (string) '';
-
-
-
-        $returnValue = $this->uri;
-
-
-
-        return (string) $returnValue;
+        return $this->uri;
     }
 
     /**
      * Magic method, return the Namespace URI
      *
-     * @access public
-     * @author Jerome Bogaerts, <[email protected]>
      * @return string
      */
     public function __toString()
     {
-        $returnValue = (string) '';
-
-
-
-        $returnValue = $this->getUri();
-
-
-
-        return (string) $returnValue;
+        return $this->getUri();
     }
 
     /**
      * Remove a namespace from the ontology. All triples bound to the model will
      * be removed.
      *
-     * @access public
-     * @author Jerome Bogaerts, <[email protected]>
      * @return boolean
      */
     public function remove()
     {
-        $returnValue = (bool) false;
-
-
         $db = core_kernel_classes_DbWrapper::singleton();
+
+        // TODO refactor this to use triple store abstraction.
         if (false === $db->exec("DELETE FROM statements WHERE modelid = ?", array($this->getModelId()))){
-        	$returnValue = false;
+        	return false;
         }
-        else{
-        	if (false === $db->exec("DELETE FROM models WHERE modelid = ?", array($this->getModelId()))){
-        		$returnValue = false;
-        	}
-        	else{
-        		$returnValue = true;
-        	}
+
+        // TODO refactor this to use triple store abstraction.
+        if (false === $db->exec("DELETE FROM models WHERE modelid = ?", array($this->getModelId()))){
+            return false;
         }
 
-
-
-        return (bool) $returnValue;
+        return true;
     }
 
-}
+}

common/persistence/class.Persistence.php

@@ -21,6 +21,7 @@
  * @package generis
  *
  */
+
 abstract class common_persistence_Persistence
 {
     /**
@@ -102,15 +103,5 @@ protected function getParams(){
     protected function setParams($params){
         $this->params = $params;
     }
-
-    /**
-     * Generates a unique, not auto-increment based, primary key.
-     *
-     * @return string
-     */
-    public function getUniquePrimaryKey()
-    {
-        return strrev(uniqid('', true));
-    }
 }