Merge branch 'daniel/bugfix-nested-element-parsing' of gogsadmin/pljava-jsword into master

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>one.shandan</groupId>
   <artifactId>pljava-jsword</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.1.1-SNAPSHOT</version>
 
   <!-- Coordinates are nice, but so are names and descriptions for humans. -->
 

src/main/java/PlJavaJSword.java

@@ -55,40 +55,57 @@ public class PlJavaJSword {
       return null;
     }
   }
+  private static String parseText(String text){
+    String t = text.trim();
+    if (t.isEmpty() || PUNCTUATION.contains(t.charAt(0))){
+      return t;
+    } else {
+      return " " + t;
+    }
+  }
   private static String parseVerse(Iterator<Content> content){
     String verse = "";
     while (content.hasNext()){
       Content c = content.next();
-      if (c.getCType() == CType.Element){
-        Element e = (Element)c;
-        if (e.getName() != "note"){
-          verse += " " + e.getValue().trim();
-        }
-      } else if (c.getCType() == CType.Text){
-        String t = ((Text)c).getValue().trim();
-        if (t.isEmpty() || PUNCTUATION.contains(t.charAt(0))){
-          verse += t;
-        } else {
-          verse += " " + t;
-        }
+      switch (c.getCType()){
+        case Element:
+          Element e = (Element)c;
+          switch (e.getName()){
+            case "note":
+              break;
+            default:
+              logger.info(e.getName() + " " + e.getValue());
+              verse += " " + parseContent(e.getContent().listIterator());
+          }
+          break;
+        case Text:
+          verse += parseText(c.getValue());
+          break;
       }
     }
     return verse.trim();
   }
-  private static String parseContent(Iterator<Content> content)
-  {
-     List<String> ret = new ArrayList<String>();
-     while (content.hasNext()){
-       Content c = content.next();
-       if (c.getCType() == CType.Element){
-         Element e = (Element)c;
-         if (e.getName() == "verse"){
-           String part = parseVerse(e.getContent().listIterator());
-           ret.add(part);
-         }
-       }
-     }
-     return String.join(" ", ret);
+  private static String parseContent(Iterator<Content> content){
+    List<String> ret = new ArrayList<String>();
+    while (content.hasNext()){
+      Content c = content.next();
+      switch(c.getCType()){
+        case Element:
+          Element e = (Element)c;
+          switch (e.getName()){
+            case "verse":
+            case "q":
+              String part = parseVerse(e.getContent().listIterator());
+              ret.add(part);
+            default:
+              logger.warn(e.getName() + " " + e.getValue());
+          }
+          break;
+        case Text:
+          ret.add(parseText(c.getValue()).trim());
+      }
+    }
+    return String.join(" ", ret);
   }
   @Function(onNullInput=RETURNS_NULL, effects=IMMUTABLE, trust=SANDBOXED)
   public static String getText(String translation, String reference) throws BookException {

src/test/java/TestPlJavaJSword.java

@@ -7,6 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class TestPlJavaJSword {
   private static final String KJV_GEN_1_1_3 = "In the beginning God created the heaven and the earth. And the earth was without form, and void; and darkness was upon the face of the deep. And the Spirit of God moved upon the face of the waters. And God said, Let there be light: and there was light.";
   private static final String MKJV_GEN_1_1_3 = "In the beginning God created the heaven and the earth. And the earth was without form and empty. And darkness was on the face of the deep. And the Spirit of God moved on the face of the waters. And God said, Let there be light. And there was light.";
+  private static final String ESV_GEN_1_1 = "In the beginning, God created the heavens and the earth.";
+  private static final String ESV_MT_6_33 = "But seek first the kingdom of God and his righteousness, and all these things will be added to you.";
   @Test
   public void testIsValidVerseValidVerse(){
     assertEquals(true, PlJavaJSword.isValidVerse("Gen 1:1"));
@@ -21,7 +23,7 @@ public class TestPlJavaJSword {
   }
   @Test
   public void testTextParse() throws BookException {
-    assertEquals("In the beginning, God created the heavens and the earth.", PlJavaJSword.getText("ESV", "Genesis 1:1"));
+    assertEquals(ESV_GEN_1_1, PlJavaJSword.getText("ESV", "Genesis 1:1"));
   }
   @Test
   public void testTextMany() throws BookException {
@@ -32,6 +34,10 @@ public class TestPlJavaJSword {
     assertEquals(MKJV_GEN_1_1_3, PlJavaJSword.getText("MKJV", "Genesis 1:1-3"));
   }
   @Test
+  public void testTextParseMore() throws BookException {
+    assertEquals(ESV_MT_6_33, PlJavaJSword.getText("ESV", "Mt. 6:33"));
+  }
+  @Test
   public void testDefaultText() throws BookException {
     assertEquals("In the beginning God created the heaven and the earth.", PlJavaJSword.getDefaultText("Genesis 1:1"));
   }