Revision: e3e8975f1952 Branch: default Author: Sahel "sahel.mastoureshgh@xxxxxxxxx" Date: Thu Jul 17 18:48:06 2014 UTC Log: removed page word from page element in Braille side http://code.google.com/p/brailleblaster/source/detail?r=e3e8975f1952 Modified: /src/main/org/brailleblaster/archiver/EPub3Archiver.java /src/main/org/brailleblaster/document/BBDocument.java/src/main/org/brailleblaster/perspectives/braille/mapping/elements/PageMapElement.java /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java
=======================================--- /src/main/org/brailleblaster/archiver/EPub3Archiver.java Tue Jul 15 14:40:00 2014 UTC +++ /src/main/org/brailleblaster/archiver/EPub3Archiver.java Thu Jul 17 18:48:06 2014 UTC
@@ -380,7 +380,7 @@ // Parse this epub document. nu.xom.Document curDoc; - //check for if it is mac or non mac + //check for if it is mac or non mac if(BBIni.getPlatformName().equals("cocoa")) curDoc = parser.build( epubFileList.get(curPath) ); else =======================================--- /src/main/org/brailleblaster/document/BBDocument.java Thu Jul 17 11:34:16 2014 UTC +++ /src/main/org/brailleblaster/document/BBDocument.java Thu Jul 17 18:48:06 2014 UTC
@@ -422,13 +422,14 @@ } public Node findPrintPageNode(Element e){ + Node n = findPrintPageNodeHelper(e); - if(n == null){ + if (n == null) { mistranslationList.add(e.toXML().toString()); return null; - } - else + } else return n; + } private Node findPrintPageNodeHelper(Element e){ @@ -447,12 +448,12 @@ public Node findBraillePageNode(Element e){ Node n = findBraillePageNodeHelper(e); - if(n == null){ + if (n == null) { mistranslationList.add(e.toXML().toString()); return null; - } - else + } else return n; + } private Node findBraillePageNodeHelper(Element e){ =======================================--- /src/main/org/brailleblaster/perspectives/braille/mapping/elements/PageMapElement.java Thu Jul 3 16:07:57 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/mapping/elements/PageMapElement.java Thu Jul 17 18:48:06 2014 UTC
@@ -1,6 +1,7 @@ package org.brailleblaster.perspectives.braille.mapping.elements; import nu.xom.Node; +import nu.xom.Text; public class PageMapElement extends AbstractMapElement { @@ -19,6 +20,9 @@ } public void setBraillePage(Node n){ + Text t=(Text)n; + t.setValue(removeWord(n.getValue())); + n=(Node)t; brailleNode = n; } @@ -32,4 +36,18 @@ brailleStart = start; brailleEnd = end; } + //Remove word page or any word between ";" and "#" character + private String removeWord(String str){ + int startRemove =0; + int endRemove=0; + if((str.contains(";")) && (str.contains("#"))){ + startRemove=str.indexOf(";"); + endRemove=str.indexOf("#"); + String removedString=str.substring(startRemove+1, endRemove); + str=str.replace(removedString, ""); + + } + return str; + + } } =======================================--- /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java Mon Jul 14 19:18:30 2014 UTC +++ /src/main/org/brailleblaster/perspectives/braille/mapping/elements/SectionElement.java Thu Jul 17 18:48:06 2014 UTC
@@ -98,14 +98,13 @@ } } - protected void initializePrintPage(Manager m, Element page){ + protected void initializePrintPage(Manager m, Element page) { Node textNode = m.getDocument().findPrintPageNode(page); - if(textNode != null){ + if (textNode != null) { list.addPrintPage(new PageMapElement(textNode, list.size())); - Node brailleText = m.getDocument().findBraillePageNode(page); list.getLastPage().setBraillePage(brailleText); - + } }