From bd056ae6f51a109ddc70ec6f6a498fa6bcf3ce6d Mon Sep 17 00:00:00 2001 From: "alexander.a.kuznetsov" Date: Mon, 19 Oct 2009 16:54:10 +0000 Subject: [PATCH] fixing bug with russian morphology git-svn-id: https://russianmorphology.googlecode.com/svn/trunk@65 d817d54c-26ab-11de-abc9-2f7d1455ff7a --- .../apache/lucene/morphology/english/EnglishAnalayzer.java | 4 +++- .../lucene/morphology/analayzer/MorphlogyAnalayzer.java | 4 ++++ .../apache/lucene/morphology/russian/RussianAnalayzer.java | 2 +- .../lucene/morphology/russian/RussianLuceneMorphology.java | 2 +- .../apache/lucene/morphology/russian/RussianMorphology.java | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/english/src/main/java/org/apache/lucene/morphology/english/EnglishAnalayzer.java b/english/src/main/java/org/apache/lucene/morphology/english/EnglishAnalayzer.java index bbf5330..8f6098c 100644 --- a/english/src/main/java/org/apache/lucene/morphology/english/EnglishAnalayzer.java +++ b/english/src/main/java/org/apache/lucene/morphology/english/EnglishAnalayzer.java @@ -21,7 +21,9 @@ import java.io.IOException; public class EnglishAnalayzer extends MorphlogyAnalayzer { + public EnglishAnalayzer() throws IOException { - super(EnglishAnalayzer.class.getResourceAsStream("/org/apache/lucene/morphology/english/morph.info"), new EnglishLetterDecoderEncoder()); + super(new EnglishLuceneMorphology()); } + } \ No newline at end of file diff --git a/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyAnalayzer.java b/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyAnalayzer.java index fc6c750..2f35533 100644 --- a/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyAnalayzer.java +++ b/morph/src/main/java/org/apache/lucene/morphology/analayzer/MorphlogyAnalayzer.java @@ -31,6 +31,10 @@ import java.io.Reader; public class MorphlogyAnalayzer extends Analyzer { private LuceneMorphology luceneMorph; + public MorphlogyAnalayzer(LuceneMorphology luceneMorph) { + this.luceneMorph = luceneMorph; + } + public MorphlogyAnalayzer(String pathToMorph, LetterDecoderEncoder letterDecoderEncoder) throws IOException { luceneMorph = new LuceneMorphology(pathToMorph, letterDecoderEncoder); } diff --git a/russian/src/main/java/org/apache/lucene/morphology/russian/RussianAnalayzer.java b/russian/src/main/java/org/apache/lucene/morphology/russian/RussianAnalayzer.java index 2abbce7..2c68328 100644 --- a/russian/src/main/java/org/apache/lucene/morphology/russian/RussianAnalayzer.java +++ b/russian/src/main/java/org/apache/lucene/morphology/russian/RussianAnalayzer.java @@ -22,6 +22,6 @@ import java.io.IOException; public class RussianAnalayzer extends MorphlogyAnalayzer { public RussianAnalayzer() throws IOException { - super(RussianAnalayzer.class.getResourceAsStream("/org/apache/lucene/morphology/russian/morph.info"), new RussianLetterDecoderEncoder()); + super(new RussianLuceneMorphology()); } } diff --git a/russian/src/main/java/org/apache/lucene/morphology/russian/RussianLuceneMorphology.java b/russian/src/main/java/org/apache/lucene/morphology/russian/RussianLuceneMorphology.java index adeac54..9acb266 100644 --- a/russian/src/main/java/org/apache/lucene/morphology/russian/RussianLuceneMorphology.java +++ b/russian/src/main/java/org/apache/lucene/morphology/russian/RussianLuceneMorphology.java @@ -22,6 +22,6 @@ import java.io.IOException; public class RussianLuceneMorphology extends LuceneMorphology { public RussianLuceneMorphology() throws IOException { - super(RussianLuceneMorphology.class.getResourceAsStream("/org/apache/lucene/morphology/english/morph.info"), new RussianLetterDecoderEncoder()); + super(RussianLuceneMorphology.class.getResourceAsStream("/org/apache/lucene/morphology/russian/morph.info"), new RussianLetterDecoderEncoder()); } } \ No newline at end of file diff --git a/russian/src/main/java/org/apache/lucene/morphology/russian/RussianMorphology.java b/russian/src/main/java/org/apache/lucene/morphology/russian/RussianMorphology.java index 22b3762..3d47fcd 100644 --- a/russian/src/main/java/org/apache/lucene/morphology/russian/RussianMorphology.java +++ b/russian/src/main/java/org/apache/lucene/morphology/russian/RussianMorphology.java @@ -22,6 +22,6 @@ import java.io.IOException; public class RussianMorphology extends Morphology { public RussianMorphology() throws IOException { - super(RussianMorphology.class.getResourceAsStream("/org/apache/lucene/morphology/english/morph.info"), new RussianLetterDecoderEncoder()); + super(RussianMorphology.class.getResourceAsStream("/org/apache/lucene/morphology/russian/morph.info"), new RussianLetterDecoderEncoder()); } }