Bible book name caption (#654)

* bible: parse bible book name from the caption XML node * bible book: fix bsname parsing * bible book: fix book name in caption parsing * fix the go syntax
quelea-projection · May 10, 2024 · 15328e6 · 15328e6
1 parent 2e6e6f7
commit 15328e6
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/Quelea/src/main/java/org/quelea/data/bible/BibleBook.java b/Quelea/src/main/java/org/quelea/data/bible/BibleBook.java
@@ -168,23 +168,36 @@ public static BibleBook parseXML(Node node, int defaultBookNum, String defaultBo
         } else if (node.getAttributes().getNamedItem("osisID") != null) {
             ret.bookName = node.getAttributes().getNamedItem("osisID").getNodeValue();
         } else {
-            ret.bookName = defaultBookName;
-        }
-
-        if (node.getAttributes().getNamedItem("bsname") != null) {
-            ret.bsname = node.getAttributes().getNamedItem("bsname").getNodeValue();
-        } else {
-            ret.bsname = ret.bookName;
+            ret.bookName = "";
         }
+
         NodeList list = node.getChildNodes();
         for (int i = 0; i < list.getLength(); i++) {
             if (list.item(i).getNodeName().equalsIgnoreCase("chapter")
                     || list.item(i).getNodeName().equalsIgnoreCase("c")) {
                 BibleChapter chapter = BibleChapter.parseXML(list.item(i), i);
                 chapter.setBook(ret);
                 ret.addChapter(chapter);
+
+                if (ret.bookName == "" && i == 0) {
+                    Node caption = list.item(i).getFirstChild();
+                    if (caption != null && caption.getNodeName().equalsIgnoreCase("caption")) {
+                        ret.bookName = caption.getNodeValue();
+                    }
+                }
             }
         }
+
+        if (ret.bookName == "") {
+            ret.bookName = defaultBookName;
+        }
+
+        if (node.getAttributes().getNamedItem("bsname") != null) {
+            ret.bsname = node.getAttributes().getNamedItem("bsname").getNodeValue();
+        } else {
+            ret.bsname = ret.bookName;
+        }
+
         LOGGER.log(Level.INFO, "Parsed " + ret.getChapters().length + " chapters in " + ret.bookName);
         return ret;
     }