Merge branch 'android_branch' into android_dictdb

This commit is contained in:
Eric House 2012-09-13 19:20:24 -07:00
commit a5bd932e0a
3 changed files with 4 additions and 12 deletions

View file

@ -20,7 +20,7 @@ LANGCODE=ca_ES
TARGET_TYPE ?= WINCE
ENC = UTF-8
DICTNOTE = "Built from DISC 2.0.5.\nSee http://escrable.montane.cat/diccionari for more information."
DICTNOTE = "Built from DISC 2.0.6.\nSee http://escrable.montane.cat/diccionari for more information."
ifeq ($(TARGET_TYPE),PALM)

View file

@ -169,17 +169,9 @@ sub readNodesToEnd($) {
sub printHeader($$) {
my ( $buf, $len ) = @_;
printf STDERR "skipped %d bytes of header:\n", $len + 2;
my $asStr = Encode::decode_utf8($buf);
my @strs = split( '\0', $asStr );
# There are variable numbers of strings showing up in this thing.
# Need to figure out the right way to unpack the thing.
$gDesc = $strs[1];
$gSum = $strs[2];
foreach my $str (@strs) {
if ( 0 < length($str) ) {
print STDERR 'Got: ', $str, "\n";
}
}
my $count;
($count, $gDesc, $gSum) = unpack( 'N Z* Z*', $buf );
printf STDERR "has %d words\n", $count;
}
sub nodeSizeFromFlags($$) {