Made some changes to the OnlineTranslationTool. Now when text is redisplayed as links, is shows up with the declension marks.
This commit is contained in:
parent
ff130e6fb1
commit
d4dc004c2a
3 changed files with 70 additions and 75 deletions
|
@ -165,7 +165,8 @@ public class LocalTibetanScanner extends TibetanScanner
|
|||
|
||||
if (lastCompSil!=null)
|
||||
{
|
||||
w = new Word(lastCompWord, lastCompSil.getDefs());
|
||||
if (lastCompWord.equals(wordActual)) w = new Word(lastCompWord, lastCompSil.getDefs());
|
||||
else w = new Word(lastCompWord, wordActual, lastCompSil.getDefs());
|
||||
wordList.addLast(w);
|
||||
this.resetAll();
|
||||
|
||||
|
@ -202,7 +203,8 @@ public class LocalTibetanScanner extends TibetanScanner
|
|||
|
||||
while (lastCompSil!=null)
|
||||
{
|
||||
w = new Word(lastCompWord, lastCompSil.getDefs());
|
||||
if (lastCompWord.equals(wordActual)) w = new Word(lastCompWord, lastCompSil.getDefs());
|
||||
else w = new Word(lastCompWord, wordActual, lastCompSil.getDefs());
|
||||
wordList.addLast(w);
|
||||
this.resetAll();
|
||||
|
||||
|
|
|
@ -351,35 +351,35 @@ public class OnLineScannerFilter extends HttpServlet
|
|||
for (i=0; i < words.length; i++)
|
||||
{
|
||||
|
||||
if (words[i] instanceof Word)
|
||||
{
|
||||
word = new SwingWord((Word)words[i]);
|
||||
if (word.getDefs().getDictionarySource()!=null)
|
||||
pw.print(word.getLink());
|
||||
else pw.print(word.getWylie() + " ");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (words[i] instanceof PunctuationMark)
|
||||
{
|
||||
pm = words[i].toString().charAt(0);
|
||||
switch (pm)
|
||||
{
|
||||
case '\n':
|
||||
pw.println("</p>");
|
||||
pw.print("<p>");
|
||||
break;
|
||||
case '<':
|
||||
pw.print("< ");
|
||||
break;
|
||||
case '>':
|
||||
pw.print("> ");
|
||||
break;
|
||||
default:
|
||||
pw.print(pm + " ");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (words[i] instanceof Word)
|
||||
{
|
||||
word = new SwingWord((Word)words[i]);
|
||||
// if (word.getDefs().getDictionarySource()!=null)
|
||||
pw.print(word.getLink());
|
||||
// else pw.print(word.getWylie() + " ");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (words[i] instanceof PunctuationMark)
|
||||
{
|
||||
pm = words[i].toString().charAt(0);
|
||||
switch (pm)
|
||||
{
|
||||
case '\n':
|
||||
pw.println("</p>");
|
||||
pw.print("<p>");
|
||||
break;
|
||||
case '<':
|
||||
pw.print("< ");
|
||||
break;
|
||||
case '>':
|
||||
pw.print("> ");
|
||||
break;
|
||||
default:
|
||||
pw.print(pm + " ");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
pw.println("</p>");
|
||||
}
|
||||
|
@ -407,34 +407,24 @@ public class OnLineScannerFilter extends HttpServlet
|
|||
word = new SwingWord(words[j]);
|
||||
defs = word.getDefs();
|
||||
ds = defs.getDictionarySource();
|
||||
if (ds==null || ds.isEmpty()) continue;
|
||||
pw.println(" <tr>");
|
||||
tag = ds.getTag(0);
|
||||
// else tag = null;
|
||||
/*if (tag!=null)
|
||||
{*/
|
||||
pw.println(" <td width=\"20%\" rowspan=\""+ defs.def.length +"\" valign=\"top\">"+ word.getBookmark(tibetan) +"</td>");
|
||||
pw.println(" <td width=\"12%\">"+ tag +"</td>");
|
||||
pw.println(" <td width=\"68%\">" + defs.def[0] + "</td>");
|
||||
/*}
|
||||
else
|
||||
{
|
||||
pw.println(" <td width=\"20%\" rowspan=\""+ defs.def.length +"\" valign=\"top\">"+ words[j].getBookmark(tibetan) +"</td>");
|
||||
pw.println(" <td width=\"80%\" colspan=\"2\">" + defs.def[0] + "</td>");
|
||||
}*/
|
||||
if (ds!=null && !ds.isEmpty()) tag = ds.getTag(0);
|
||||
else tag = " ";
|
||||
|
||||
pw.println(" <td width=\"20%\" rowspan=\""+ defs.def.length +"\" valign=\"top\">"+ word.getBookmark(tibetan) +"</td>");
|
||||
pw.println(" <td width=\"12%\">"+ tag +"</td>");
|
||||
pw.println(" <td width=\"68%\">" + defs.def[0] + "</td>");
|
||||
|
||||
pw.println(" </tr>");
|
||||
for (i=1; i<defs.def.length; i++)
|
||||
{
|
||||
pw.println(" <tr>");
|
||||
if (ds!=null) tag = ds.getTag(i);
|
||||
else tag = null;
|
||||
if (tag!=null)
|
||||
{
|
||||
pw.println(" <td width=\"12%\">"+ tag +"</td>");
|
||||
pw.println(" <td width=\"68%\">" + defs.def[i] + "</td>");
|
||||
}
|
||||
else pw.println(" <td width=\"80%\" colspan=\"2\">" + defs.def[i] + "</td>");
|
||||
pw.println(" </tr>");
|
||||
pw.println(" <tr>");
|
||||
if (ds!=null && !ds.isEmpty()) tag = ds.getTag(i);
|
||||
else tag = " ";
|
||||
pw.println(" <td width=\"12%\">"+ tag +"</td>");
|
||||
pw.println(" <td width=\"68%\">" + defs.def[i] + "</td>");
|
||||
//else pw.println(" <td width=\"80%\" colspan=\"2\">" + defs.def[i] + "</td>");
|
||||
pw.println(" </tr>");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
|
@ -76,28 +76,31 @@ public class SwingWord extends Word
|
|||
return getLink(false);
|
||||
}
|
||||
|
||||
/** Returns the word marked up as a link.
|
||||
*
|
||||
*/
|
||||
public String getLink(boolean tibetan)
|
||||
{
|
||||
String localWord, result=null;
|
||||
// String result;
|
||||
if (wordSinDec==null) localWord = super.token;
|
||||
else localWord = wordSinDec;
|
||||
if (tibetan)
|
||||
{
|
||||
try
|
||||
{
|
||||
result = TibetanHTML.getHTML(localWord + " ");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
result = localWord;
|
||||
}
|
||||
}
|
||||
else result = localWord;
|
||||
/* result = "<a href=\"#" + word + "\">" + localWord;
|
||||
if (tibetan) result+= "</a>";
|
||||
else result+= "</a> ";
|
||||
return result;*/
|
||||
return "<a href=\"#" + super.token + "\">" + result + "</a> ";
|
||||
|
||||
if (wordSinDec==null) localWord = super.token;
|
||||
else localWord = wordSinDec;
|
||||
if (tibetan)
|
||||
{
|
||||
try
|
||||
{
|
||||
result = TibetanHTML.getHTML(localWord + " ");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
result = localWord;
|
||||
}
|
||||
}
|
||||
else result = localWord;
|
||||
/* result = "<a href=\"#" + word + "\">" + localWord;
|
||||
if (tibetan) result+= "</a>";
|
||||
else result+= "</a> ";
|
||||
return result;*/
|
||||
return "<a href=\"#" + super.token + "\">" + result + "</a> ";
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue