Table references are processed with uid, not label

EditionOpenAccess · Dec 18, 2019 · 525320f · 525320f
1 parent b129fac
commit 525320f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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")