Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7755e3e8cb | ||
|
|
bc9bb20597 |
+13
-2
@@ -30,7 +30,6 @@ from sn_basis.modules.linkpruefer import Linkpruefer
|
|||||||
from sn_basis.modules.layerpruefer import Layerpruefer
|
from sn_basis.modules.layerpruefer import Layerpruefer
|
||||||
from sn_basis.modules.stilpruefer import Stilpruefer
|
from sn_basis.modules.stilpruefer import Stilpruefer
|
||||||
from sn_basis.modules.excel_importer import ExcelImporter
|
from sn_basis.modules.excel_importer import ExcelImporter
|
||||||
from sn_plan41.modules.listenauswerter import Listenauswerter
|
|
||||||
|
|
||||||
|
|
||||||
SourceType = Literal["service", "database", "excel", "unknown"]
|
SourceType = Literal["service", "database", "excel", "unknown"]
|
||||||
@@ -286,7 +285,19 @@ class DataGrabber:
|
|||||||
}
|
}
|
||||||
source_dict["rows"].append(result_row)
|
source_dict["rows"].append(result_row)
|
||||||
|
|
||||||
# Validierung über Listenauswerter
|
# Validierung über Listenauswerter – Import erst hier (statt am Modul-
|
||||||
|
# anfang), da DataGrabber generisch für alle sn_*-Plugins nutzbar sein
|
||||||
|
# soll und nicht bei jedem Aufruf zwingend sn_plan41 installiert ist;
|
||||||
|
# nur die Excel-Quellenverarbeitung braucht Listenauswerter.
|
||||||
|
try:
|
||||||
|
from sn_plan41.modules.listenauswerter import Listenauswerter
|
||||||
|
except ImportError as exc:
|
||||||
|
raise ImportError(
|
||||||
|
"Die Verarbeitung von Excel-Quellen benötigt das Plugin "
|
||||||
|
"sn_plan41 (sn_plan41.modules.listenauswerter.Listenauswerter), "
|
||||||
|
"das hier nicht installiert ist."
|
||||||
|
) from exc
|
||||||
|
|
||||||
listenauswerter = Listenauswerter(self.pruefmanager, self.stil_pruefer or Stilpruefer())
|
listenauswerter = Listenauswerter(self.pruefmanager, self.stil_pruefer or Stilpruefer())
|
||||||
validated, validation_results = listenauswerter.validate_rows(source_dict)
|
validated, validation_results = listenauswerter.validate_rows(source_dict)
|
||||||
results.extend(validation_results)
|
results.extend(validation_results)
|
||||||
|
|||||||
Reference in New Issue
Block a user