From f6f79198b6467435fd7caccd2067eb0a29c97787 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 21 Jun 2019 22:58:16 +0000
Subject: [PATCH] Move mapping creation to a function in lib/output.php
---
parse.php | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/parse.php b/parse.php
index 148962d..8a5416e 100644
--- a/parse.php
+++ b/parse.php
@@ -3,6 +3,7 @@
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 +77,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']);
- }
+ 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(), $jsonContent, $source);
+
$logger->info('Finished');
} catch(Throwable $e) {
$logger->error($e->getMessage(), ['exception' => $e, 'exception_string' => (string)$e]);
--
Gitblit v1.9.1