Code Cleanup

- Drops BareosSqlCompatHelper as it is no longer needed - Drops Log module as it is no longer needed - Cleans up various modules from old database related code Signed-off-by: Frank Bergkemper <frank.bergkemper@dass-it.de>
bareos · Oct 6, 2015 · 04cff74 · 04cff74
1 parent edaaa82
commit 04cff74
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 885 deletions.
diff --git a/module/Client/Module.php b/module/Client/Module.php
@@ -4,9 +4,6 @@
 
 use Client\Model\Client;
 use Client\Model\ClientTable;
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\TableGateway\TableGateway;
-use Bareos\Db\Sql\BareosSqlCompatHelper;
 
 class Module
 {
@@ -30,27 +27,5 @@ public function getConfig()
 		return include  __DIR__ . '/config/module.config.php';
 	}
 
-	public function getServiceConfig()
-	{
-		return array(
-			'factories' => array(
-				'Client\Model\ClientTable' => function($sm) {
-					$tableGateway = $sm->get('ClientTableGateway');
-					$table = new ClientTable($tableGateway);
-					return $table;
-				},
-				'ClientTableGateway' => function($sm) {
-					//$dbAdapter = $sm->get('Zend\Db\Adapter\Adapter');
-					$dbAdapter = $sm->get($_SESSION['bareos']['director']);
-					$resultSetPrototype = new ResultSet();
-					$resultSetPrototype->setArrayObjectPrototype(new Client());
-					$config = $sm->get('Config');
-					$bsqlch = new BareosSqlCompatHelper($config['db']['adapters'][$_SESSION['bareos']['director']]['driver']);
-					return new TableGateway($bsqlch->strdbcompat("Client"), $dbAdapter, null, $resultSetPrototype);
-				},
-			),
-		);
-	}
-
 }
 
diff --git a/module/Fileset/Module.php b/module/Fileset/Module.php
@@ -4,9 +4,6 @@
 
 use Fileset\Model\Fileset;
 use Fileset\Model\FilesetTable;
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\TableGateway\TableGateway;
-use Bareos\Db\Sql\BareosSqlCompatHelper;
 
 class Module
 {
@@ -30,27 +27,5 @@ public function getConfig()
 		return include  __DIR__ . '/config/module.config.php';
 	}
 
-	public function getServiceConfig()
-	{
-		return array(
-			'factories' => array(
-				'Fileset\Model\FilesetTable' => function($sm) {
-					$tableGateway = $sm->get('FilesetTableGateway');
-					$table = new FilesetTable($tableGateway);
-					return $table;
-				},
-				'FilesetTableGateway' => function($sm) {
-					//$dbAdapter = $sm->get('Zend\Db\Adapter\Adapter');
-					$dbAdapter = $sm->get($_SESSION['bareos']['director']);
-					$resultSetPrototype = new ResultSet();
-					$resultSetPrototype->setArrayObjectPrototype(new Fileset());
-					$config = $sm->get('Config');
-					$bsqlch = new BareosSqlCompatHelper($config['db']['adapters'][$_SESSION['bareos']['director']]['driver']);
-					return new TableGateway($bsqlch->strdbcompat("FileSet"), $dbAdapter, null, $resultSetPrototype);
-				},
-			),
-		);
-	}
-
 }
 
