import com.hughes.android.dictionary.DictionaryInfo;
import com.hughes.util.CachingList;
+import com.hughes.util.StringUtil;
import com.hughes.util.raf.RAFList;
import com.hughes.util.raf.RAFListSerializer;
import com.hughes.util.raf.RAFSerializable;
+import java.io.DataInput;
+import java.io.DataOutput;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
static final int CACHE_SIZE = 5000;
- static final int CURRENT_DICT_VERSION = 6;
+ static final int CURRENT_DICT_VERSION = 7;
static final String END_OF_DICTIONARY = "END OF DICTIONARY";
// persisted
public final List<PairEntry> pairEntries;
public final List<TextEntry> textEntries;
public final List<HtmlEntry> htmlEntries;
+ public final List<byte[]> htmlData;
public final List<EntrySource> sources;
public final List<Index> indices;
pairEntries = new ArrayList<PairEntry>();
textEntries = new ArrayList<TextEntry>();
htmlEntries = new ArrayList<HtmlEntry>();
+ htmlData = null;
sources = new ArrayList<EntrySource>();
indices = new ArrayList<Index>();
}
// disrupts the offset.
try {
final RAFList<EntrySource> rafSources = RAFList.create(raf, new EntrySource.Serializer(
- this), raf.getFilePointer());
+ this), raf.getFilePointer(), dictFileVersion);
sources = new ArrayList<EntrySource>(rafSources);
raf.seek(rafSources.getEndOffset());
pairEntries = CachingList.create(
- RAFList.create(raf, new PairEntry.Serializer(this), raf.getFilePointer()),
+ RAFList.create(raf, new PairEntry.Serializer(this), raf.getFilePointer(), dictFileVersion),
CACHE_SIZE);
textEntries = CachingList.create(
- RAFList.create(raf, new TextEntry.Serializer(this), raf.getFilePointer()),
+ RAFList.create(raf, new TextEntry.Serializer(this), raf.getFilePointer(), dictFileVersion),
CACHE_SIZE);
if (dictFileVersion >= 5) {
htmlEntries = CachingList.create(
- RAFList.create(raf, new HtmlEntry.Serializer(this), raf.getFilePointer()),
+ RAFList.create(raf, new HtmlEntry.Serializer(this), raf.getFilePointer(), dictFileVersion),
CACHE_SIZE);
} else {
htmlEntries = Collections.emptyList();
}
+ if (dictFileVersion >= 7) {
+ htmlData = RAFList.create(raf, new HtmlEntry.DataDeserializer(), raf.getFilePointer(), dictFileVersion);
+ } else {
+ htmlData = null;
+ }
indices = CachingList.createFullyCached(RAFList.create(raf, indexSerializer,
- raf.getFilePointer()));
+ raf.getFilePointer(), dictFileVersion));
} catch (RuntimeException e) {
final IOException ioe = new IOException("RuntimeException loading dictionary");
ioe.initCause(e);
}
@Override
- public void write(RandomAccessFile raf) throws IOException {
+ public void write(DataOutput out) throws IOException {
+ RandomAccessFile raf = (RandomAccessFile)out;
raf.writeInt(dictFileVersion);
raf.writeLong(creationMillis);
raf.writeUTF(dictInfo);
+ System.out.println("sources start: " + raf.getFilePointer());
RAFList.write(raf, sources, new EntrySource.Serializer(this));
- RAFList.write(raf, pairEntries, new PairEntry.Serializer(this));
+ System.out.println("pair start: " + raf.getFilePointer());
+ RAFList.write(raf, pairEntries, new PairEntry.Serializer(this), 64, true);
+ System.out.println("text start: " + raf.getFilePointer());
RAFList.write(raf, textEntries, new TextEntry.Serializer(this));
- RAFList.write(raf, htmlEntries, new HtmlEntry.Serializer(this));
+ System.out.println("html index start: " + raf.getFilePointer());
+ RAFList.write(raf, htmlEntries, new HtmlEntry.Serializer(this), 64, true);
+ System.out.println("html data start: " + raf.getFilePointer());
+ assert htmlData == null;
+ RAFList.write(raf, htmlEntries, new HtmlEntry.DataSerializer(), 128, true);
+ System.out.println("indices start: " + raf.getFilePointer());
RAFList.write(raf, indices, indexSerializer);
+ System.out.println("end: " + raf.getFilePointer());
raf.writeUTF(END_OF_DICTIONARY);
}
private final RAFListSerializer<Index> indexSerializer = new RAFListSerializer<Index>() {
@Override
- public Index read(RandomAccessFile raf, final int readIndex) throws IOException {
+ public Index read(DataInput raf, final int readIndex) throws IOException {
return new Index(Dictionary.this, raf);
}
@Override
- public void write(RandomAccessFile raf, Index t) throws IOException {
+ public void write(DataOutput raf, Index t) throws IOException {
t.write(raf);
}
};
final RAFListSerializer<HtmlEntry> htmlEntryIndexSerializer = new RAFListSerializer<HtmlEntry>() {
@Override
- public void write(RandomAccessFile raf, HtmlEntry t) throws IOException {
- if (t.index() == -1)
- throw new IndexOutOfBoundsException();
- raf.writeInt(t.index());
+ public void write(DataOutput raf, HtmlEntry t) throws IOException {
+ assert false;
}
@Override
- public HtmlEntry read(RandomAccessFile raf, int readIndex) throws IOException {
+ public HtmlEntry read(DataInput raf, int readIndex) throws IOException {
return htmlEntries.get(raf.readInt());
}
};
raf.close();
return dictionaryInfo;
} catch (IOException e) {
- return null;
+ final DictionaryInfo dictionaryInfo = new DictionaryInfo();
+ dictionaryInfo.uncompressedFilename = file.getName();
+ dictionaryInfo.uncompressedBytes = file.length();
+ return dictionaryInfo;
} finally {
if (raf != null) {
try {