Modified:
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/api/SKOSScheme.java
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/api/impl/elmo/SKOSSchemeImpl.java
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/KEAModelGenerator.java
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/KEATagger.java
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/MauiModelGenerator.java
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/MauiTagger.java
/branches/hive-gwt-upgrade/hive-core/src/kea/vocab/VocabularyH2.java
/branches/hive-gwt-upgrade/hive-core/src/maui/main/MauiTopicExtractor.java
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/api/SKOSScheme.java
Fri Nov 18 17:26:28 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/api/SKOSScheme.java
Fri Dec 16 11:16:43 2011
@@ -87,6 +87,7 @@
public void close() throws Exception;
public List<AutocompleteTerm> suggestTermsFor(String str, int numTerms)
throws Exception;
public HiveVocabulary getHiveVocabulary();
- public String getStemmerClass();
+ public String getKeaStemmerClass();
+ public String getMauiStemmerClass();
}
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/api/impl/elmo/SKOSSchemeImpl.java
Fri Nov 18 17:26:28 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/api/impl/elmo/SKOSSchemeImpl.java
Fri Dec 16 11:16:43 2011
@@ -120,8 +120,11 @@
/* Autocomplete index path */
private String autocompletePath;
- /* Stemmer class name */
- private String stemmerClass;
+ /* KEA stemmer class name */
+ private String keaStemmerClass;
+
+ /* Maui stemmer class name */
+ private String mauiStemmerClass;
private HiveVocabulary hiveVocab;
@@ -253,11 +256,17 @@
if (autocompletePath == null || autocompletePath.isEmpty())
logger.warn("autocomplete property is empty");
- // Stemmer class
- this.stemmerClass =
properties.getProperty("stemmerClass", "kea.stemmer.PorterStemmer");
- System.out.println("Using stemmer " + stemmerClass);
- if (stemmerClass == null || stemmerClass.isEmpty())
- logger.warn("stemmerClass property is empty, defaulting to
kea.stemer.PorterStemmer");
+ // kea stemmer class
+ this.keaStemmerClass =
properties.getProperty("keaStemmerClass", "kea.stemmer.PorterStemmer");
+ System.out.println("Using kea stemmer " + keaStemmerClass);
+ if (keaStemmerClass == null || keaStemmerClass.isEmpty())
+ logger.warn("keaStemmerClass property is empty, defaulting to
kea.stemer.PorterStemmer");
+
+ // maui stemmer class
+ this.mauiStemmerClass =
properties.getProperty("mauiStemmerClass", "maui.stemmer.PorterStemmer");
+ System.out.println("Using maui stemmer " + mauiStemmerClass);
+ if (mauiStemmerClass == null || mauiStemmerClass.isEmpty())
+ logger.warn("mauiStemmerClass property is empty, defaulting to
maui.stemer.PorterStemmer");
fis.close();
@@ -504,8 +513,15 @@
}
@Override
- public String getStemmerClass()
- {
- return stemmerClass;
+ public String getKeaStemmerClass()
+ {
+ return keaStemmerClass;
+ }
+
+
+ @Override
+ public String getMauiStemmerClass()
+ {
+ return mauiStemmerClass;
}
}
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/KEAModelGenerator.java
Sun Aug 21 09:13:19 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/KEAModelGenerator.java
Fri Dec 16 11:16:43 2011
@@ -76,7 +76,7 @@
String modelPath = schema.getKEAModelPath();
String vocabularyPath = schema.getRdfPath();
String stopwordsPath = schema.getStopwordsPath();
- String stemmerClass = schema.getStemmerClass();
+ String stemmerClass = schema.getKeaStemmerClass();
this.km = new KEAModelBuilder(schema);
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/KEATagger.java
Sun Aug 21 09:00:11 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/KEATagger.java
Fri Dec 16 11:16:43 2011
@@ -89,7 +89,7 @@
// NoStemmer)
//this.ke.setStemmer(new PorterStemmer());
- String stemmerClass = schema.getStemmerClass();
+ String stemmerClass = schema.getKeaStemmerClass();
try
{
Class cls = Class.forName(stemmerClass);
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/MauiModelGenerator.java
Tue Dec 6 14:51:21 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/MauiModelGenerator.java
Fri Dec 16 11:16:43 2011
@@ -76,7 +76,7 @@
String modelPath = schema.getMauiModelPath();
// String vocabularyPath = schema.getRdfPath();
String stopwordsPath = schema.getStopwordsPath();
- String stemmerClass = schema.getStemmerClass();
+ String stemmerClass = schema.getMauiStemmerClass();
this.mm = new MauiModelBuilder();
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/MauiTagger.java
Fri Nov 18 17:29:34 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/edu/unc/ils/mrc/hive/ir/tagging/MauiTagger.java
Fri Dec 16 11:16:43 2011
@@ -57,7 +57,7 @@
this.te.setVocabularyFormat("skos");
this.te.setDocumentEncoding("UTF-8");
this.te.setDocumentLanguage("en"); // es for Spanish, fr for French
- String stemmerClass = schema.getStemmerClass();
+ String stemmerClass = schema.getMauiStemmerClass();
try
{
Class cls = Class.forName(stemmerClass);
@@ -78,6 +78,7 @@
}
this.te.loadThesaurus(this.te.getStemmer(), this.te.getStopwords(),
schema.getH2Path());
+ //this.te.loadThesaurus(this.te.getStemmer(), this.te.getStopwords(),
schema.getRdfPath());
}
/**
=======================================
--- /branches/hive-gwt-upgrade/hive-core/src/kea/vocab/VocabularyH2.java
Sun Aug 21 09:05:16 2011
+++ /branches/hive-gwt-upgrade/hive-core/src/kea/vocab/VocabularyH2.java
Fri Dec 16 11:16:43 2011
@@ -109,7 +109,7 @@
try
{
- Class cls = Class.forName(scheme.getStemmerClass());
+ Class cls = Class.forName(scheme.getKeaStemmerClass());
Stemmer stemmer = (Stemmer)cls.newInstance();
setStemmer(stemmer);
} catch (Exception e) {
=======================================
---
/branches/hive-gwt-upgrade/hive-core/src/maui/main/MauiTopicExtractor.java
Fri Nov 18 17:30:24 2011
+++
/branches/hive-gwt-upgrade/hive-core/src/maui/main/MauiTopicExtractor.java
Fri Dec 16 11:16:43 2011
@@ -425,6 +425,7 @@
if (debugMode) {
System.err.println("--- Loading the vocabulary...");
}
+ //vocabulary = new VocabularyJena(vocabularyName, vocabularyFormat,
vocabularyDirectory);
vocabulary = new VocabularyH2(vocabularyName, vocabularyFormat,
vocabularyDirectory);
vocabulary.setStemmer(st);
vocabulary.setStopwords(sw);