diff --git a/zml2lido/data/xsl/zml2lido/inscriptions.xsl b/zml2lido/data/xsl/zml2lido/inscriptions.xsl index 0aa5a47..3666764 100644 --- a/zml2lido/data/xsl/zml2lido/inscriptions.xsl +++ b/zml2lido/data/xsl/zml2lido/inscriptions.xsl @@ -74,6 +74,7 @@ + For SMB, inscriptions can be external or internal to the object as determined by type. @@ -211,9 +212,6 @@ --> - @@ -228,12 +226,6 @@ - - - - - - @@ -244,7 +236,7 @@ sorttest2: - + diff --git a/zml2lido/lidoTool.py b/zml2lido/lidoTool.py index e127d15..775ecbb 100644 --- a/zml2lido/lidoTool.py +++ b/zml2lido/lidoTool.py @@ -31,9 +31,10 @@ currently not used/tested. """ +import datetime +import logging from lxml import etree from pathlib import Path -import logging import os import re from saxonche import PySaxonProcessor @@ -370,11 +371,17 @@ def _analyze_chunkFn(self, *, src: str | Path) -> tuple[str, int, str]: return root, no, tail def _initLog(self) -> None: - logfile = self.outdir / "lidoTool.log" + now = datetime.datetime.now() + date = now.strftime("%Y%m%d") + log_fn = self.outdir / f"lidoTool{date}.log" - # let's append to the log file so we can aggregrate results from multiple runs logging.basicConfig( - filename=logfile, filemode="a", encoding="utf-8", level=logging.INFO + datefmt="%Y%m%d %I:%M:%S %p", + filename=log_fn, + filemode="a", # append now since we're starting a new folder + encoding="utf-8", + level=logging.DEBUG, + format="%(asctime)s: %(message)s", ) def _lvl2_path(self, p: str | Path) -> Path: diff --git a/zml2lido/relWorksCache.py b/zml2lido/relWorksCache.py index f46e252..2190099 100644 --- a/zml2lido/relWorksCache.py +++ b/zml2lido/relWorksCache.py @@ -61,7 +61,7 @@ def lookup_from_lido_file(self, *, path: Path) -> None: Should we check that we don't process a lido lvl2 file that has already been processed? """ - print(f"relWorksCache: lookup_from_lido_file") + print(f"relWorksCache: lookup_from_lido_file {path}") IDs = self._lido_to_ids(path=path) for mtype, id_int in IDs: self.lookup_relWork(mtype=mtype, ID=id_int)