dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- new "_NPC faction_" added for k-space systems, closed #773

Browse Source 
- improved file structure for _Model_ classes (`app/main/model/..`). Group by database name
- improved database connection handling (fixed persistent DB connections)
This commit is contained in:
Mark Friedrich
2019-04-12 21:34:29 +02:00
parent c21e33d231
commit a33615445e
117 changed files with 1578 additions and 1277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/main/controller/api/setup.php
View File

@@ -1,7 +1,7 @@
<?php
/**
* Created by PhpStorm.
* User: exodu
* User: Exodus 4D
* Date: 27.05.2018
* Time: 14:17
*/
@@ -9,7 +9,6 @@
namespace Controller\Api;
use Controller;
use DB\Database;
use Model;
class Setup extends Controller\Controller {
@@ -75,7 +74,7 @@ class Setup extends Controller\Controller {
$offset = $count * $length;
$buildInfo = $controller->setupCategory($categoryId, $offset, $length);
$categoryUniverseModel = Model\Universe\BasicUniverseModel::getNew('CategoryModel');
$categoryUniverseModel = Model\Universe\AbstractUniverseModel::getNew('CategoryModel');
$categoryUniverseModel->getById($categoryId, 0);
$return->countAll = (int)$f3->get('REQUIREMENTS.DATA.STRUCTURES');
$return->countBuild = array_reduce($buildInfo, $sum, 0);
@@ -88,7 +87,7 @@ class Setup extends Controller\Controller {
$offset = $count * $length;
$buildInfo = $controller->setupCategory($categoryId, $offset, $length);
$categoryUniverseModel = Model\Universe\BasicUniverseModel::getNew('CategoryModel');
$categoryUniverseModel = Model\Universe\AbstractUniverseModel::getNew('CategoryModel');
$categoryUniverseModel->getById($categoryId, 0);
$return->countAll = (int)$f3->get('REQUIREMENTS.DATA.SHIPS');
$return->countBuild = array_reduce($buildInfo, $sum, 0);
@@ -100,7 +99,7 @@ class Setup extends Controller\Controller {
$this->setupSystemJumpTable();
$return->countAll = (int)$f3->get('REQUIREMENTS.DATA.NEIGHBOURS');
$return->countBuild = Database::instance()->getRowCount('system_neighbour');
$return->countBuild = $f3->DB->getDB('PF')->getRowCount('system_neighbour');
$return->countBuildAll = $return->countBuild;
$return->progress = $percent($return->countAll, $return->countBuildAll);
break;
@@ -135,8 +134,8 @@ class Setup extends Controller\Controller {
switch($type) {
case 'Systems':
$controller->clearSystemsIndex();
$systemUniverseModel = Model\Universe\BasicUniverseModel::getNew('SystemModel');
$return->countAll = Database::instance()->getRowCount($systemUniverseModel->getTable(), 'UNIVERSE');
$systemUniverseModel = Model\Universe\AbstractUniverseModel::getNew('SystemModel');
$return->countAll = $f3->DB->getDB('UNIVERSE')->getRowCount($systemUniverseModel->getTable());
break;
}