From d0b22a371bdd4e8f09df8ba63c6206208c244c86 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sun, 30 Jun 2019 21:26:41 +0000 Subject: [PATCH] Use Composer's PSR-0 autoloader --- parse.php | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/parse.php b/parse.php index 148962d..3a81aa1 100644 --- a/parse.php +++ b/parse.php @@ -1,8 +1,7 @@ <?php require_once(__DIR__.'/vendor/autoload.php'); -require_once(__DIR__.'/lib/database.php'); require_once(__DIR__.'/lib/fetch.php'); -require_once(__DIR__.'/lib/mapper.php'); +require_once(__DIR__.'/lib/output.php'); require_once(__DIR__.'/lib/vehicle_types.php'); require_once(__DIR__.'/config.php'); @@ -76,18 +75,18 @@ throw new Exception('Ignoring result due to better data already present'); } + + $logger->info('Creating mapping...'); + $db->addMapping($mapping); - $jsonContent = []; - foreach($db->getAll() as $vehicle) { - $jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']); - } + $finalMapping = createMapping($db, $source['mapper'], $source); - $json = json_encode($jsonContent); - if(!file_put_contents($source['result_temp'], $json)) { - throw new Exception('Result save failed'); - } - rename($source['result_temp'], $source['result']); + + $logger->info('Creating vehicle list...'); + + createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source); + $logger->info('Finished'); } catch(Throwable $e) { $logger->error($e->getMessage(), ['exception' => $e, 'exception_string' => (string)$e]); -- Gitblit v1.9.1