Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

add isoCode to DictInfo, and load it

Browse source
This commit is contained in:
Eric House 2022-06-04 14:02:28 -07:00
parent 0e665a990e
commit 4190926c0a
6 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
View file

@ -528,6 +528,7 @@ public class DictLangCache {
Assert.assertTrueNR( null != info.fullSum ); Assert.assertTrueNR( null != info.fullSum );
DBUtils.dictsSetInfo( context, dal, info ); DBUtils.dictsSetInfo( context, dal, info );
Log.d( TAG, "getInfo() => %s", info );
} else { } else {
Log.i( TAG, "getInfo(): unable to open dict %s", dal.name ); Log.i( TAG, "getInfo(): unable to open dict %s", dal.name );
} }

2
xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DictInfo.java
View file

@ -30,6 +30,7 @@ public class DictInfo {
// set in jni code // set in jni code
public int langCode; public int langCode;
public int wordCount; public int wordCount;
public String isoCode;
public String md5Sum; // internal (skipping header?) public String md5Sum; // internal (skipping header?)
@Override @Override
@ -38,6 +39,7 @@ public class DictInfo {
if ( BuildConfig.NON_RELEASE ) { if ( BuildConfig.NON_RELEASE ) {
return new StringBuilder("{") return new StringBuilder("{")
.append("name: ").append(name) .append("name: ").append(name)
.append(", isoCode: ").append(isoCode)
.append(", md5Sum: ").append(md5Sum) .append(", md5Sum: ").append(md5Sum)
.append(", fullSum: ").append(fullSum) .append(", fullSum: ").append(fullSum)
.append("}").toString(); .append("}").toString();

1
xwords4/android/jni/xwjni.c
View file

@ -1141,6 +1141,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_dict_1getInfo
setInt( env, jinfo, "langCode", code ); setInt( env, jinfo, "langCode", code );
setInt( env, jinfo, "wordCount", dict_getWordCount( dict, env ) ); setInt( env, jinfo, "wordCount", dict_getWordCount( dict, env ) );
setString( env, jinfo, "md5Sum", dict_getMd5Sum( dict ) ); setString( env, jinfo, "md5Sum", dict_getMd5Sum( dict ) );
setString( env, jinfo, "isoCode", dict_getISOCode( dict ) );
} }
return jinfo; return jinfo;

6
xwords4/common/dictnry.c
View file

@ -1002,6 +1002,12 @@ dict_getDesc( const DictionaryCtxt* dict )
return dict->desc; return dict->desc;
} }
const XP_UCHAR*
dict_getISOCode( const DictionaryCtxt* dict )
{
return dict->isoCode;
}
const XP_UCHAR* const XP_UCHAR*
dict_getMd5Sum( const DictionaryCtxt* dict ) dict_getMd5Sum( const DictionaryCtxt* dict )
{ {

1
xwords4/common/dictnry.h
View file

@ -209,6 +209,7 @@ XP_LangCode dict_getLangCode( const DictionaryCtxt* dict );
XP_U32 dict_getWordCount( const DictionaryCtxt* dict, XWEnv xwe ); XP_U32 dict_getWordCount( const DictionaryCtxt* dict, XWEnv xwe );
const XP_UCHAR* dict_getDesc( const DictionaryCtxt* dict ); const XP_UCHAR* dict_getDesc( const DictionaryCtxt* dict );
const XP_UCHAR* dict_getISOCode( const DictionaryCtxt* dict );
const XP_UCHAR* dict_getMd5Sum( const DictionaryCtxt* dict ); const XP_UCHAR* dict_getMd5Sum( const DictionaryCtxt* dict );
XP_Bool dict_hasDuplicates( const DictionaryCtxt* dict ); XP_Bool dict_hasDuplicates( const DictionaryCtxt* dict );

1
xwords4/common/strutils.c
View file

@ -441,6 +441,7 @@ lcToLocale( XP_LangCode lc )
case 0x12: result = "el"; break; case 0x12: result = "el"; break;
case 0x13: result = "sk"; break; case 0x13: result = "sk"; break;
case 0x14: result = "hu"; break; case 0x14: result = "hu"; break;
case 0x15: result = "ro"; break;
case 0x19: result = "fi"; break; case 0x19: result = "fi"; break;
} }
XP_ASSERT( !!result ); XP_ASSERT( !!result );