taka-cvs Mailing List for Taka Kanji Database
Status: Beta
Brought to you by:
asbel
Menu
▾
▴
taka-cvs — CVS commit tracking list
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(63) |
Sep
(21) |
Oct
(10) |
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(18) |
Mar
(6) |
Apr
(212) |
May
(45) |
Jun
(10) |
Jul
(7) |
Aug
(1) |
Sep
(7) |
Oct
(3) |
Nov
|
Dec
(15) |
| 2006 |
Jan
(13) |
Feb
(4) |
Mar
|
Apr
(8) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(15) |
Sep
(7) |
Oct
(13) |
Nov
(5) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(13) |
Mar
(33) |
Apr
(1) |
May
(12) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
(4) |
Nov
|
Dec
|
| 2010 |
Jan
(7) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(6) |
Nov
(3) |
Dec
(4) |
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Swiss M. <in...@lu...> - 2017-04-03 19:18:37
|
You are receiving this email from Swiss Millionaire because you signed up to be on our list. If you wish not to receive further emails, please unsubscribe below. Read in browser http://secure.luxusarctica.com/index.php/campaigns/tz330oqvyt1da/track-url/gz512t6zvc1d6/18a32c14c574366e63d2e76c398c809d7192a9bf YOU DON'T WANT TO MISS THIS OPPORTUNITY This new guaranteed money system is going to go fast, so I'll get straight to the point. It’s BRAND NEW, just about the most simple system created and brings in over $7,180 per day! Finally the payday you and all of us deserve! So check this out: A video just released to youtube that you're going to want to see. Here's the link: CHECK IT OUT http://secure.luxusarctica.com/index.php/campaigns/tz330oqvyt1da/track-url/gz512t6zvc1d6/7d97cac745295ac2019703749e851ffa75d09b0d This method, called the "Swiss Millionaire System" doesn't require you to start with: Money - Hard work - Business Experience - Any particular skills. And what's so incredibly wonderful about Swiss Millionaire System is that you only have to be active for 5 minutes a day; it can run pretty much entirely on auto pilot with GUARANTEED profits. We must be insane - we'll be sharing with you exactly how you can make over $230,000 per month using this exact method. Check out the video now before we change our minds! This strategy proved to be an overnight success for us and we're sure it will be for you too! Watch the video now before the server gets bogged down with others wanting in! Don’t miss out there are only a few spots left. Do you really want to miss out on profiting over $7,180 per day? If you leave now, you’ll regret it when you come back to try this out and you see the page cannot be found. It’s FREE today. GET YOUR FREE ACCESS TODAY! http://secure.luxusarctica.com/index.php/campaigns/tz330oqvyt1da/track-url/gz512t6zvc1d6/7d97cac745295ac2019703749e851ffa75d09b0d Copyright © 2017 Swiss Millionaire, All rights reserved Unsubscribe http://secure.luxusarctica.com/index.php/campaigns/tz330oqvyt1da/track-url/gz512t6zvc1d6/ab97c18f540bb64fd84e7d66f824557691f7c778 |
|
From: Khalil M. <kha...@li...> - 2011-07-05 18:03:13
|
Good day taka-cvs I'm Khalil Mahmood and I work with a Fiscal Institution here in asia. We had a customer and mogul by name B. Patarkatsishvili from Georgia, who had a balance of 18,200,000.00 usd before he died of a heart condition and since then, our office have been expecting his family member(s) for the heritage of the deposit, but none has surfaced and the account has been tagged for dormancy. The policy of our fiscal institution however stipulates a limited time period for such heritage to be made or the finances' will be written off going by the record of the incident, the time limit for the claim is closing up soon for the kith and kin to show up or the acount will be closed and i came to have the knowledge of this account as the auditor in this fiscal institution. K.Mahmood. |
|
From: Benoit C. <ben...@us...> - 2010-01-17 20:19:20
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/export In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8317/org/takadb/editor/export Modified Files: ExportSQL.java Log Message: changes to database generation to optimize some queries in shinkanji Index: ExportSQL.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/export/ExportSQL.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ExportSQL.java 9 Jan 2010 19:37:23 -0000 1.19 --- ExportSQL.java 17 Jan 2010 20:19:07 -0000 1.20 *************** *** 76,80 **** try { if (jdbcDriver == null) { ! jdbcDriver = Class.forName(jdbcDriverClassName).newInstance(); } if (databaseHost.length() == 0) --- 76,80 ---- try { if (jdbcDriver == null) { ! jdbcDriver = Class.forName(jdbcDriverClassName); } if (databaseHost.length() == 0) *************** *** 262,267 **** "INSERT INTO characters (character_id, ja_ucs_code, ja_element_id, " + "ja_jis_code, ja_jouyou_grade, zh_simplified_ucs_code, " ! + "zh_simplified_element_id, zh_traditional_ucs_code, zh_traditional_element_id, ja_frequency) " ! + "VALUES (?,?,?,?,?,?,?,?,?,?)"; try { PreparedStatement statement = prepareStatement (conn, updateStatementCharacter); --- 262,267 ---- "INSERT INTO characters (character_id, ja_ucs_code, ja_element_id, " + "ja_jis_code, ja_jouyou_grade, zh_simplified_ucs_code, " ! + "zh_simplified_element_id, zh_traditional_ucs_code, zh_traditional_element_id, ja_frequency, multirads) " ! + "VALUES (?,?,?,?,?,?,?,?,?,?, ?)"; try { PreparedStatement statement = prepareStatement (conn, updateStatementCharacter); *************** *** 276,279 **** --- 276,295 ---- statement.setInt (9, character.zhTraditionalElementId); statement.setInt (10, character.jaFrequency); + StringBuffer lBuf = new StringBuffer(); + if (character.multirads != null) + { + Iterator<MultiradEntity> lMultiradsIter = character.multirads.iterator(); + for (;lMultiradsIter.hasNext();) + { + //test code points + int lUCSCode = lMultiradsIter.next()._UCSCode; + if (Character.isValidCodePoint(lUCSCode)) + { + lBuf.appendCodePoint(lUCSCode); + } + } + // assert(lBuf.length()%4 ==0); + } + statement.setString(11, lBuf.toString()); statement.executeUpdate(); } catch (SQLException s) { *************** *** 681,688 **** --- 697,706 ---- sqlSaveCharacter (conn, iterCharacter); } + //optimize FTS3 final String lOptimizeMeanings = "SELECT optimize(meaningsFTS) FROM meaningsFTS LIMIT 1"; Statement statement = conn.createStatement(); statement.executeQuery (lOptimizeMeanings); + } { *************** *** 729,733 **** sqlSaveMultirad(conn, lMultirad); } ! String updateStatementMultirad = "UPDATE character_multirads SET ja_ucs_code = (SELECT c.ja_ucs_code FROM characters c WHERE c.character_id = character_multirads.character_id) "; --- 747,751 ---- sqlSaveMultirad(conn, lMultirad); } ! conn.commit(); String updateStatementMultirad = "UPDATE character_multirads SET ja_ucs_code = (SELECT c.ja_ucs_code FROM characters c WHERE c.character_id = character_multirads.character_id) "; *************** *** 738,742 **** System.err.println (s.getMessage()); } ! updateStatementMultirad = "UPDATE character_multirads SET ja_frequency = (SELECT c.ja_frequency FROM characters c WHERE c.character_id = character_multirads.character_id)"; try { --- 756,761 ---- System.err.println (s.getMessage()); } ! conn.commit(); ! updateStatementMultirad = "UPDATE character_multirads SET ja_frequency = (SELECT c.ja_frequency FROM characters c WHERE c.character_id = character_multirads.character_id)"; try { *************** *** 746,749 **** --- 765,769 ---- System.err.println (s.getMessage()); } + conn.commit(); updateStatementMultirad = "UPDATE character_multirads SET stroke_count = (SELECT g.stroke_count FROM characters c, element_glyphs g WHERE c.character_id = character_multirads.character_id AND g.element_id = c.ja_element_id AND g.glyph_variant = 1)"; |
|
From: Benoit C. <ben...@us...> - 2010-01-17 20:19:19
|
Update of /cvsroot/taka/takaglyphedit/conf In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8317/conf Modified Files: takaSQLite.tables Log Message: changes to database generation to optimize some queries in shinkanji Index: takaSQLite.tables =================================================================== RCS file: /cvsroot/taka/takaglyphedit/conf/takaSQLite.tables,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** takaSQLite.tables 9 Jan 2010 19:37:23 -0000 1.10 --- takaSQLite.tables 17 Jan 2010 20:19:07 -0000 1.11 *************** *** 21,25 **** CREATE INDEX character_readings_alternate1 ON character_readings_alternate(source_reading); ! CREATE TABLE characters ( character_id INTEGER PRIMARY KEY, ja_ucs_code INTEGER default NULL, ja_element_id INTEGER default NULL, ja_jis_code INTEGER default NULL, ja_jouyou_grade INTEGER default NULL, zh_simplified_ucs_code INTEGER default NULL, zh_simplified_element_id INTEGER default NULL, zh_traditional_ucs_code INTEGER default NULL, zh_traditional_element_id INTEGER default NULL, ja_frequency INTEGER default NULL, UNIQUE (ja_ucs_code) ); CREATE INDEX characters1 ON characters(ja_jis_code); --- 21,25 ---- CREATE INDEX character_readings_alternate1 ON character_readings_alternate(source_reading); ! CREATE TABLE characters ( character_id INTEGER PRIMARY KEY, ja_ucs_code INTEGER default NULL, ja_element_id INTEGER default NULL, ja_jis_code INTEGER default NULL, ja_jouyou_grade INTEGER default NULL, zh_simplified_ucs_code INTEGER default NULL, zh_simplified_element_id INTEGER default NULL, zh_traditional_ucs_code INTEGER default NULL, zh_traditional_element_id INTEGER default NULL, ja_frequency INTEGER default NULL, multirads, UNIQUE (ja_ucs_code) ); CREATE INDEX characters1 ON characters(ja_jis_code); *************** *** 32,39 **** CREATE INDEX elements1 ON elements(p1_element_id); CREATE INDEX elements2 ON elements(p2_element_id); CREATE INDEX elements3 ON elements(p3_element_id); - CREATE INDEX elements4 ON elements(p4_element_id); CREATE TABLE radical_variant_mnemonics ( radical_number INTEGER NOT NULL, radical_variant INTEGER NOT NULL, dest_language_code TEXT NOT NULL, dest_mnemonic TEXT binary default NULL, UNIQUE ( radical_number, radical_variant) ); --- 32,41 ---- CREATE INDEX elements1 ON elements(p1_element_id); + CREATE INDEX elements2 ON elements(p2_element_id); + CREATE INDEX elements3 ON elements(p3_element_id); + CREATE INDEX elements4 ON elements(p4_element_id); CREATE TABLE radical_variant_mnemonics ( radical_number INTEGER NOT NULL, radical_variant INTEGER NOT NULL, dest_language_code TEXT NOT NULL, dest_mnemonic TEXT binary default NULL, UNIQUE ( radical_number, radical_variant) ); *************** *** 50,52 **** --- 52,57 ---- CREATE INDEX character_multirads3 ON character_multirads(character_id); + CREATE INDEX character_multirads2 ON character_multirads (stroke_count); + + CREATE INDEX chategory_members2 ON category_members(character_id); |
|
From: Benoit C. <ben...@us...> - 2010-01-17 20:19:15
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8317/org/takadb/editor/database/entities Modified Files: CharacterEntity.java MultiradEntity.java Log Message: changes to database generation to optimize some queries in shinkanji Index: CharacterEntity.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/CharacterEntity.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CharacterEntity.java 2 Nov 2008 02:29:56 -0000 1.7 --- CharacterEntity.java 17 Jan 2010 20:19:06 -0000 1.8 *************** *** 7,11 **** package org.takadb.editor.database.entities; ! import java.io.File; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import org.takadb.editor.TakaEditorClientPreferences; import org.takadb.editor.database.DBIdentifier; import org.takadb.editor.database.DBObject; import org.takadb.editor.database.XStreamUtil; public class CharacterEntity extends DBObject --- 7,11 ---- package org.takadb.editor.database.entities; ! import java.io.File; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import org.takadb.editor.TakaEditorClientPreferences; import org.takadb.editor.database.DBIdentifier; import org.takadb.editor.database.DBObject; import org.takadb.editor.database.XStreamUtil; public class CharacterEntity extends DBObject *************** *** 28,32 **** // Fields from "character_meanings" public Meanings meanings = new Meanings(); ! // Class representing a single "character_readings" entry and --- 28,32 ---- // Fields from "character_meanings" public Meanings meanings = new Meanings(); ! public HashSet<MultiradEntity> multirads = new HashSet<MultiradEntity>(); // Class representing a single "character_readings" entry and *************** *** 298,306 **** } ! public Object clone() { try { CharacterEntity character = (CharacterEntity)super.clone(); character.readings = (Readings)this.readings.clone(); ! character.meanings = (Meanings)this.meanings.clone(); return character; } catch (CloneNotSupportedException c) { --- 298,306 ---- } ! @SuppressWarnings("unchecked") public Object clone() { try { CharacterEntity character = (CharacterEntity)super.clone(); character.readings = (Readings)this.readings.clone(); ! character.meanings = (Meanings)this.meanings.clone(); character.multirads = (HashSet<MultiradEntity>)this.multirads; return character; } catch (CloneNotSupportedException c) { Index: MultiradEntity.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/MultiradEntity.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MultiradEntity.java 9 Jan 2010 19:37:23 -0000 1.3 --- MultiradEntity.java 17 Jan 2010 20:19:06 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- import java.io.UnsupportedEncodingException; import java.util.ArrayList; + import java.util.HashSet; import org.takadb.editor.TakaEditorClientPreferences; *************** *** 17,20 **** --- 18,25 ---- public int _elementId; public ArrayList<Integer> _characters = new ArrayList<Integer>(); + public String toString() + { + return "MultiradEntity: " + Integer.toHexString(_UCSCode); + } public static ArrayList<MultiradEntity> loadAllMultirads(DBController iDBController) { // TODO Auto-generated method stub *************** *** 102,106 **** int lCodePoint = lCurLine.codePointAt(lCurIdx); CharacterEntity.Identifier lId = (CharacterEntity.Identifier) iDBController.findCharacterByUCSCode(lCodePoint); ! lMultiRad._characters.add(new Integer(lId.characterId)); } break; --- 107,117 ---- int lCodePoint = lCurLine.codePointAt(lCurIdx); CharacterEntity.Identifier lId = (CharacterEntity.Identifier) iDBController.findCharacterByUCSCode(lCodePoint); ! Integer lCharacterID = new Integer(lId.characterId); ! CharacterEntity lChar = iDBController.getCharacter(lCharacterID); ! if (lChar.multirads == null) ! lChar.multirads = new HashSet<MultiradEntity>(); ! lChar.multirads.add(lMultiRad); ! iDBController.setCharacter(lChar); ! lMultiRad._characters.add(lCharacterID); } break; |
|
From: Benoit C. <ben...@us...> - 2010-01-09 19:37:35
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/export In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19097/org/takadb/editor/export Modified Files: ExportSQL.java Log Message: improvements to multirads Index: ExportSQL.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/export/ExportSQL.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ExportSQL.java 23 Oct 2009 16:48:26 -0000 1.18 --- ExportSQL.java 9 Jan 2010 19:37:23 -0000 1.19 *************** *** 681,684 **** --- 681,688 ---- sqlSaveCharacter (conn, iterCharacter); } + //optimize FTS3 + final String lOptimizeMeanings = "SELECT optimize(meaningsFTS) FROM meaningsFTS LIMIT 1"; + Statement statement = conn.createStatement(); + statement.executeQuery (lOptimizeMeanings); } { *************** *** 714,718 **** } } ! ArrayList<MultiradEntity> lMultirads = this.dbcontroller.getAllMultirads(); if (lMultirads != null) --- 718,722 ---- } } ! //multirads ArrayList<MultiradEntity> lMultirads = this.dbcontroller.getAllMultirads(); if (lMultirads != null) *************** *** 725,728 **** --- 729,758 ---- sqlSaveMultirad(conn, lMultirad); } + + String updateStatementMultirad = + "UPDATE character_multirads SET ja_ucs_code = (SELECT c.ja_ucs_code FROM characters c WHERE c.character_id = character_multirads.character_id) "; + try { + PreparedStatement statement = prepareStatement (conn, updateStatementMultirad); + statement.executeUpdate(); + } catch (SQLException s) { + System.err.println (s.getMessage()); + } + updateStatementMultirad = + "UPDATE character_multirads SET ja_frequency = (SELECT c.ja_frequency FROM characters c WHERE c.character_id = character_multirads.character_id)"; + try { + PreparedStatement statement = prepareStatement (conn, updateStatementMultirad); + statement.executeUpdate(); + } catch (SQLException s) { + System.err.println (s.getMessage()); + } + updateStatementMultirad = + "UPDATE character_multirads SET stroke_count = (SELECT g.stroke_count FROM characters c, element_glyphs g WHERE c.character_id = character_multirads.character_id AND g.element_id = c.ja_element_id AND g.glyph_variant = 1)"; + + try { + PreparedStatement statement = prepareStatement (conn, updateStatementMultirad); + statement.executeUpdate(); + } catch (SQLException s) { + System.err.println (s.getMessage()); + } } conn.commit(); *************** *** 732,736 **** statement.execute ("ANALYZE"); statement.execute("UPDATE multirads SET ja_frequency = ( SELECT max(c.ja_frequency) FROM character_multirads cm, characters c " + ! "WHERE cm.character_id = c.character_id AND cm.multirad_ucs_code = multirads.multirad_ucs_code )"); conn.commit(); } --- 762,766 ---- statement.execute ("ANALYZE"); statement.execute("UPDATE multirads SET ja_frequency = ( SELECT max(c.ja_frequency) FROM character_multirads cm, characters c " + ! "WHERE cm.character_id = c.character_id AND cm.multirad_ucs_code = multirads.multirad_ucs_code )"); conn.commit(); } |
|
From: Benoit C. <ben...@us...> - 2010-01-09 19:37:31
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19097/org/takadb/editor/database/entities Modified Files: MultiradEntity.java RadicalEntity.java Log Message: improvements to multirads Index: RadicalEntity.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/RadicalEntity.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RadicalEntity.java 5 Oct 2008 22:18:59 -0000 1.5 --- RadicalEntity.java 9 Jan 2010 19:37:23 -0000 1.6 *************** *** 263,266 **** --- 263,268 ---- for (int i = 0; i < radicalNames.length; i++) { + if (!radicalNames[i].endsWith("xml")) + continue; String filename = radicalPath + radicalNames[i]; if (new File (filename).isFile()) { Index: MultiradEntity.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/MultiradEntity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultiradEntity.java 8 Oct 2008 23:50:29 -0000 1.2 --- MultiradEntity.java 9 Jan 2010 19:37:23 -0000 1.3 *************** *** 57,61 **** else if (lTokens[3].equals("js03")) { ! lMultiRad._elementId = 1783; } else if (lTokens[3].equals("js04")) --- 57,61 ---- else if (lTokens[3].equals("js03")) { ! lMultiRad._elementId = 50002; } else if (lTokens[3].equals("js04")) *************** *** 69,73 **** else if (lTokens[3].equals("js06")) { ! //need to create an element } else if (lTokens[3].equals("js07")) --- 69,73 ---- else if (lTokens[3].equals("js06")) { ! lMultiRad._elementId = 1565; } else if (lTokens[3].equals("js07")) *************** *** 75,78 **** --- 75,85 ---- lMultiRad._elementId = 2481; } + else if (lTokens[3].equals("js08")) + { + lMultiRad._elementId = 50000; + }else if (lTokens[3].equals("js09")) + { + lMultiRad._elementId = 50001; + } } else { |
|
From: Benoit C. <ben...@us...> - 2010-01-09 19:37:31
|
Update of /cvsroot/taka/takaglyphedit/conf In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19097/conf Modified Files: takaSQLite.tables Log Message: improvements to multirads Index: takaSQLite.tables =================================================================== RCS file: /cvsroot/taka/takaglyphedit/conf/takaSQLite.tables,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** takaSQLite.tables 23 Oct 2009 16:48:26 -0000 1.9 --- takaSQLite.tables 9 Jan 2010 19:37:23 -0000 1.10 *************** *** 47,51 **** CREATE TABLE multirads (multirad_ucs_code INTEGER NOT NULL, stroke_count INTEGER NOT NULL, element_id INTEGER, ja_frequency INTEGER, PRIMARY KEY (multirad_ucs_code)); ! CREATE TABLE character_multirads (character_id INTEGER NOT NULL, multirad_ucs_code INTEGER NOT NULL, PRIMARY KEY ( multirad_ucs_code, character_id)); ! CREATE INDEX character_multirads1 ON character_multirads(multirad_ucs_code); \ No newline at end of file --- 47,52 ---- CREATE TABLE multirads (multirad_ucs_code INTEGER NOT NULL, stroke_count INTEGER NOT NULL, element_id INTEGER, ja_frequency INTEGER, PRIMARY KEY (multirad_ucs_code)); ! CREATE TABLE character_multirads (character_id INTEGER NOT NULL, multirad_ucs_code INTEGER NOT NULL, ja_ucs_code, stroke_count, ja_frequency, PRIMARY KEY ( multirad_ucs_code, character_id)); ! CREATE INDEX character_multirads3 ON character_multirads(character_id); ! CREATE INDEX character_multirads2 ON character_multirads (stroke_count); |
|
From: Benoit C. <ben...@us...> - 2009-10-23 16:48:36
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5615/org/takadb/editor/database/entities Modified Files: KanjidicCharacter.java CategoryEntity.java Log Message: fix for generated db due to change in kanjidic format Index: KanjidicCharacter.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/KanjidicCharacter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** KanjidicCharacter.java 24 May 2009 23:11:31 -0000 1.9 --- KanjidicCharacter.java 23 Oct 2009 16:48:26 -0000 1.10 *************** *** 42,51 **** --- 42,57 ---- sCategoryJLPT4 = new CategoryEntity(lCategoryId++); sCategoryJLPT4.names.set("en", new CategoryEntity.Name("JLPT level 4")); + sCategoryJLPT4.names.set("ge", new CategoryEntity.Name("JLPT Stufe 4")); + sCategoryJLPT3 = new CategoryEntity(lCategoryId++); sCategoryJLPT3.names.set("en", new CategoryEntity.Name("JLPT level 3")); + sCategoryJLPT3.names.set("ge", new CategoryEntity.Name("JLPT Stufe 3")); sCategoryJLPT2 = new CategoryEntity(lCategoryId++); sCategoryJLPT2.names.set("en", new CategoryEntity.Name("JLPT level 2")); + sCategoryJLPT2.names.set("ge", new CategoryEntity.Name("JLPT Stufe 2")); sCategoryJLPT1 = new CategoryEntity(lCategoryId++); sCategoryJLPT1.names.set("en", new CategoryEntity.Name("JLPT level 1")); + sCategoryJLPT1.names.set("ge", new CategoryEntity.Name("JLPT Stufe 1")); + //create the reader for the kanjidic2 xml file Index: CategoryEntity.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/CategoryEntity.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CategoryEntity.java 5 Oct 2008 22:18:59 -0000 1.7 --- CategoryEntity.java 23 Oct 2009 16:48:26 -0000 1.8 *************** *** 229,233 **** } } ! return categoryList; --- 229,237 ---- } } ! //build the compound Joyou category ! for (int lCurJouyou = 1; lCurJouyou <= 7; lCurJouyou++ ) ! { ! ! } return categoryList; |
|
From: Benoit C. <ben...@us...> - 2009-10-23 16:48:36
|
Update of /cvsroot/taka/takaglyphedit/conf In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5615/conf Modified Files: takaSQLite.tables Log Message: fix for generated db due to change in kanjidic format Index: takaSQLite.tables =================================================================== RCS file: /cvsroot/taka/takaglyphedit/conf/takaSQLite.tables,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** takaSQLite.tables 30 May 2009 02:33:37 -0000 1.8 --- takaSQLite.tables 23 Oct 2009 16:48:26 -0000 1.9 *************** *** 45,49 **** CREATE TABLE radicals ( radical_number INTEGER NOT NULL, PRIMARY KEY (radical_number) ); ! CREATE TABLE multirads (multirad_ucs_code INTEGER NOT NULL, stroke_count INTEGER NOT NULL, element_id INTEGER, PRIMARY KEY (multirad_ucs_code)); CREATE TABLE character_multirads (character_id INTEGER NOT NULL, multirad_ucs_code INTEGER NOT NULL, PRIMARY KEY ( multirad_ucs_code, character_id)); --- 45,49 ---- CREATE TABLE radicals ( radical_number INTEGER NOT NULL, PRIMARY KEY (radical_number) ); ! CREATE TABLE multirads (multirad_ucs_code INTEGER NOT NULL, stroke_count INTEGER NOT NULL, element_id INTEGER, ja_frequency INTEGER, PRIMARY KEY (multirad_ucs_code)); CREATE TABLE character_multirads (character_id INTEGER NOT NULL, multirad_ucs_code INTEGER NOT NULL, PRIMARY KEY ( multirad_ucs_code, character_id)); |
|
From: Benoit C. <ben...@us...> - 2009-10-23 16:48:35
|
Update of /cvsroot/taka/takaglyphedit In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5615 Modified Files: .cvsignore Log Message: fix for generated db due to change in kanjidic format Index: .cvsignore =================================================================== RCS file: /cvsroot/taka/takaglyphedit/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** .cvsignore 24 May 2009 23:11:31 -0000 1.9 --- .cvsignore 23 Oct 2009 16:48:27 -0000 1.10 *************** *** 15,16 **** --- 15,19 ---- *.sqlite *.sqlite-journal + categories.db + elements.db + characters.db |
|
From: Benoit C. <ben...@us...> - 2009-10-23 16:48:35
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/export In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5615/org/takadb/editor/export Modified Files: ExportSQL.java Log Message: fix for generated db due to change in kanjidic format Index: ExportSQL.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/export/ExportSQL.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ExportSQL.java 30 May 2009 02:33:37 -0000 1.17 --- ExportSQL.java 23 Oct 2009 16:48:26 -0000 1.18 *************** *** 321,324 **** --- 321,326 ---- statement.executeUpdate(); int lDotIdx = reading.sourceReading.indexOf('ã»'); + if (lDotIdx == -1) + lDotIdx = reading.sourceReading.indexOf('.'); if ( lDotIdx != -1) { *************** *** 729,732 **** --- 731,736 ---- Statement statement = conn.createStatement(); statement.execute ("ANALYZE"); + statement.execute("UPDATE multirads SET ja_frequency = ( SELECT max(c.ja_frequency) FROM character_multirads cm, characters c " + + "WHERE cm.character_id = c.character_id AND cm.multirad_ucs_code = multirads.multirad_ucs_code )"); conn.commit(); } |
|
From: Benoit C. <ben...@us...> - 2009-06-11 02:29:14
|
Update of /cvsroot/taka/takadb In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27432 Modified Files: .cvsignore Log Message: added characters 3153 to 3292 Index: .cvsignore =================================================================== RCS file: /cvsroot/taka/takadb/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .cvsignore 9 Mar 2009 03:12:09 -0000 1.6 --- .cvsignore 11 Jun 2009 02:28:25 -0000 1.7 *************** *** 20,21 **** --- 20,22 ---- taka.sql *.swp + jmdict.sqlite |
|
From: Benoit C. <ben...@us...> - 2009-06-11 02:29:06
|
Update of /cvsroot/taka/takadb/xml In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27432/xml Modified Files: .cvsignore Log Message: added characters 3153 to 3292 Index: .cvsignore =================================================================== RCS file: /cvsroot/taka/takadb/xml/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 28 Feb 2009 22:09:07 -0000 1.1 --- .cvsignore 11 Jun 2009 02:28:25 -0000 1.2 *************** *** 2,3 **** --- 2,4 ---- kanjidic2.xml *.sqlite + *.gz |
|
From: Benoit C. <ben...@us...> - 2009-06-11 02:29:04
|
Update of /cvsroot/taka/takadb/xml/category In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27432/xml/category Added Files: 15.xml Log Message: added characters 3153 to 3292 --- NEW FILE: 15.xml --- <category> <categoryId>15</categoryId> <names> <DLCMap> <entry> <string>en</string> <categoryName> <categoryName>Jouyou All Grades</categoryName> </categoryName> </entry> </DLCMap> </names> <members> <sequenceMap> <entry> <int>1</int> <member> <characterId>861</characterId> </member> [...11648 lines suppressed...] <int>1943</int> <member> <characterId>1189</characterId> </member> </entry> <entry> <int>1944</int> <member> <characterId>309</characterId> </member> </entry> <entry> <int>1945</int> <member> <characterId>1069</characterId> </member> </entry> </sequenceMap> </members> </category> |
|
From: Benoit C. <ben...@us...> - 2009-05-30 03:05:17
|
Update of /cvsroot/taka/takaglyphedit/.settings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv314/.settings Added Files: org.eclipse.jdt.core.prefs Log Message: removed warnings --- NEW FILE: org.eclipse.jdt.core.prefs --- #Fri May 29 22:57:33 EDT 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=warning org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning |
|
From: Benoit C. <ben...@us...> - 2009-05-30 03:04:49
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv314/org/takadb/editor/database Modified Files: DBElementSearch.java Log Message: removed warnings Index: DBElementSearch.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/DBElementSearch.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DBElementSearch.java 5 Oct 2008 22:18:59 -0000 1.4 --- DBElementSearch.java 30 May 2009 03:04:39 -0000 1.5 *************** *** 198,206 **** public void setParentIndex (int _parentIndex) { this.parentIndex = _parentIndex; } ! public abstract int renumberImpl (int currentIndex, int parentIndex); public void renumber() { renumberImpl (0, -1); } ! public abstract ElementSearchNode getNodeByIndex (int index); ElementSearchNode (int _minStrokes, int _maxStrokes) { --- 198,206 ---- public void setParentIndex (int _parentIndex) { this.parentIndex = _parentIndex; } ! public abstract int renumberImpl (int currentIndex, int iParentIndex); public void renumber() { renumberImpl (0, -1); } ! public abstract ElementSearchNode getNodeByIndex (int iIndex); ElementSearchNode (int _minStrokes, int _maxStrokes) { |
|
From: Benoit C. <ben...@us...> - 2009-05-30 03:04:47
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/shell In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv314/org/takadb/editor/shell Modified Files: UIPatternCombo.java UIGlyphViewer.java UIElementInputButton.java UIRelationshipWindow.java UIGlyphEditor.java Log Message: removed warnings Index: UIElementInputButton.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIElementInputButton.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UIElementInputButton.java 5 Oct 2008 22:18:59 -0000 1.4 --- UIElementInputButton.java 30 May 2009 03:04:39 -0000 1.5 *************** *** 53,59 **** try { if (idString != null) { ! Integer elementId = new Integer (Misc.parseIntOrHexString (idString)); ! if ((elementId.intValue() == 0) || (dbcontroller.getElement (new ElementEntity.Identifier (elementId.intValue())) != null)) { ! setElementId (elementId); signalChangeListener(); } else { --- 53,59 ---- try { if (idString != null) { ! Integer lElementId = new Integer (Misc.parseIntOrHexString (idString)); ! if ((lElementId.intValue() == 0) || (dbcontroller.getElement (new ElementEntity.Identifier (lElementId.intValue())) != null)) { ! setElementId (lElementId); signalChangeListener(); } else { *************** *** 61,64 **** --- 61,65 ---- } } + } catch (NumberFormatException n) { JOptionPane.showMessageDialog(this, "Couldn't find Element " + idString, "Error", JOptionPane.ERROR_MESSAGE); Index: UIRelationshipWindow.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIRelationshipWindow.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** UIRelationshipWindow.java 13 Mar 2009 02:29:09 -0000 1.16 --- UIRelationshipWindow.java 30 May 2009 03:04:39 -0000 1.17 *************** *** 173,177 **** public void mouseClicked (MouseEvent e) { if (e.getClickCount() == 2) { ! Integer elementId = elementsTableModel.getElementIdAt (elementsTable.convertRowIndexToModel(elementsTable.rowAtPoint(e.getPoint()))); if (e.getButton() == MouseEvent.BUTTON1) { --- 173,177 ---- public void mouseClicked (MouseEvent e) { if (e.getClickCount() == 2) { ! Integer lElementId = elementsTableModel.getElementIdAt (elementsTable.convertRowIndexToModel(elementsTable.rowAtPoint(e.getPoint()))); if (e.getButton() == MouseEvent.BUTTON1) { *************** *** 179,188 **** if (lColumn == 3) { ! DBIdentifier lCharId = dbcontroller.findCharacterByJaElementId(elementId.intValue()); UIEditorWindow.getWindow().setEditedObject (lCharId); } else { ! UIEditorWindow.getWindow().setEditedObject (new ElementEntity.Identifier (elementId.intValue())); } } --- 179,188 ---- if (lColumn == 3) { ! DBIdentifier lCharId = dbcontroller.findCharacterByJaElementId(lElementId.intValue()); UIEditorWindow.getWindow().setEditedObject (lCharId); } else { ! UIEditorWindow.getWindow().setEditedObject (new ElementEntity.Identifier (lElementId.intValue())); } } *************** *** 272,288 **** public Object getValueAt (int row, int column) { if (row < elements.size()) { ! Integer elementId = elements.get (row); switch (column) { case 0: ! return elementId; case 1: ! return elementStrokeCounts.get (elementId); case 2: ! if (elementId != null) { ! return elementId + "-1"; } return "0-1"; case 3: ! DBIdentifier lCharId = dbcontroller.findCharacterByJaElementId(elementId.intValue()); if ( lCharId != null ) { --- 272,288 ---- public Object getValueAt (int row, int column) { if (row < elements.size()) { ! Integer lElementId = elements.get (row); switch (column) { case 0: ! return lElementId; case 1: ! return elementStrokeCounts.get (lElementId); case 2: ! if (lElementId != null) { ! return lElementId + "-1"; } return "0-1"; case 3: ! DBIdentifier lCharId = dbcontroller.findCharacterByJaElementId(lElementId.intValue()); if ( lCharId != null ) { *************** *** 292,296 **** break; case 4: ! lCharId = dbcontroller.findCharacterByJaElementId(elementId.intValue()); if ( lCharId != null ) { --- 292,296 ---- break; case 4: ! lCharId = dbcontroller.findCharacterByJaElementId(lElementId.intValue()); if ( lCharId != null ) { *************** *** 313,319 **** Iterator<Integer> iter = this.elements.iterator(); while (iter.hasNext()) { ! Integer elementId = iter.next(); ! ElementEntity element = dbcontroller.getElement (new ElementEntity.Identifier (elementId.intValue())); ! this.elementStrokeCounts.put (elementId, new Integer (element.glyphs.get(new Integer(1)).strokeCount)); } Collections.sort (this.elements, new ElementStrokeCountSorter (this.elementStrokeCounts)); --- 313,319 ---- Iterator<Integer> iter = this.elements.iterator(); while (iter.hasNext()) { ! Integer lElementId = iter.next(); ! ElementEntity lElement = dbcontroller.getElement (new ElementEntity.Identifier (lElementId.intValue())); ! this.elementStrokeCounts.put (lElementId, new Integer (lElement.glyphs.get(new Integer(1)).strokeCount)); } Collections.sort (this.elements, new ElementStrokeCountSorter (this.elementStrokeCounts)); Index: UIGlyphViewer.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIGlyphViewer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** UIGlyphViewer.java 5 Oct 2008 22:18:59 -0000 1.5 --- UIGlyphViewer.java 30 May 2009 03:04:39 -0000 1.6 *************** *** 173,186 **** } ! private ElementEntity.Glyph.Strokes recursiveRenderCompound (int elementId, int glyphVariant, int width, int height, boolean outer) { ! ElementEntity renderElement = dbcontroller.getElement (new ElementEntity.Identifier (elementId)); if (renderElement == null) return new ElementEntity.Glyph.Strokes(""); ! ElementEntity.Glyph renderGlyph = renderElement.glyphs.get (new Integer (glyphVariant)); ElementEntity.Glyph.Strokes returngsl = new ElementEntity.Glyph.Strokes(""); --- 173,186 ---- } ! private ElementEntity.Glyph.Strokes recursiveRenderCompound (int iElementId, int iGlyphVariant, int width, int height, boolean outer) { ! ElementEntity renderElement = dbcontroller.getElement (new ElementEntity.Identifier (iElementId)); if (renderElement == null) return new ElementEntity.Glyph.Strokes(""); ! ElementEntity.Glyph renderGlyph = renderElement.glyphs.get (new Integer (iGlyphVariant)); ElementEntity.Glyph.Strokes returngsl = new ElementEntity.Glyph.Strokes(""); Index: UIPatternCombo.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIPatternCombo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UIPatternCombo.java 5 Oct 2008 22:18:59 -0000 1.3 --- UIPatternCombo.java 30 May 2009 03:04:39 -0000 1.4 *************** *** 38,44 **** } ! ComboBoxRenderer renderer = new ComboBoxRenderer(); ! renderer.setPreferredSize (new Dimension(60, 24)); ! setRenderer (renderer); setMaximumRowCount (8); setSelectedIndex (selectedIndex); --- 38,44 ---- } ! ComboBoxRenderer lRenderer = new ComboBoxRenderer(); ! lRenderer.setPreferredSize (new Dimension(60, 24)); ! setRenderer (lRenderer); setMaximumRowCount (8); setSelectedIndex (selectedIndex); *************** *** 48,51 **** --- 48,52 ---- implements ListCellRenderer { + /** * Index: UIGlyphEditor.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIGlyphEditor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** UIGlyphEditor.java 5 Oct 2008 22:18:59 -0000 1.9 --- UIGlyphEditor.java 30 May 2009 03:04:39 -0000 1.10 *************** *** 821,827 **** ).translate ((float)renderGlyph.pX[i], (float)renderGlyph.pY[i]); ! ElementEntity.Glyph glyph = subElement.glyphs.get (subGlyphVariant); ! if ((i == 0) && (glyph != null) && (glyph.centrePoint > 0) && renderElement.pattern.startsWith("E")) { ! splitRender = glyph.centrePoint; } if ((i == 1) && (splitRender > 0) && (splitRender <= returngsl.size())) { --- 821,827 ---- ).translate ((float)renderGlyph.pX[i], (float)renderGlyph.pY[i]); ! ElementEntity.Glyph lGlyph = subElement.glyphs.get (subGlyphVariant); ! if ((i == 0) && (lGlyph != null) && (lGlyph.centrePoint > 0) && renderElement.pattern.startsWith("E")) { ! splitRender = lGlyph.centrePoint; } if ((i == 1) && (splitRender > 0) && (splitRender <= returngsl.size())) { |
|
From: Benoit C. <ben...@us...> - 2009-05-30 02:34:19
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/export In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27336/org/takadb/editor/export Modified Files: ExportSQL.java Log Message: Index: ExportSQL.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/export/ExportSQL.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ExportSQL.java 24 May 2009 23:11:31 -0000 1.16 --- ExportSQL.java 30 May 2009 02:33:37 -0000 1.17 *************** *** 363,366 **** --- 363,367 ---- } + static int sCharacterMeaningId = 1; // Write "character_meanings" entry into SQL database as part of generation save private static void sqlSaveCharacterMeaning (Connection conn, CharacterEntity character, Meaning.Identifier identifier, Meaning meaning) *************** *** 369,374 **** return; final String updateStatementCharacterMeaning = ! "INSERT INTO character_meanings (character_id, source_language_code, dest_language_code, dest_meaning) " ! + "VALUES (?,?,?,?)"; try { PreparedStatement statement = prepareStatement (conn, updateStatementCharacterMeaning); --- 370,375 ---- return; final String updateStatementCharacterMeaning = ! "INSERT INTO character_meanings (character_id, source_language_code, dest_language_code, dest_meaning, character_meanings_id) " ! + "VALUES (?,?,?,?,?)"; try { PreparedStatement statement = prepareStatement (conn, updateStatementCharacterMeaning); *************** *** 377,380 **** --- 378,389 ---- statement.setString (3, identifier.destLanguageCode); statement.setString (4, meaning.destMeaning); + statement.setInt (5, sCharacterMeaningId); + statement.executeUpdate(); + final String updateStatementMeaningFTS = + "INSERT INTO meaningsFTS (docid, dest_meaning) " + + "VALUES (?,?)"; + statement = prepareStatement (conn, updateStatementMeaningFTS); + statement.setInt(1, sCharacterMeaningId++); + statement.setString(2, meaning.destMeaning); statement.executeUpdate(); } catch (SQLException s) { |
|
From: Benoit C. <ben...@us...> - 2009-05-30 02:33:47
|
Update of /cvsroot/taka/takaglyphedit/conf In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27336/conf Modified Files: takaSQLite.tables Log Message: Index: takaSQLite.tables =================================================================== RCS file: /cvsroot/taka/takaglyphedit/conf/takaSQLite.tables,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** takaSQLite.tables 5 Jan 2009 23:52:52 -0000 1.7 --- takaSQLite.tables 30 May 2009 02:33:37 -0000 1.8 *************** *** 5,9 **** CREATE TABLE category_names ( category_id int(11) NOT NULL default '0', dest_language_code varchar(32) NOT NULL, category_name varchar(255) NOT NULL, PRIMARY KEY (category_id, dest_language_code) ); ! CREATE TABLE character_meanings ( character_id int(11) NOT NULL default '0', source_language_code varchar(32) NOT NULL default '', dest_language_code varchar(32) NOT NULL default '', dest_meaning varchar(255) NOT NULL default '', PRIMARY KEY (character_id, source_language_code, dest_language_code) ); CREATE TABLE character_reading_meanings ( character_id INTEGER NOT NULL, source_language_code TEXT NOT NULL, reading_index INTEGER NOT NULL,dest_language_code TEXT NOT NULL, dest_reading_meaning TEXT NOT NULL, UNIQUE (character_id, source_language_code, reading_index, dest_language_code) ); --- 5,13 ---- CREATE TABLE category_names ( category_id int(11) NOT NULL default '0', dest_language_code varchar(32) NOT NULL, category_name varchar(255) NOT NULL, PRIMARY KEY (category_id, dest_language_code) ); ! CREATE TABLE character_meanings (character_meanings_id INTEGER PRIMARY KEY, character_id int(11) NOT NULL default '0', source_language_code varchar(32) NOT NULL default '', dest_language_code varchar(32) NOT NULL default '', dest_meaning varchar(255) NOT NULL default '') ! ! CREATE INDEX character_meanings1 ON character_meanings(character_id, dest_language_code); ! ! CREATE VIRTUAL TABLE meaningsFTS USING fts3 (dest_meaning); CREATE TABLE character_reading_meanings ( character_id INTEGER NOT NULL, source_language_code TEXT NOT NULL, reading_index INTEGER NOT NULL,dest_language_code TEXT NOT NULL, dest_reading_meaning TEXT NOT NULL, UNIQUE (character_id, source_language_code, reading_index, dest_language_code) ); *************** *** 11,17 **** CREATE TABLE character_readings ( character_id INTEGER NOT NULL, source_language_code TEXT NOT NULL, reading_index INTEGER NOT NULL, source_reading TEXT NOT NULL, jp_reading_type TEXT NOT NULL, UNIQUE (character_id, source_language_code, reading_index) ); CREATE TABLE character_readings_alternate ( character_id INTEGER NOT NULL, source_language_code TEXT NOT NULL, reading_index INTEGER NOT NULL, source_reading TEXT NOT NULL, jp_reading_type TEXT NOT NULL, UNIQUE (character_id, source_language_code, reading_index) ); ! CREATE TABLE characters ( character_id INTEGER NOT NULL PRIMARY KEY, ja_ucs_code INTEGER default NULL, ja_element_id INTEGER default NULL, ja_jis_code INTEGER default NULL, ja_jouyou_grade INTEGER default NULL, zh_simplified_ucs_code INTEGER default NULL, zh_simplified_element_id INTEGER default NULL, zh_traditional_ucs_code INTEGER default NULL, zh_traditional_element_id INTEGER default NULL, ja_frequency INTEGER default NULL, UNIQUE (ja_ucs_code) ); CREATE TABLE element_glyphs ( element_id INTEGER NOT NULL default '0', glyph_variant INTEGER NOT NULL default '0', width INTEGER default NULL, height INTEGER default NULL, p1_glyph_variant INTEGER default NULL, p1_x INTEGER default NULL, p1_y INTEGER default NULL, p1_width INTEGER default NULL, p1_height INTEGER default NULL, p2_glyph_variant INTEGER default NULL,p2_x INTEGER default NULL, p2_y INTEGER default NULL, p2_width INTEGER default NULL, p2_height INTEGER default NULL, p3_glyph_variant INTEGER default NULL, p3_x INTEGER default NULL, p3_y INTEGER default NULL, p3_width INTEGER default NULL, p3_height INTEGER default NULL, p4_glyph_variant INTEGER default NULL, p4_x INTEGER default NULL, p4_y INTEGER default NULL, p4_width INTEGER default NULL, p4_height INTEGER default NULL, strokes mediumtext, stroke_count INTEGER default NULL, centrepoint INTEGER default NULL, UNIQUE ( element_id, glyph_variant) ); --- 15,29 ---- CREATE TABLE character_readings ( character_id INTEGER NOT NULL, source_language_code TEXT NOT NULL, reading_index INTEGER NOT NULL, source_reading TEXT NOT NULL, jp_reading_type TEXT NOT NULL, UNIQUE (character_id, source_language_code, reading_index) ); + CREATE INDEX character_readings1 ON character_readings(source_reading); + CREATE TABLE character_readings_alternate ( character_id INTEGER NOT NULL, source_language_code TEXT NOT NULL, reading_index INTEGER NOT NULL, source_reading TEXT NOT NULL, jp_reading_type TEXT NOT NULL, UNIQUE (character_id, source_language_code, reading_index) ); ! CREATE INDEX character_readings_alternate1 ON character_readings_alternate(source_reading); ! ! CREATE TABLE characters ( character_id INTEGER PRIMARY KEY, ja_ucs_code INTEGER default NULL, ja_element_id INTEGER default NULL, ja_jis_code INTEGER default NULL, ja_jouyou_grade INTEGER default NULL, zh_simplified_ucs_code INTEGER default NULL, zh_simplified_element_id INTEGER default NULL, zh_traditional_ucs_code INTEGER default NULL, zh_traditional_element_id INTEGER default NULL, ja_frequency INTEGER default NULL, UNIQUE (ja_ucs_code) ); ! ! CREATE INDEX characters1 ON characters(ja_jis_code); ! ! CREATE INDEX characters2 ON characters(ja_element_id); CREATE TABLE element_glyphs ( element_id INTEGER NOT NULL default '0', glyph_variant INTEGER NOT NULL default '0', width INTEGER default NULL, height INTEGER default NULL, p1_glyph_variant INTEGER default NULL, p1_x INTEGER default NULL, p1_y INTEGER default NULL, p1_width INTEGER default NULL, p1_height INTEGER default NULL, p2_glyph_variant INTEGER default NULL,p2_x INTEGER default NULL, p2_y INTEGER default NULL, p2_width INTEGER default NULL, p2_height INTEGER default NULL, p3_glyph_variant INTEGER default NULL, p3_x INTEGER default NULL, p3_y INTEGER default NULL, p3_width INTEGER default NULL, p3_height INTEGER default NULL, p4_glyph_variant INTEGER default NULL, p4_x INTEGER default NULL, p4_y INTEGER default NULL, p4_width INTEGER default NULL, p4_height INTEGER default NULL, strokes mediumtext, stroke_count INTEGER default NULL, centrepoint INTEGER default NULL, UNIQUE ( element_id, glyph_variant) ); *************** *** 19,22 **** --- 31,40 ---- CREATE TABLE elements ( element_id INTEGER NOT NULL PRIMARY KEY, pattern TEXT default NULL, p1_element_id INTEGER default NULL, p2_element_id INTEGER default NULL, p3_element_id INTEGER default NULL, p4_element_id INTEGER default NULL ); + CREATE INDEX elements1 ON elements(p1_element_id); + CREATE INDEX elements2 ON elements(p2_element_id); + CREATE INDEX elements3 ON elements(p3_element_id); + CREATE INDEX elements4 ON elements(p4_element_id); + + CREATE TABLE radical_variant_mnemonics ( radical_number INTEGER NOT NULL, radical_variant INTEGER NOT NULL, dest_language_code TEXT NOT NULL, dest_mnemonic TEXT binary default NULL, UNIQUE ( radical_number, radical_variant) ); *************** *** 29,32 **** CREATE TABLE multirads (multirad_ucs_code INTEGER NOT NULL, stroke_count INTEGER NOT NULL, element_id INTEGER, PRIMARY KEY (multirad_ucs_code)); ! CREATE TABLE character_multirads (character_id INTEGER NOT NULL, multirad_ucs_code INTEGER NOT NULL, PRIMARY KEY (character_id, multirad_ucs_code)); --- 47,51 ---- CREATE TABLE multirads (multirad_ucs_code INTEGER NOT NULL, stroke_count INTEGER NOT NULL, element_id INTEGER, PRIMARY KEY (multirad_ucs_code)); ! CREATE TABLE character_multirads (character_id INTEGER NOT NULL, multirad_ucs_code INTEGER NOT NULL, PRIMARY KEY ( multirad_ucs_code, character_id)); + CREATE INDEX character_multirads1 ON character_multirads(multirad_ucs_code); \ No newline at end of file |
|
From: Benoit C. <ben...@us...> - 2009-05-29 11:57:44
|
Update of /cvsroot/taka/takadb/xml/character In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20635/xml/character Modified Files: 1104.xml 1828.xml 2146.xml Log Message: numerous new characters added Index: 2146.xml =================================================================== RCS file: /cvsroot/taka/takadb/xml/character/2146.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 2146.xml 15 Jul 2004 00:38:46 -0000 1.1 --- 2146.xml 29 May 2009 11:57:35 -0000 1.2 *************** *** 1,17 **** <character> <characterId>2146</characterId> <jaElementId>1615</jaElementId> <jaJisCode>17003</jaJisCode> <jaJouyouGrade>0</jaJouyouGrade> - <jaUcsCode>40441</jaUcsCode> - <meanings> - <identifierMap/> - </meanings> - <readings> - <SLCMap/> - </readings> - <zhSimplifiedElementId>0</zhSimplifiedElementId> <zhSimplifiedUcsCode>0</zhSimplifiedUcsCode> ! <zhTraditionalElementId>0</zhTraditionalElementId> <zhTraditionalUcsCode>0</zhTraditionalUcsCode> </character> \ No newline at end of file --- 1,112 ---- <character> <characterId>2146</characterId> + <jaUcsCode>40441</jaUcsCode> <jaElementId>1615</jaElementId> <jaJisCode>17003</jaJisCode> <jaJouyouGrade>0</jaJouyouGrade> <zhSimplifiedUcsCode>0</zhSimplifiedUcsCode> ! <zhSimplifiedElementId>0</zhSimplifiedElementId> <zhTraditionalUcsCode>0</zhTraditionalUcsCode> + <zhTraditionalElementId>0</zhTraditionalElementId> + <jaFrequency>0</jaFrequency> + <readings> + <SLCMap> + <entry> + <string>ja</string> + <map> + <entry> + <int>1</int> + <reading> + <sourceReading>ã¨ã¦</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>2</int> + <reading> + <sourceReading>ãªã¦</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>3</int> + <reading> + <sourceReading>ãã</sourceReading> + <jpReadingType>kun</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning>falcon (Falconidae family); hawk</destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + </map> + </entry> + </SLCMap> + </readings> + <meanings> + <identifierMap> + <entry> + <identifier> + <sourceLanguageCode>ja</sourceLanguageCode> + <destLanguageCode>en</destLanguageCode> + </identifier> + <meaning> + <destMeaning>hawk</destMeaning> + </meaning> + </entry> + <entry> + <identifier> + <sourceLanguageCode>ja</sourceLanguageCode> + <destLanguageCode>fr</destLanguageCode> + </identifier> + <meaning> + <destMeaning></destMeaning> + </meaning> + </entry> + </identifierMap> + </meanings> </character> \ No newline at end of file Index: 1828.xml =================================================================== RCS file: /cvsroot/taka/takadb/xml/character/1828.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 1828.xml 15 Jul 2004 00:38:40 -0000 1.1 --- 1828.xml 29 May 2009 11:57:35 -0000 1.2 *************** *** 1,17 **** <character> <characterId>1828</characterId> <jaElementId>589</jaElementId> <jaJisCode>22050</jaJisCode> <jaJouyouGrade>0</jaJouyouGrade> - <jaUcsCode>23631</jaUcsCode> - <meanings> - <identifierMap/> - </meanings> - <readings> - <SLCMap/> - </readings> - <zhSimplifiedElementId>0</zhSimplifiedElementId> <zhSimplifiedUcsCode>0</zhSimplifiedUcsCode> ! <zhTraditionalElementId>0</zhTraditionalElementId> <zhTraditionalUcsCode>0</zhTraditionalUcsCode> </character> \ No newline at end of file --- 1,158 ---- <character> <characterId>1828</characterId> + <jaUcsCode>23631</jaUcsCode> <jaElementId>589</jaElementId> <jaJisCode>22050</jaJisCode> <jaJouyouGrade>0</jaJouyouGrade> <zhSimplifiedUcsCode>0</zhSimplifiedUcsCode> ! <zhSimplifiedElementId>0</zhSimplifiedElementId> <zhTraditionalUcsCode>0</zhTraditionalUcsCode> + <zhTraditionalElementId>0</zhTraditionalElementId> + <jaFrequency>0</jaFrequency> + <readings> + <SLCMap> + <entry> + <string>ja</string> + <map> + <entry> + <int>1</int> + <reading> + <sourceReading>ãã¤</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>2</int> + <reading> + <sourceReading>ãã§ã¦</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>3</int> + <reading> + <sourceReading>ããã»ã</sourceReading> + <jpReadingType>kun</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>4</int> + <reading> + <sourceReading>ãããã»ã</sourceReading> + <jpReadingType>kun</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>5</int> + <reading> + <sourceReading>ã³ããã»ã¶</sourceReading> + <jpReadingType>kun</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + </map> + </entry> + </SLCMap> + </readings> + <meanings> + <identifierMap> + <entry> + <identifier> + <sourceLanguageCode>ja</sourceLanguageCode> + <destLanguageCode>en</destLanguageCode> + </identifier> + <meaning> + <destMeaning>wall; fence</destMeaning> + </meaning> + </entry> + <entry> + <identifier> + <sourceLanguageCode>ja</sourceLanguageCode> + <destLanguageCode>fr</destLanguageCode> + </identifier> + <meaning> + <destMeaning></destMeaning> + </meaning> + </entry> + </identifierMap> + </meanings> </character> \ No newline at end of file Index: 1104.xml =================================================================== RCS file: /cvsroot/taka/takadb/xml/character/1104.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 1104.xml 15 Jul 2004 00:38:37 -0000 1.1 --- 1104.xml 29 May 2009 11:57:35 -0000 1.2 *************** *** 1,17 **** <character> <characterId>1104</characterId> <jaElementId>889</jaElementId> <jaJisCode>15921</jaJisCode> <jaJouyouGrade>0</jaJouyouGrade> - <jaUcsCode>24196</jaUcsCode> - <meanings> - <identifierMap/> - </meanings> - <readings> - <SLCMap/> - </readings> - <zhSimplifiedElementId>0</zhSimplifiedElementId> <zhSimplifiedUcsCode>0</zhSimplifiedUcsCode> ! <zhTraditionalElementId>0</zhTraditionalElementId> <zhTraditionalUcsCode>0</zhTraditionalUcsCode> </character> \ No newline at end of file --- 1,122 ---- <character> <characterId>1104</characterId> + <jaUcsCode>24196</jaUcsCode> <jaElementId>889</jaElementId> <jaJisCode>15921</jaJisCode> <jaJouyouGrade>0</jaJouyouGrade> <zhSimplifiedUcsCode>0</zhSimplifiedUcsCode> ! <zhSimplifiedElementId>0</zhSimplifiedElementId> <zhTraditionalUcsCode>0</zhTraditionalUcsCode> + <zhTraditionalElementId>0</zhTraditionalElementId> + <jaFrequency>0</jaFrequency> + <readings> + <SLCMap> + <entry> + <string>ja</string> + <map> + <entry> + <int>1</int> + <reading> + <sourceReading>ã·ã§ã¦</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>2</int> + <reading> + <sourceReading>ã½</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>3</int> + <reading> + <sourceReading>ã½ã¦</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap> + <entry> + <string>fr</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + <entry> + <string>en</string> + <readingMeaning> + <destReadingMeaning></destReadingMeaning> + </readingMeaning> + </entry> + </DLCMap> + </meanings> + </reading> + </entry> + <entry> + <int>4</int> + <reading> + <sourceReading>ãã¦</sourceReading> + <jpReadingType>on</jpReadingType> + <meanings> + <DLCMap/> + </meanings> + </reading> + </entry> + </map> + </entry> + </SLCMap> + </readings> + <meanings> + <identifierMap> + <entry> + <identifier> + <sourceLanguageCode>ja</sourceLanguageCode> + <destLanguageCode>en</destLanguageCode> + </identifier> + <meaning> + <destMeaning>level</destMeaning> + </meaning> + </entry> + <entry> + <identifier> + <sourceLanguageCode>ja</sourceLanguageCode> + <destLanguageCode>fr</destLanguageCode> + </identifier> + <meaning> + <destMeaning></destMeaning> + </meaning> + </entry> + </identifierMap> + </meanings> </character> \ No newline at end of file |
|
From: Benoit C. <ben...@us...> - 2009-05-24 23:11:45
|
Update of /cvsroot/taka/takaglyphedit In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7317 Modified Files: .cvsignore Log Message: small changes to presentation and how meanings are exported Index: .cvsignore =================================================================== RCS file: /cvsroot/taka/takaglyphedit/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** .cvsignore 14 Dec 2008 21:03:13 -0000 1.8 --- .cvsignore 24 May 2009 23:11:31 -0000 1.9 *************** *** 13,14 **** --- 13,16 ---- taka.sqlite.v1.4 taka*.sqlite* + *.sqlite + *.sqlite-journal |
|
From: Benoit C. <ben...@us...> - 2009-05-24 23:11:45
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/export In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7317/org/takadb/editor/export Modified Files: ExportSQL.java Log Message: small changes to presentation and how meanings are exported Index: ExportSQL.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/export/ExportSQL.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ExportSQL.java 2 Mar 2009 03:10:12 -0000 1.15 --- ExportSQL.java 24 May 2009 23:11:31 -0000 1.16 *************** *** 58,67 **** _StatementCache.put(iConn, lConCache); } ! PreparedStatement lStmt = lConCache.get(iStatementSQL); if (lStmt == null) { ! lStmt = iConn.prepareStatement (iStatementSQL); ! lConCache.put(iStatementSQL, lStmt); } else --- 58,67 ---- _StatementCache.put(iConn, lConCache); } ! PreparedStatement lStmt = lConCache.get(iStatementSQL); if (lStmt == null) { ! lStmt = iConn.prepareStatement (iStatementSQL); ! lConCache.put(iStatementSQL, lStmt); } else *************** *** 323,327 **** if ( lDotIdx != -1) { ! PreparedStatement statementAlternate = prepareStatement(conn, updateStatementCharacterReadingAlternate); statementAlternate.setInt (1, character.characterId); statementAlternate.setString (2, sourceLanguageCode); --- 323,327 ---- if ( lDotIdx != -1) { ! PreparedStatement statementAlternate = prepareStatement(conn, updateStatementCharacterReadingAlternate); statementAlternate.setInt (1, character.characterId); statementAlternate.setString (2, sourceLanguageCode); *************** *** 648,720 **** try { ! conn.setAutoCommit(false); ! if (conn == null) { ! System.err.println ("Error: Failed to connect to database"); ! Runtime.getRuntime().halt(1); ! } ! { ! // categories ! System.out.println ("+ Saving categories..."); ! Iterator<CategoryEntity> iter = this.dbcontroller.getAllCategories().iterator(); ! while (iter.hasNext()) { ! CategoryEntity iterCategory = iter.next(); ! sqlSaveCategory (conn, iterCategory); } ! } ! { ! // characters ! System.out.println ("+ Saving characters..."); ! Iterator<CharacterEntity> iter = this.dbcontroller.getAllCharacters().iterator(); ! while (iter.hasNext()) { ! CharacterEntity iterCharacter = iter.next(); ! sqlSaveCharacter (conn, iterCharacter); } ! } ! { ! // elements ! System.out.println ("+ Saving elements..."); ! Iterator<ElementEntity> iter = this.dbcontroller.getAllElements().iterator(); ! while (iter.hasNext()) { ! ElementEntity iterElement = iter.next(); ! sqlSaveElement (conn, iterElement); } ! } ! { ! // radicals ! System.out.println ("+ Saving radicals..."); ! Iterator<RadicalEntity> iter = this.dbcontroller.getAllRadicals().iterator(); ! while (iter.hasNext()) { ! RadicalEntity iterRadical = iter.next(); ! sqlSaveRadical (conn, iterRadical); } ! } ! // kanjidic2 ! ArrayList<KanjidicCharacter> lKChars = this.dbcontroller.getAllKCharacters(); ! if (lKChars !=null) ! { ! System.out.println("+ Saving JLPT categories..."); ! Iterator<KanjidicCharacter> lIter = lKChars.iterator(); ! while(lIter.hasNext()) { ! KanjidicCharacter lKChar = lIter.next(); ! sqlSaveKChar (conn, lKChar); } ! } ! ! ArrayList<MultiradEntity> lMultirads = this.dbcontroller.getAllMultirads(); ! if (lMultirads != null) ! { ! System.out.println("+ saving multiradical informations..."); ! Iterator<MultiradEntity> lIter = lMultirads.iterator(); ! while(lIter.hasNext()) { ! MultiradEntity lMultirad = lIter.next(); ! sqlSaveMultirad(conn, lMultirad); } } - conn.commit(); - } catch (Exception e) { --- 648,726 ---- try { ! conn.setAutoCommit(false); ! if (conn == null) { ! System.err.println ("Error: Failed to connect to database"); ! Runtime.getRuntime().halt(1); } ! { ! // categories ! System.out.println ("+ Saving categories..."); ! Iterator<CategoryEntity> iter = this.dbcontroller.getAllCategories().iterator(); ! while (iter.hasNext()) { ! CategoryEntity iterCategory = iter.next(); ! sqlSaveCategory (conn, iterCategory); ! } } ! { ! // characters ! System.out.println ("+ Saving characters..."); ! Iterator<CharacterEntity> iter = this.dbcontroller.getAllCharacters().iterator(); ! while (iter.hasNext()) { ! CharacterEntity iterCharacter = iter.next(); ! sqlSaveCharacter (conn, iterCharacter); ! } } ! { ! // elements ! System.out.println ("+ Saving elements..."); ! Iterator<ElementEntity> iter = this.dbcontroller.getAllElements().iterator(); ! while (iter.hasNext()) { ! ElementEntity iterElement = iter.next(); ! sqlSaveElement (conn, iterElement); ! } } ! { ! // radicals ! System.out.println ("+ Saving radicals..."); ! Iterator<RadicalEntity> iter = this.dbcontroller.getAllRadicals().iterator(); ! while (iter.hasNext()) { ! RadicalEntity iterRadical = iter.next(); ! sqlSaveRadical (conn, iterRadical); ! } ! } ! // kanjidic2 ! ArrayList<KanjidicCharacter> lKChars = this.dbcontroller.getAllKCharacters(); ! if (lKChars !=null) ! { ! System.out.println("+ Saving JLPT categories..."); ! Iterator<KanjidicCharacter> lIter = lKChars.iterator(); ! while(lIter.hasNext()) ! { ! KanjidicCharacter lKChar = lIter.next(); ! sqlSaveKChar (conn, lKChar); ! } ! } ! ! ArrayList<MultiradEntity> lMultirads = this.dbcontroller.getAllMultirads(); ! if (lMultirads != null) { ! System.out.println("+ saving multiradical informations..."); ! Iterator<MultiradEntity> lIter = lMultirads.iterator(); ! while(lIter.hasNext()) ! { ! MultiradEntity lMultirad = lIter.next(); ! sqlSaveMultirad(conn, lMultirad); ! } } ! conn.commit(); ! if (jdbcProtocol.equals("sqlite")) { ! Statement statement = conn.createStatement(); ! statement.execute ("ANALYZE"); ! conn.commit(); } } catch (Exception e) { *************** *** 750,766 **** { try { ! lCurChar = iter.next(); ! final String updateStatementCharacterMultirad = ! "INSERT INTO character_multirads (character_id, multirad_ucs_code) VALUES (?,?)"; ! //PreparedStatement lStatement = prepareStatement(conn, updateStatementCharacterMultirad); ! PreparedStatement lStatement = conn.prepareStatement(updateStatementCharacterMultirad); ! lStatement.setInt(1, lCurChar.intValue()); ! lStatement.setInt(2, iMultirad._UCSCode); ! lStatement.executeUpdate(); } catch (SQLException s) { System.err.println (s.getMessage()); ! // s.printStackTrace(); int[] lCodePoint = new int[1]; lCodePoint[0] = iMultirad._UCSCode; --- 756,772 ---- { try { ! lCurChar = iter.next(); ! final String updateStatementCharacterMultirad = ! "INSERT INTO character_multirads (character_id, multirad_ucs_code) VALUES (?,?)"; ! //PreparedStatement lStatement = prepareStatement(conn, updateStatementCharacterMultirad); ! PreparedStatement lStatement = conn.prepareStatement(updateStatementCharacterMultirad); ! lStatement.setInt(1, lCurChar.intValue()); ! lStatement.setInt(2, iMultirad._UCSCode); ! lStatement.executeUpdate(); } catch (SQLException s) { System.err.println (s.getMessage()); ! // s.printStackTrace(); int[] lCodePoint = new int[1]; lCodePoint[0] = iMultirad._UCSCode; *************** *** 772,776 **** int[] lCodePoint = new int[1]; lCodePoint[0] = iMultirad._UCSCode; ! } } --- 778,782 ---- int[] lCodePoint = new int[1]; lCodePoint[0] = iMultirad._UCSCode; ! } } |
|
From: Benoit C. <ben...@us...> - 2009-05-24 23:11:40
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7317/org/takadb/editor/database/entities Modified Files: KanjidicCharacter.java Log Message: small changes to presentation and how meanings are exported Index: KanjidicCharacter.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/database/entities/KanjidicCharacter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** KanjidicCharacter.java 5 Jan 2009 23:52:52 -0000 1.8 --- KanjidicCharacter.java 24 May 2009 23:11:31 -0000 1.9 *************** *** 165,169 **** { boolean lUnicodeCodePoint = false; ! CharacterEntity.Reading lReading = null; boolean lJLPT = false; boolean lJisCodePoint = false; --- 165,171 ---- { boolean lUnicodeCodePoint = false; ! CharacterEntity.Reading lCurReading = null; ! CharacterEntity.Reading lCurReadingMeaningGroup = null; ! StringBuilder lCurReadingGroup = null; boolean lJLPT = false; boolean lJisCodePoint = false; *************** *** 191,203 **** lJisCodePoint = true; ! } else if (lLocalPart.equals("reading")) { String lReadingType = lCurStart.getAttributeByName(new javax.xml.namespace.QName("r_type")).getValue(); if( lReadingType.equals("ja_kun")) { ! lReading = new CharacterEntity.Reading(null, "kun"); } else if ( lReadingType.equals("ja_on")) { ! lReading = new CharacterEntity.Reading(null, "on"); } --- 193,211 ---- lJisCodePoint = true; ! } /*else if (lLocalPart.equals("rmgroup")) ! { ! lCurReadingGroup = new StringBuilder(); ! lCurReadingMeaningGroup = new CharacterEntity.Reading(null, "hide"); ! } ! */ ! else if (lLocalPart.equals("reading")) { String lReadingType = lCurStart.getAttributeByName(new javax.xml.namespace.QName("r_type")).getValue(); if( lReadingType.equals("ja_kun")) { ! lCurReading = new CharacterEntity.Reading(null, "kun"); } else if ( lReadingType.equals("ja_on")) { ! lCurReading = new CharacterEntity.Reading(null, "on"); } *************** *** 235,239 **** case XMLEvent.END_ELEMENT: lUnicodeCodePoint = false; ! lReading = null; lCurMeaning = null; lJLPT = false; --- 243,247 ---- case XMLEvent.END_ELEMENT: lUnicodeCodePoint = false; ! lCurReading = null; lCurMeaning = null; lJLPT = false; *************** *** 242,245 **** --- 250,263 ---- lNbStrokes = false; lFrequency = false; + /* + if (lCurEvent.asEndElement().getName().getLocalPart().equals("rmgroup")) + { + lCurReadingMeaningGroup.sourceReading = lCurReadingGroup.toString(); + _Readings.add(lCurReadingMeaningGroup); + lCurReadingMeaningGroup = null; + lCurReadingGroup = null; + } + else + */ if (lCurEvent.asEndElement().getName().getLocalPart().equals("character")) { *************** *** 331,335 **** CharacterEntity lChar = iDBController.getCharacter (new Integer (((CharacterEntity.Identifier)_CharacterId).characterId)); lChar.jaFrequency = _Frequency; ! lChar.meanings.remove("ja", "en"); Iterator<Meaning> lIter = _Meanings.iterator(); HashMap<String, StringBuilder> lMeanings = new HashMap<String, StringBuilder>(); --- 349,353 ---- CharacterEntity lChar = iDBController.getCharacter (new Integer (((CharacterEntity.Identifier)_CharacterId).characterId)); lChar.jaFrequency = _Frequency; ! lChar.meanings = new CharacterEntity.Meanings(); Iterator<Meaning> lIter = _Meanings.iterator(); HashMap<String, StringBuilder> lMeanings = new HashMap<String, StringBuilder>(); *************** *** 397,409 **** _CharacterId = (CharacterEntity.Identifier)iDBController.findCharacterByUCSCode (_UCS); } ! else if (lReading != null) { ! lReading.sourceReading = lCurEvent.asCharacters().getData(); ! _Readings.add(lReading); } else if (lCurMeaning != null) { lCurMeaning._meaning = lCurEvent.asCharacters().getData(); ! _Meanings.add(lCurMeaning); } else if (lJLPT) --- 415,437 ---- _CharacterId = (CharacterEntity.Identifier)iDBController.findCharacterByUCSCode (_UCS); } ! else if (lCurReading != null) { ! lCurReading.sourceReading = lCurEvent.asCharacters().getData(); ! _Readings.add(lCurReading); ! ! if (lCurReadingGroup != null) ! { ! if (lCurReadingGroup.length() > 0) ! lCurReadingGroup.append(", "); ! lCurReadingGroup.append(lCurReading.sourceReading); ! } } else if (lCurMeaning != null) { lCurMeaning._meaning = lCurEvent.asCharacters().getData(); ! if (lCurReadingMeaningGroup != null) ! lCurReadingMeaningGroup.meanings.set(lCurMeaning._lang, new CharacterEntity.Reading.Meaning(lCurMeaning._meaning)); ! else ! _Meanings.add(lCurMeaning); } else if (lJLPT) |
|
From: Benoit C. <ben...@us...> - 2009-05-24 23:11:40
|
Update of /cvsroot/taka/takaglyphedit/org/takadb/editor/shell In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7317/org/takadb/editor/shell Modified Files: UIEditorCharacterPanel.java UIEditorWindow.java Log Message: small changes to presentation and how meanings are exported Index: UIEditorCharacterPanel.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIEditorCharacterPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** UIEditorCharacterPanel.java 5 Oct 2008 22:18:59 -0000 1.6 --- UIEditorCharacterPanel.java 24 May 2009 23:11:31 -0000 1.7 *************** *** 199,203 **** egbc.fill = GridBagConstraints.HORIZONTAL; ! egbc.insets = new Insets (5, 5, 5, 5); egbc.gridwidth = 1; egbc.gridheight = 1; egbc.weightx = 1; egbc.weighty = 1; --- 199,203 ---- egbc.fill = GridBagConstraints.HORIZONTAL; ! egbc.insets = new Insets (2, 2, 2, 2); egbc.gridwidth = 1; egbc.gridheight = 1; egbc.weightx = 1; egbc.weighty = 1; *************** *** 286,290 **** elementsPanel.add (ucsHeaderLabel); ! egbc.gridx = 1; egbc.gridy = 3; egbc.gridwidth = 1; egbc.gridheight = 1; UtilSyncUnicodeCharTextField jaUCSCodeTextField = new UtilSyncUnicodeCharTextField (thisCharacter, "jaUcsCode"); jaUCSCodeTextField.addChangeListener (this); --- 286,290 ---- elementsPanel.add (ucsHeaderLabel); ! egbc.gridx = 1; egbc.gridy = 3; egbc.gridwidth = 2; egbc.gridheight = 1; UtilSyncUnicodeCharTextField jaUCSCodeTextField = new UtilSyncUnicodeCharTextField (thisCharacter, "jaUcsCode"); jaUCSCodeTextField.addChangeListener (this); Index: UIEditorWindow.java =================================================================== RCS file: /cvsroot/taka/takaglyphedit/org/takadb/editor/shell/UIEditorWindow.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** UIEditorWindow.java 15 Mar 2009 22:02:36 -0000 1.24 --- UIEditorWindow.java 24 May 2009 23:11:31 -0000 1.25 *************** *** 463,469 **** public void actionPerformed(ActionEvent e) { System.out.println("Starting UCS-JIS validation..."); for (CharacterEntity ce : dbcontroller.getAllCharacters()) { - int expectedJIS = unicodeToJis(ce.jaUcsCode); int actualJIS = ce.jaJisCode; if (expectedJIS < 0) { System.out.println("Character #" + ce.characterId + ", UCS 0x" + --- 463,486 ---- public void actionPerformed(ActionEvent e) { System.out.println("Starting UCS-JIS validation..."); + + HashMap<Integer,Integer> jisMap = new HashMap<Integer,Integer>(); + HashMap<Integer,Integer> ucsMap = new HashMap<Integer,Integer>(); for (CharacterEntity ce : dbcontroller.getAllCharacters()) { int actualJIS = ce.jaJisCode; + int actualUCS = ce.jaUcsCode; + + if (jisMap.get(actualJIS) != null) { + System.out.println("Character #" + jisMap.get(actualJIS) + " & " + ce.characterId + + ": duplicated JIS code."); + } + jisMap.put(actualJIS, ce.characterId); + + if (ucsMap.get(actualUCS) != null) { + System.out.println("Character #" + ucsMap.get(actualUCS) + " & " + ce.characterId + + ": duplicated UCS code."); + } + ucsMap.put(actualUCS, ce.characterId); + + int expectedJIS = unicodeToJis(ce.jaUcsCode); if (expectedJIS < 0) { System.out.println("Character #" + ce.characterId + ", UCS 0x" + |
43 messages has been excluded from this view by a project administrator.
