From 525320fee199ff07528177e05843a7102afe87d9 Mon Sep 17 00:00:00 2001 From: kthoden Date: Wed, 18 Dec 2019 09:56:31 +0100 Subject: [PATCH] Table references are processed with uid, not label --- src/imxml2django.py | 6 +++--- src/imxml2epub.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/imxml2django.py b/src/imxml2django.py index 630ca03..b1995f6 100755 --- a/src/imxml2django.py +++ b/src/imxml2django.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8; mode: python -*- -# Time-stamp: <2019-12-17 12:03:08 (kthoden)> +# Time-stamp: <2019-12-17 16:35:51 (kthoden)> """ Create an XML file that can be inserted into the Django database @@ -1691,9 +1691,9 @@ def bring_footnote_down_django(footnote, fragment, footnote_number, object_numbe if xmlParent.tag == "EOAchapter": strChapterOrder = xmlParent.get("order") strObjectOrder = xmlEOAfootnote.get("order") - if xmlReferenceLabelText in dictTables: + if xmlReferenceRefTarget in dictTables: logging.debug("Found link to table") - strResult = dictTables[xmlReferenceLabelText] + strResult = dictTables[xmlReferenceRefTarget] xmlEOAtables = xmlEOAdocument.findall(".//EOAtable") for xmlEOAtable in xmlEOAtables: tmpReferenceRefTarget = xmlEOAtable.get("label") diff --git a/src/imxml2epub.py b/src/imxml2epub.py index 829d619..ed7d6dd 100755 --- a/src/imxml2epub.py +++ b/src/imxml2epub.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8; mode: python -*- -# Time-stamp: <2019-12-09 16:26:29 (kthoden)> +# Time-stamp: <2019-12-18 09:44:30 (kthoden)> """ Convert a customized DocBook XML file into a set of files that constitute the contents of an EPUB file. @@ -1478,7 +1478,7 @@ class FootnoteError(Exception): strTableCaption = xmlTable.find(".//EOAtablecaption").text or "" # logging.info("Working on ", strTableCaption) if strTableCaption != "nonumber": - intTableNumber = dictTables[xmlTable.find(".//EOAtablelabel").text] + intTableNumber = dictTables[xml_table_id] xmlTableCaption = etree.Element("p") xmlTableCaption.text = str(intTableNumber) + " " + strTableCaption if xmlTable.find(".//EOAtablecaption").getchildren() is not None: @@ -1713,9 +1713,9 @@ class FootnoteError(Exception): if xmlReferenceRefTarget in dictTheorems: logging.info("Verweis auf Theorem gefunden") strResult = dictTheorems[xmlReferenceRefTarget] - if xmlReferenceLabelText in dictTables: + if xmlReferenceRefTarget in dictTables: logging.info("Verweis auf Tabelle gefunden") - strResult = dictTables[xmlReferenceLabelText] + strResult = dictTables[xmlReferenceRefTarget] tmpTail = xmlReference.tail or "" #tmpTail = tmpTail.strip() logging.info("XXXXXXXX")