XML Export(KWIC)で例外が出ていたのを修正.
trunk/ChaKi.NET/src/CreateAssemblyInfo.vbs (diff) trunk/ChaKi.NET/src/Entity/Corpora/HeadInfo.cs (diff) trunk/ChaKi.NET/src/Entity/Corpora/Word.cs (diff) trunk/ChaKi.NET/src/ImportWordRelation/Properties/AssemblyInfo.cs (diff) trunk/ChaKi.NET/src/Service/Export/ExportServiceXml.cs (diff) trunk/ChaKi.NET/src/Setup/Setup/Setup.vdproj (diff) trunk/ChaKi.NET/src/Setup/Setup64/Setup64.vdproj (diff) trunk/ChaKi.NET/src/Text2Corpus/Properties/AssemblyInfo.cs (diff) trunk/ChaKi.NET/src/Timings/Properties/AssemblyInfo.cs (diff)| @@ -130,7 +130,7 @@ | ||
| 130 | 130 | lastVersionStr = objStream.ReadLine() |
| 131 | 131 | objStream.Close |
| 132 | 132 | |
| 133 | -If lastVersionStr <> versionStr Then | |
| 133 | +If true Then | |
| 134 | 134 | MsgBox "Updating AssemblyInfo's : " + versionStr |
| 135 | 135 | ' AssemblyInfo.csを生成 |
| 136 | 136 | For Each info in AssemblyList |
| @@ -10,5 +10,6 @@ | ||
| 10 | 10 | None = 0, |
| 11 | 11 | Independent = 1, |
| 12 | 12 | Ancillary = 2, |
| 13 | + Reserved = 3, | |
| 13 | 14 | } |
| 14 | 15 | } |
| @@ -108,6 +108,7 @@ | ||
| 108 | 108 | set { headInfo = value; } |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | + [XmlIgnore] | |
| 111 | 112 | // word_word table mapping (but not defined in Word.hbm.xml) |
| 112 | 113 | public virtual Iesi.Collections.Generic.ISet<int> MappedTo |
| 113 | 114 | { |
| @@ -126,6 +127,8 @@ | ||
| 126 | 127 | get { return lexeme; } |
| 127 | 128 | set { lexeme = value; } |
| 128 | 129 | } |
| 130 | + | |
| 131 | + [XmlIgnore] | |
| 129 | 132 | public virtual Segment Bunsetsu |
| 130 | 133 | { |
| 131 | 134 | get { return bunsetsu; } |
| @@ -12,5 +12,5 @@ | ||
| 12 | 12 | [assembly: AssemblyCulture("")] |
| 13 | 13 | [assembly: ComVisible(false)] |
| 14 | 14 | [assembly: Guid("6a95808a-d1e3-47de-bb62-7ed7a281ac0b")] |
| 15 | -[assembly: AssemblyVersion("3.16.651.0")] | |
| 16 | -[assembly: AssemblyFileVersion("3.16.651.0")] | |
| 15 | +[assembly: AssemblyVersion("3.14.652.0")] | |
| 16 | +[assembly: AssemblyFileVersion("3.14.652.0")] |
| @@ -1,4 +1,5 @@ | ||
| 1 | 1 | using System; |
| 2 | +using System.Linq; | |
| 2 | 3 | using System.Collections.Generic; |
| 3 | 4 | using System.Text; |
| 4 | 5 | using ChaKi.Entity.Corpora; |
| @@ -27,8 +28,36 @@ | ||
| 27 | 28 | { |
| 28 | 29 | throw new Exception(string.Format("Sentence not found. Corpus={0}, senID={1}", ki.Crps.Name, ki.SenID)); |
| 29 | 30 | } |
| 30 | - XmlSerializer ser = new XmlSerializer(typeof(Sentence)); | |
| 31 | - ser.Serialize(m_XmlWriter, sen); | |
| 31 | + var sen2 = new SentenceWrapped() { Sen = sen }; | |
| 32 | + XmlSerializer ser = new XmlSerializer(typeof(SentenceWrapped)); | |
| 33 | + ser.Serialize(m_XmlWriter, sen2); | |
| 32 | 34 | } |
| 35 | + | |
| 36 | + | |
| 37 | + // Sentence型をSerializeするための内部型 | |
| 38 | + // KWIC Export専用なので文節情報は出力しない. | |
| 39 | + [XmlInclude(typeof(Word))] | |
| 40 | + [XmlRoot("Sentence")] | |
| 41 | + public class SentenceWrapped | |
| 42 | + { | |
| 43 | + public SentenceWrapped() { } | |
| 44 | + | |
| 45 | + private Sentence m_Sen; | |
| 46 | + [XmlIgnore] | |
| 47 | + public Sentence Sen | |
| 48 | + { | |
| 49 | + set { | |
| 50 | + m_Sen = value; | |
| 51 | + this.Words = m_Sen.GetWords(0).ToList(); | |
| 52 | + } | |
| 53 | + } | |
| 54 | + | |
| 55 | + public int ID => m_Sen?.ID??-1; | |
| 56 | + | |
| 57 | + public List<Word> Words { get; private set; } | |
| 58 | + public int StartChar => m_Sen?.StartChar ?? -1; | |
| 59 | + public int EndChar => m_Sen?.EndChar ?? -1; | |
| 60 | + public int Pos => m_Sen?.Pos ?? -1; | |
| 61 | + } | |
| 33 | 62 | } |
| 34 | 63 | } |
| @@ -12,5 +12,5 @@ | ||
| 12 | 12 | [assembly: AssemblyCulture("")] |
| 13 | 13 | [assembly: ComVisible(false)] |
| 14 | 14 | [assembly: Guid("a8cf8403-eb88-418f-bf54-56aeaef39268")] |
| 15 | -[assembly: AssemblyVersion("3.16.651.0")] | |
| 16 | -[assembly: AssemblyFileVersion("3.16.651.0")] | |
| 15 | +[assembly: AssemblyVersion("3.14.652.0")] | |
| 16 | +[assembly: AssemblyFileVersion("3.14.652.0")] |
| @@ -12,5 +12,5 @@ | ||
| 12 | 12 | [assembly: AssemblyCulture("")] |
| 13 | 13 | [assembly: ComVisible(false)] |
| 14 | 14 | [assembly: Guid("ff6652ed-b932-466b-944b-ce88d698979b")] |
| 15 | -[assembly: AssemblyVersion("3.16.651.0")] | |
| 16 | -[assembly: AssemblyFileVersion("3.16.651.0")] | |
| 15 | +[assembly: AssemblyVersion("3.14.652.0")] | |
| 16 | +[assembly: AssemblyFileVersion("3.14.652.0")] |