diff --git a/module/Fileset/src/Fileset/Model/FilesetTable.php b/module/Fileset/src/Fileset/Model/FilesetTable.php
@@ -25,110 +25,7 @@
 
 namespace Fileset\Model;
 
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\Sql\Select;
-use Zend\Paginator\Adapter\DbSelect;
-use Zend\Paginator\Paginator;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Bareos\Db\Sql\BareosSqlCompatHelper;
-
-class FilesetTable implements ServiceLocatorAwareInterface
+class FilesetTable
 {
-
-	protected $tableGateway;
-
-	public function __construct(TableGateway $tableGateway)
-	{
-		$this->tableGateway = $tableGateway;
-	}
-
-	public function setServiceLocator(ServiceLocatorInterface $serviceLocator) {
-                $this->serviceLocator = $serviceLocator;
-        }
-
-        public function getServiceLocator() {
-                return $this->serviceLocator;
-        }
-
-        public function getDbDriverConfig() {
-                $config = $this->getServiceLocator()->get('Config');
-                return $config['db']['adapters'][$_SESSION['bareos']['director']]['driver'];
-        }
-
-	public function fetchAll($paginated=false, $order_by=null, $order=null)
-	{
-		$bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-		$select = new Select();
-		$select->from($bsqlch->strdbcompat("FileSet"));
-
-		if($order_by != null && $order != null) {
-                        $select->order($bsqlch->strdbcompat($order_by) . " " . $order);
-                }
-                else {
-                        $select->order($bsqlch->strdbcompat("FileSetId") . " DESC");
-                }
-
-		if($paginated) {
-			$resultSetPrototype = new ResultSet();
-			$resultSetPrototype->setArrayObjectPrototype(new Fileset());
-			$paginatorAdapter = new DbSelect(
-						$select,
-						$this->tableGateway->getAdapter(),
-						$resultSetPrototype
-					);
-			$paginator = new Paginator($paginatorAdapter);
-			return $paginator;
-		}
-		else {
-			$resultSet = $this->tableGateway->selectWith($select);
-			return $resultSet;
-		}
-	}
-
-	public function getFileset($id)
-	{
-		$bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-		$id = (int) $id;
-		$rowset = $this->tableGateway->select(array(
-			$bsqlch->strdbcompat("FileSetId") => $id));
-		$row = $rowset->current();
-		if(!$row) {
-			throw new \Exception("Could not find row $id");
-		}
-		return $row;
-	}
-
-	public function getFilesetHistory($id)
-	{
-		$fset = $this->getFileSet($id);
-                $bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-                $select = new Select();
-                $select->from($bsqlch->strdbcompat("FileSet"));
-                $select->where($bsqlch->strdbcompat("FileSet") . " = '". $fset->fileset . "'");
-                $select->order($bsqlch->strdbcompat("CreateTime") . " DESC");
-
-                $resultSet = $this->tableGateway->selectWith($select);
-
-                return $resultSet;
-        }
-
-	public function getFilesetNum()
-	{
-		$bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-		$select = new Select();
-		$select->from($bsqlch->strdbcompat("FileSet"));
-		$resultSetPrototype = new ResultSet();
-		$resultSetPrototype->setArrayObjectPrototype(new Fileset());
-		$rowset = new DbSelect(
-			$select,
-			$this->tableGateway->getAdapter(),
-			$resultSetPrototype
-		);
-		$num = $rowset->count();
-		return $num;
-	}
-
 }
 
diff --git a/module/Job/Module.php b/module/Job/Module.php
@@ -4,35 +4,10 @@
 
 use Job\Model\Job;
 use Job\Model\JobTable;
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\TableGateway\TableGateway;
-use Bareos\Db\Sql\BareosSqlCompatHelper;
 
 class Module
 {
 
-	public function getServiceConfig()
-	{
-		return array(
-			'factories' => array(
-				'Job\Model\JobTable' => function($sm) {
-					$tableGateway = $sm->get('JobTableGateway');
-					$table = new JobTable($tableGateway);
-					return $table;
-				},
-				'JobTableGateway' => function($sm) {
-					//$dbAdapter = $sm->get('Zend\Db\Adapter\Adapter');
-					$dbAdapter = $sm->get($_SESSION['bareos']['director']);
-					$resultSetPrototype = new ResultSet();
-					$resultSetPrototype->setArrayObjectPrototype(new Job());
-					$config = $sm->get('Config');
-					$bsqlch = new BareosSqlCompatHelper($config['db']['adapters'][$_SESSION['bareos']['director']]['driver']);
-					return new TableGateway($bsqlch->strdbcompat("Job"), $dbAdapter, null, $resultSetPrototype);
-				},
-			),
-		);
-	}
-
 	public function getAutoloaderConfig()
 	{
 		return array(

diff --git a/module/Log/Module.php b/module/Log/Module.php
diff --git a/module/Log/autoload_classmap.php b/module/Log/autoload_classmap.php
diff --git a/module/Log/config/module.config.php b/module/Log/config/module.config.php