From 50815ae67bc3a11745de29e70a06c80623b15b6c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 26 Nov 2024 13:09:35 +0100
Subject: [PATCH] fix(Import): increase error again, when there was a gap in
 column headers

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Service/ImportService.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index 1403ab233..09813aa35 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -457,6 +457,8 @@ private function getColumns(Row $firstRow, Row $secondRow): void {
 		$index = 0;
 		$countMatchingColumnsFromConfig = 0;
 		$countCreatedColumnsFromConfig = 0;
+		$lastCellWasEmpty = false;
+		$hasGapInTitles = false;
 		foreach ($cellIterator as $cell) {
 			if ($cell && $cell->getValue() !== null && $cell->getValue() !== '') {
 				$title = $cell->getValue();
@@ -480,12 +482,16 @@ private function getColumns(Row $firstRow, Row $secondRow): void {
 
 				// Convert data type to our data type
 				$dataTypes[] = $this->parseColumnDataType($secondRowCellIterator->current());
+				if ($lastCellWasEmpty) {
+					$hasGapInTitles = true;
+				}
+				$lastCellWasEmpty = false;
 			} else {
 				$this->logger->debug('No cell given or cellValue is empty while loading columns for importing');
 				if ($cell->getDataType() === 'null') {
 					// LibreOffice generated XLSX doc may have more empty columns in the first row.
-					// Continue without increasing error count.
-					// Question: What about tables where a column does not have a heading?
+					// Continue without increasing error count, but leave a marker to detect gaps in titles.
+					$lastCellWasEmpty = true;
 					continue;
 				}
 				$this->countErrors++;
@@ -494,6 +500,11 @@ private function getColumns(Row $firstRow, Row $secondRow): void {
 			$index++;
 		}
 
+		if ($hasGapInTitles) {
+			$this->logger->info('Imported table is having a gap in column titles');
+			$this->countErrors++;
+		}
+
 		$this->rawColumnTitles = $titles;
 		$this->rawColumnDataTypes = $dataTypes;