added better detection of end verse

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@339 07627401-56e2-0310-80f4-f8cd0041bdcd

1 files changed, 11 insertions, 8 deletions

diff --git a/intf/collate2imp.cpp b/intf/collate2imp.cpp
index ee5a359..13a9fe3 100644
--- a/intf/collate2imp.cpp
+++ b/intf/collate2imp.cpp
@@ -41,13 +41,6 @@ int main(int argc, char **argv) {
 	bool more = true;
 	do {
 		more = FileMgr::getLine(fd, lineBuffer)!=0;
-		if (inVerse) {
-			if (lineBuffer.indexOf("</ab>") > -1) {
-				lineBuffer.setSize(lineBuffer.indexOf("</ab>"));
-				inVerse = false;
-			}
-			cout << lineBuffer.trim() << endl;
-		}
 		if (lineBuffer.startsWith(bookTag)) {
 			lineBuffer << bookTag.length();
 			SWBuf book = lineBuffer.stripPrefix('"');
@@ -70,7 +63,17 @@ int main(int argc, char **argv) {
 			else {
 				inVerse = true;
 			}
-			cout << "$$$" << vk.getOSISRef() << "\n";
+			lineBuffer.trim();
+			if (lineBuffer.length() > 0 && lineBuffer != "&om;") {
+				cout << "$$$" << vk.getOSISRef() << (vk.getVerse() ? "" : ".0") << "\n";
+				cout << lineBuffer << endl;
+			}
+		}
+		else if (inVerse) {
+			if (lineBuffer.indexOf("</ab>") > -1) {
+				lineBuffer.setSize(lineBuffer.indexOf("</ab>"));
+				inVerse = false;
+			}
 			cout << lineBuffer.trim() << endl;
 		}
 	} while (more);