Overview
Comment:Fix import CSV
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA1: 6fc32b49e88315c68174691f2f628cf69c08ac86
User & Date: bohwaz on 2020-10-25 20:46:54
Other Links: branch diff | manifest | tags
Context
2020-10-25
20:47
Alpha2 release check-in: c5fd36830f user: bohwaz tags: dev, 1.0.0-alpha2
20:46
Fix import CSV check-in: 6fc32b49e8 user: bohwaz tags: dev
19:15
Allow to use a local config.local.php check-in: 6d9c4e3122 user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/CSV.php from [d27a94c923] to [ce12833e64].

198
199
200
201
202
203
204
205
206
207
208
209
210
211
212

	static public function importUpload(array $file, array $expected_columns): \Generator
	{
		if (empty($file['size']) || empty($file['tmp_name'])) {
			throw new UserException('Fichier invalide');
		}

		self::import($file['tmp_name']);
	}

	static public function import(string $file, array $expected_columns): \Generator
	{
		$fp = fopen($file, 'r');

		if (!$fp) {







|







198
199
200
201
202
203
204
205
206
207
208
209
210
211
212

	static public function importUpload(array $file, array $expected_columns): \Generator
	{
		if (empty($file['size']) || empty($file['tmp_name'])) {
			throw new UserException('Fichier invalide');
		}

		return self::import($file['tmp_name'], $expected_columns);
	}

	static public function import(string $file, array $expected_columns): \Generator
	{
		$fp = fopen($file, 'r');

		if (!$fp) {