canna****@lists*****
canna****@lists*****
2003年 8月 24日 (日) 17:33:18 JST
Date: Sunday August 24, 2003 @ 17:33
Author: aida_s
Update of /cvsroot/canna/canna/lib/RK
In directory sf-cvs:/tmp/cvs-serv9813/lib/RK
Modified Files:
RKintern.h ngram.c permdic.c util.c
Log Message:
New dictionary header. The new format is incompatible with former
format, therefore some compatibility feature are introduced.
Crxdic has "3.6-compatible" mode. Crfreq generates old .cld if
.cbd is old format. Server can mount both old and new dictionaries.
These stuff will be removed someday.
* canna/patchlevel.h: bump to 3.7devel2
* lib/RK/RKintern.h: include <unistd.h> and <fcntl.h>
(HD_*): reorder and change to enum
(HD_VERSION): new macro
(HD_TAG_*): moved into util.c
(struct ND): new member "version"
* lib/RK/ngram.c(RkReadGram): New argument "gramsz". Size check is
performed by "gramsz".
(RkOpenGram): Deal with new grammer data storage.
* lib/RK/permdic.c(openDF): Deal with new grammer data storage.
remove "WIN" code.
* lib/RK/util.c(HD_*): moved from RKintern.h
(read_tags): added
(_RkReadHeader): rewritten to handle new format
(_RkCreateHeader): ditto
* cmd/crfreq/crfreq.c(main): s/RK_MAX_HDRSIZ/RK_OLD_MAX_HDRSIZ.
Deal with new grammer data storage.
* cmd/crxdic/crxdic.c(struct dictionary): new members "gram{data,sz}"
(parse_arg): -c and -g option
(STrdup): check memory allocation error
(setHeader): removed
(makeHeader): rewritten
(write_file): write grammer data here instead of "cat" in Makefile
(main): store grammer in memory
* cmd/dpxdic/dpxdic.c(main): catch RkReadGram API change up
* dic/ideo/grammer/Imakefile: don't create fuzokugo.cld.
include cnj.bits to fuzokugo.cbd by "crxdig -g" instead of "cat".
* dic/ideo/words/dics.dir: remove fuzokugo.cld
* doc/intern/dic.txt: updated
===================================================================
File: no file RKintern.h Status: Needs Checkout
Working revision: 1.12 Sun Aug 24 08:33:18 2003
Repository revision: 1.12 /cvsroot/canna/canna/lib/RK/RKintern.h,v
Existing Tags:
RELBR_3_6 (branch: 1.3.2)
after_autoconf (revision: 1.5)
before_autoconf (revision: 1.4)
release_3_6_p3 (revision: 1.3)
release_3_6_p2 (revision: 1.3)
after_new_wchar (revision: 1.4)
before_new_wchar (revision: 1.3)
after_cvsignore (revision: 1.3)
before_cvsignore (revision: 1.3)
release_3_6_p1 (revision: 1.3)
relbr_3_bp (revision: 1.3)
release_3_6 (revision: 1.3)
after_fujieda_patches (revision: 1.2)
orig_35b2 (revision: 1.1.1.1)
NEC_CORP (branch: 1.1.1)
===================================================================
File: no file ngram.c Status: Needs Checkout
Working revision: 1.7 Sun Aug 24 08:33:18 2003
Repository revision: 1.7 /cvsroot/canna/canna/lib/RK/ngram.c,v
Existing Tags:
RELBR_3_6 (branch: 1.3.2)
after_autoconf (revision: 1.3)
before_autoconf (revision: 1.3)
release_3_6_p3 (revision: 1.3)
release_3_6_p2 (revision: 1.3)
after_new_wchar (revision: 1.3)
before_new_wchar (revision: 1.3)
after_cvsignore (revision: 1.3)
before_cvsignore (revision: 1.3)
release_3_6_p1 (revision: 1.3)
relbr_3_bp (revision: 1.3)
release_3_6 (revision: 1.3)
after_fujieda_patches (revision: 1.2)
orig_35b2 (revision: 1.1.1.1)
NEC_CORP (branch: 1.1.1)
===================================================================
File: no file permdic.c Status: Needs Checkout
Working revision: 1.7 Sun Aug 24 08:33:18 2003
Repository revision: 1.7 /cvsroot/canna/canna/lib/RK/permdic.c,v
Existing Tags:
RELBR_3_6 (branch: 1.3.2)
after_autoconf (revision: 1.3)
before_autoconf (revision: 1.3)
release_3_6_p3 (revision: 1.3)
release_3_6_p2 (revision: 1.3)
after_new_wchar (revision: 1.3)
before_new_wchar (revision: 1.3)
after_cvsignore (revision: 1.3)
before_cvsignore (revision: 1.3)
release_3_6_p1 (revision: 1.3)
relbr_3_bp (revision: 1.3)
release_3_6 (revision: 1.3)
after_fujieda_patches (revision: 1.2)
orig_35b2 (revision: 1.1.1.1)
NEC_CORP (branch: 1.1.1)
===================================================================
File: no file util.c Status: Needs Checkout
Working revision: 1.5 Sun Aug 24 08:33:18 2003
Repository revision: 1.5 /cvsroot/canna/canna/lib/RK/util.c,v
Existing Tags:
RELBR_3_6 (branch: 1.2.2)
after_autoconf (revision: 1.2)
before_autoconf (revision: 1.2)
release_3_6_p3 (revision: 1.2)
release_3_6_p2 (revision: 1.2)
after_new_wchar (revision: 1.2)
before_new_wchar (revision: 1.2)
after_cvsignore (revision: 1.2)
before_cvsignore (revision: 1.2)
release_3_6_p1 (revision: 1.2)
relbr_3_bp (revision: 1.2)
release_3_6 (revision: 1.2)
after_fujieda_patches (revision: 1.1.1.1)
orig_35b2 (revision: 1.1.1.1)
NEC_CORP (branch: 1.1.1)