import com.hughes.util.StringUtil;
import com.hughes.util.raf.RAFListSerializer;
+import com.hughes.util.raf.RAFListSerializerSkippable;
import com.ibm.icu.text.Transliterator;
import java.io.DataInput;
import java.io.RandomAccessFile;
import java.io.UnsupportedEncodingException;
import java.lang.ref.SoftReference;
+import java.nio.channels.FileChannel;
import java.util.List;
import java.util.regex.Pattern;
lazyHtmlLoader = null;
}
- public HtmlEntry(Dictionary dictionary, DataInput raf, final int index)
- throws IOException {
+ public HtmlEntry(Dictionary dictionary, FileChannel ch, DataInput raf, final int index)
+ throws IOException {
super(dictionary, raf, index);
title = raf.readUTF();
- lazyHtmlLoader = new LazyHtmlLoader(raf, dictionary.htmlData, index);
+ lazyHtmlLoader = new LazyHtmlLoader(ch, raf, dictionary.htmlData, index);
html = null;
}
public static byte[] readData(DataInput raf) throws IOException {
int len = StringUtil.readVarInt(raf);
- final byte[] bytes = new byte[len];
+ final byte[] bytes = new byte[Math.min(len, 20 * 1024 * 1024)];
raf.readFully(bytes);
return bytes;
}
return new Row(this.index, rowIndex, dictionaryIndex);
}
- static final class Serializer implements RAFListSerializer<HtmlEntry> {
+ static final class Serializer implements RAFListSerializerSkippable<HtmlEntry> {
final Dictionary dictionary;
+ final FileChannel ch;
- Serializer(Dictionary dictionary) {
+ Serializer(Dictionary dictionary, FileChannel ch) {
this.dictionary = dictionary;
+ this.ch = ch;
}
@Override
public HtmlEntry read(DataInput raf, final int index) throws IOException {
- return new HtmlEntry(dictionary, raf, index);
+ return new HtmlEntry(dictionary, ch, raf, index);
}
+ @Override
+ public void skip(DataInput raf, final int index) throws IOException {
+ if (dictionary.dictFileVersion >= 7)
+ {
+ StringUtil.readVarInt(raf);
+ }
+ else
+ {
+ raf.skipBytes(2);
+ }
+ int l = raf.readUnsignedShort();
+ raf.skipBytes(l);
+ }
+
@Override
public void write(DataOutput raf, HtmlEntry t) throws IOException {
t.writeBase(raf);
boolean isExpanded = false;
Row(final DataInput raf, final int thisRowIndex,
- final Index index, int extra) throws IOException {
+ final Index index, int extra) throws IOException {
super(raf, thisRowIndex, index, extra);
}
Row(final int referenceIndex, final int thisRowIndex,
- final Index index) {
+ final Index index) {
super(referenceIndex, thisRowIndex, index);
}
@Override
public RowMatchType matches(final List<String> searchTokens,
- final Pattern orderedMatchPattern, final Transliterator normalizer,
- final boolean swapPairEntries) {
+ final Pattern orderedMatchPattern, final Transliterator normalizer,
+ final boolean swapPairEntries) {
final String text = normalizer.transform(getRawText(false));
if (orderedMatchPattern.matcher(text).find()) {
return RowMatchType.ORDERED_MATCH;
for (final HtmlEntry htmlEntry : htmlEntries) {
final String titleEscaped = StringUtil.escapeUnicodeToPureHtml(htmlEntry.title);
result.append(String.format("<h1><a href=\"%s\">%s</a></h1>\n<p>%s\n",
- formatQuickdicUrl(indexShortName, htmlEntry.title), titleEscaped,
- htmlEntry.getHtml()));
+ formatQuickdicUrl(indexShortName, htmlEntry.title), titleEscaped,
+ htmlEntry.getHtml()));
}
return result.toString();
}
// --------------------------------------------------------------------
public static final class LazyHtmlLoader {
- final RandomAccessFile raf;
+ final DataInput raf;
+ final FileChannel ch;
final long offset;
final int numBytes;
final int numZipBytes;
// Not sure this volatile is right, but oh well.
volatile SoftReference<String> htmlRef = new SoftReference<String>(null);
- private LazyHtmlLoader(final DataInput inp, List<byte[]> data, int index) throws IOException {
+ private LazyHtmlLoader(FileChannel ch, final DataInput inp, List<byte[]> data, int index) throws IOException {
this.data = data;
this.index = index;
if (data != null) {
this.raf = null;
+ this.ch = null;
this.offset = 0;
this.numBytes = -1;
this.numZipBytes = -1;
return;
}
- raf = (RandomAccessFile)inp;
- numBytes = raf.readInt();
- numZipBytes = raf.readInt();
- offset = raf.getFilePointer();
+ raf = inp;
+ this.ch = ch;
+ numBytes = Math.min(raf.readInt(), 20 * 1024 * 1024);
+ numZipBytes = Math.min(raf.readInt(), 20 * 1024 * 1024);
+ offset = ch.position();
raf.skipBytes(numZipBytes);
}
return html;
}
System.out.println("Loading Html: numBytes=" + numBytes + ", numZipBytes="
- + numZipBytes);
+ + numZipBytes);
final byte[] zipBytes = new byte[numZipBytes];
- synchronized (raf) {
+ synchronized (ch) {
try {
- raf.seek(offset);
- raf.read(zipBytes);
+ ch.position(offset);
+ raf.readFully(zipBytes);
} catch (IOException e) {
throw new RuntimeException("Failed to read HTML data from dictionary", e);
}