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 |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/parse.php b/parse.php
index ebd18cd..3a81aa1 100644
--- a/parse.php
+++ b/parse.php
@@ -1,8 +1,6 @@
 <?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');
@@ -82,21 +80,12 @@
 		
 		$db->addMapping($mapping);
 		
-		$jsonContent = [];
-		foreach($db->getAll() as $vehicle) {
-			$jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']);
-		}
-		
-		$json = json_encode($jsonContent);
-		if(!file_put_contents($source['result_temp'], $json)) {
-			throw new Exception('Result save failed');
-		}
-		rename($source['result_temp'], $source['result']);
+		$finalMapping = createMapping($db, $source['mapper'], $source);
 		
 		
 		$logger->info('Creating vehicle list...');
 		
-		createVehiclesList($mapper->getTTSSTrips(), $jsonContent, $source);
+		createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
 		
 		$logger->info('Finished');
 	} catch(Throwable $e) {

--
Gitblit v1.9.1