<style>
/* Changing the layout to use less space for mobiles */
@media screen and (max-device-width: 480px), screen and (-webkit-min-device-pixel-ratio: 2) {
#email-body { min-width: 30em !important; }
#email-page { padding: 8px !important; }
#email-banner { padding: 8px 8px 0 8px !important; }
#email-avatar { margin: 1px 8px 8px 0 !important; padding: 0 !important; }
#email-fields { padding: 0 8px 8px 8px !important; }
#email-gutter { width: 0 !important; }
}
</style>
<div id="email-body">
<table id="email-wrap" align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#f0f0f0;color:#000000;width:100%;">
<tr valign="top">
<td id="email-page" style="padding:16px !important;">
<table align="center" border="0" cellpadding="0" cellspacing="0" style="background-color:#ffffff;border:1px solid #bbbbbb;color:#000000;width:100%;">
<tr valign="top">
<td bgcolor="#4d5c47" style="background-color:#4d5c47;color:#ffffcc;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;line-height:1;"><img src="http://www.crosswire.org/bugs/s/en_US-yo8pp7/733/14/_/jira-logo-scaled.png" alt="" style="vertical-align:top;" /></td>
</tr><tr valign="top">
<td id="email-banner" style="padding:32px 32px 0 32px;">
<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="width:100%;">
<tr valign="top">
<td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;padding:0;">
<img id="email-avatar" src="http://www.crosswire.org/bugs/secure/useravatar?avatarId=10062" alt="" height="48" width="48" border="0" align="left" style="padding:0;margin: 0 16px 16px 0;" />
<div id="email-action" style="padding: 0 0 8px 0;font-size:12px;line-height:18px;">
<a class="user-hover" rel="mjdenham" id="email_mjdenham" href="http://www.crosswire.org/bugs/secure/ViewProfile.jspa?name=mjdenham" style="color:#000000;">Martin Denham</a>
commented on <img src="http://www.crosswire.org/bugs/images/icons/bug.gif" height="16" width="16" border="0" align="absmiddle" alt="Bug"> <a style='color:#000000;text-decoration:none;' href='http://www.crosswire.org/bugs/browse/JS-224'>JS-224</a>
</div>
<div id="email-summary" style="font-size:16px;line-height:20px;padding:2px 0 16px 0;">
<a style='color:#000000;text-decoration:none;' href='http://www.crosswire.org/bugs/browse/JS-224'><strong>Merged verses are repeated</strong></a>
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr valign="top">
<td id="email-fields" style="padding:0 32px 32px 32px;">
<table border="0" cellpadding="0" cellspacing="0" style="padding:0;text-align:left;width:100%;" width="100%">
<tr valign="top">
<td id="email-gutter" style="width:64px;white-space:nowrap;"></td>
<td>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr valign="top">
<td colspan="2" style="color:#000000;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:12px;padding:0 0 16px 0;width:100%;">
<div class="comment-block" style="background-color:#edf5ff;border:1px solid #dddddd;color:#000000;padding:12px;"><p>Okay, here is an experimental patch to ZVerseBackend. It relies on the fact that blockNum, verseStart, and verseSize are the same for merged verses. Any comments?</p>
<p>Index: ZVerseBackend.java<br/>
===================================================================<br/>
— ZVerseBackend.java (revision 2195)<br/>
+++ ZVerseBackend.java (working copy)<br/>
@@ -34,6 +34,7 @@<br/>
import org.crosswire.common.util.Logger;<br/>
import org.crosswire.common.util.NetUtil;<br/>
import org.crosswire.jsword.JSMsg;<br/>
+import org.crosswire.jsword.book.BookCategory;<br/>
import org.crosswire.jsword.book.BookException;<br/>
import org.crosswire.jsword.book.DataPolice;<br/>
import org.crosswire.jsword.passage.Key;<br/>
@@ -117,6 +118,8 @@<br/>
public ZVerseBackend(SwordBookMetaData sbmd, BlockType blockType) {
super(sbmd);
this.blockType = blockType;
+ // Some commentaries like MHC show the same content for several adjacent verses, but merged verses should not be duplicated
+ this.isPreventDuplicateVerseContent = BookCategory.BIBLE.equals(sbmd.getBookCategory());
}</p>
<p> /*<br/>
@@ -322,6 +325,17 @@<br/>
int verseStart = SwordUtil.decodeLittleEndian32(temp, 4);<br/>
int verseSize = SwordUtil.decodeLittleEndian16(temp, 8);</p>
<p>+ //MJD start<br/>
+ // do not return duplicate text for merged verses<br/>
+ if (isPreventDuplicateVerseContent && index==lastIndex+1 && blockNum==lastBlockNum && verseStart==lastVerseStart && verseSize==lastVerseSize) {
+ lastIndex = index;
+ return "";
+ }<br/>
+ lastIndex = index;<br/>
+ lastVerseStart = verseStart;<br/>
+ lastVerseSize = verseSize;<br/>
+ //MJD end<br/>
+<br/>
// Can we get the data from the cache<br/>
byte[] uncompressed = null;<br/>
if (blockNum == lastBlockNum && testament == lastTestament) {<br/>
@@ -400,6 +414,11 @@<br/>
*/<br/>
private int lastTestament = -1;</p>
<p>+ private boolean isPreventDuplicateVerseContent;<br/>
+ <br/>
+ private long lastIndex = -1;<br/>
+ private int lastVerseStart = -1;<br/>
+ private int lastVerseSize = -1;<br/>
/**<br/>
*<br/>
*/</p>
<p>Martin</p></div>
<div style="color:#505050;padding:4px 0 0 0;"> </div>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td><!-- End #email-page -->
</tr>
<tr valign="top">
<td style="color:#505050;font-family:Arial,FreeSans,Helvetica,sans-serif;font-size:10px;line-height:14px;padding: 0 16px 16px 16px;text-align:center;">
This message is automatically generated by JIRA.<br />
If you think it was sent incorrectly, please contact your <a style='color:#000000;' href='http://www.crosswire.org/bugs/secure/ContactAdministrators!default.jspa'>JIRA administrators</a>.<br />
For more information on JIRA, see: <a style='color:#000000;' href='http://www.atlassian.com/software/jira'>http://www.atlassian.com/software/jira</a>
</td>
</tr>
</table><!-- End #email-wrap -->
</div><!-- End #email-body -->