/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

Révision 3716

     				//pagedWriter.writeStartElement("ol");
     				int i = 1;
     				for (String note : notes) {
     					note = note.trim()
     					//pagedWriter.writeStartElement("li");
     					pagedWriter.writeStartElement("a", ["href":"#noteref_"+i, "name":"note_"+i])
     					pagedWriter.writeStartElement("sup")
     					pagedWriter.writeCharacters(""+i)
     					pagedWriter.writeEndElement() // </sub>
     					pagedWriter.writeEndElement() // </a>
     					pagedWriter.writeCharacters(note)
     					if (note.startsWith("<") && note.endsWith(">")) {
     						pagedWriter.write(note)
     					} else {
     						pagedWriter.writeCharacters(note)
+    					}
     					pagedWriter.writeEmptyElement("br")
     					i++;
+    				}
-...
     									firstWord = false;
     									this.idxstart.add(wordid);
+    								}
     								if (flagNote) {
     									noteContent += "<w id=\""+wordid+"\">";
+    								}
     								flagW = true
     								break;
     							default:
-...
     									pagedWriter.writeCharacters(wordvalue)
     									pagedWriter.writeEndElement()
     								} else {
     									noteContent += "</w>";
+    								}
     							//pagedWriter.writeComment("\n")
     								lastword=wordvalue;

      * The Class Page a fle to open in the Browser
      */
     public class Page {
     	/** The htmlfile. */
     	protected File htmlfile;
     	/** The edition. */
     	protected Edition edition;
     	/** The wordid. */
     	protected String firstWordId;
     	protected String name;
     	protected int idx;
     	/**
     	 * Instantiates a new page.
+    	 *
     	 * @param edition the edition
     	 * @param name the page name
     	 * @param wordid the page first word id
     	 * @param i the page position
     	 * @param name    the page name
     	 * @param wordid  the page first word id
     	 * @param i       the page position
+    	 *
     	 */
     	public Page(Edition edition, String name, String wordid, int i) {
     		this.edition = edition;
     		this.name = name;
     		this.firstWordId = wordid;
     		this.htmlfile = new File(edition.getHtmlDir(), edition.getText().getName() + "_" + name + ".html");
     		this.idx = i;
+    	}
     	/**
     	 * Retro-compatibility of import.xml file
+    	 *
     	 * @param e
     	 */
     	public void _load(Element e) {
     		this.name = e.getAttribute("id");
     		this.firstWordId = e.getAttribute("wordid");
+    	}
     	/**
     	 * Gets the word id.
+    	 *
     	 * @return the word id
     	 */
     	public String getWordId() {
     		return firstWordId;
+    	}
     	/**
     	 * Gets the edition.
+    	 *
-...
     	public Edition getEdition() {
     		return edition;
+    	}
     	public boolean equals(Page p) {
     		return p.idx == this.idx && p.name.equals(this.name) && p.htmlfile.equals(this.htmlfile);
+    	}
     	/**
     	 * Gets the file.
+    	 *
-...
     	public File getFile() {
     		return this.htmlfile;
+    	}
     	/**
     	 * To url.
+    	 *
-...
     	public String toURL() {
     		try {
     			return this.htmlfile.toURI().toURL().toString();
+    		}
     		catch (MalformedURLException e) {
     		} catch (MalformedURLException e) {
     			System.err.println(NLS.bind(TXMCoreMessages.malformedURLFileP0, htmlfile));
     			return ""; //$NON-NLS-1$
+    		}
+    	}
     	public Page getNextPage() {
     		return this.edition.getNextPage(this);
+    	}
     	public Page getPreviousPage() {
     		return this.edition.getPreviousPage(this);
+    	}
     	public Page getFirstPage() {
     		return this.edition.getFirstPage();
+    	}
     	public Page getLastPage() {
     		return this.edition.getLastPage();
+    	}
     	/**
     	 * Found first word id.
+    	 *
     	 * @return the next page word id or null if this page is the last page
     	 */
     	public String getLastWordID() {
     		Page nextPage = getNextPage();
     		if (this.equals(nextPage)) {
     			return nextPage.getWordId();
+    		}
     		return null;
+    	}
     	/**
     	 * Fint the first word id in a HTML Edition page
+    	 *
     	 * @param page the page
     	 * @return the string
     	 * @throws Exception the exception
     	 */
     	public static String foundFirstWordId(File page) throws Exception {
     	public static String findFirstWordIdInFile(File page) throws Exception {
     		InputStream inputData;
     		inputData = page.toURI().toURL().openStream();
     		XMLInputFactory factory = XMLInputFactory.newInstance();
     		XMLStreamReader parser = factory.createXMLStreamReader(inputData);
     		for (int event = parser.next(); event != XMLStreamConstants.END_DOCUMENT; event = parser.next()) {
     			if (event == XMLStreamConstants.START_ELEMENT) {
     				String localname = parser.getLocalName();
     				if (localname.matches("span")) //$NON-NLS-1$
+    				{
     				if (localname.matches("span")) { //$NON-NLS-1$
     					String idattr = parser.getAttributeValue(null, "id"); //$NON-NLS-1$
     					if (idattr != null)
     						if (idattr.startsWith("w")) //$NON-NLS-1$
+    						{
     						parser.close();
     						inputData.close();
     						return idattr;
     					if (idattr != null) {
     						if (idattr.startsWith("w")) { //$NON-NLS-1$
     							parser.close();
     							inputData.close();
     							return idattr;
+    						}
+    					}
+    				}
+    			}
+    		}
-...
     		inputData.close();
     		return null;
+    	}
     	/**
     	 * Sets the name.
+    	 *
     	 * @param name the new name
     	 */
     	public void setName(String name) {
     		this.name = name;
+    	}
     	/**
     	 * Sets the name.
+    	 *
     	 * @param name the new name
     	 */
     	public void setWordId(String wordid) {
     		this.firstWordId = wordid;
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see java.lang.Object#toString()
     	 */
     	@Override
     	public String toString() {
     		return "Page [name=" + name + ", htmlfile=" + htmlfile + ", firstWordId=" + firstWordId + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    	}
     	public String getName() {
     		return this.name;
+    	}
+    }

TXM/trunk/bundles/org.txm.core/src/java/org/txm/importer/Convert5To6.java (revision 3716)
201	201	int pagecounter = 1;
202	202	for (File page : htmlfiles) {
203	203	if (page.getName().startsWith(textname)) {
204		String firstwordid = Page.foundFirstWordId(page);
	204	String firstwordid = Page.findFirstWordIdInFile(page);
205	205	params.addPage(editionElem, ""+pagecounter++, firstwordid); //$NON-NLS-1$
206	206	}
207	207	}
...	...
213	213	pagecounter = 1;
214	214	for (File page : htmlfiles) {
215	215	if (page.getName().startsWith(textname)) {
216		String firstwordid = Page.foundFirstWordId(page);
	216	String firstwordid = Page.findFirstWordIdInFile(page);
217	217	params.addPage(editionElem, ""+pagecounter++, firstwordid); //$NON-NLS-1$
218	218	}
219	219	}

Formats disponibles : Unified diff

Laboratoire ICAR » Plateforme TXM

Révision 3716