From 8864141872713ce9900d7d4e7d53deec705c6b4b Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Wed, 9 May 2012 17:00:56 +0200
Subject: [PATCH] more abstraction in solr connection classes

---
 htroot/IndexFederated_p.java                  |  4 +--
 source/net/yacy/search/Switchboard.java       |  8 +++---
 ...SolrScheme.java => SolrConfiguration.java} |  6 ++---
 .../de/Freizeitaktivitäten.vocabulary       | 27 -------------------
 4 files changed, 9 insertions(+), 36 deletions(-)
 rename source/net/yacy/search/index/{SolrScheme.java => SolrConfiguration.java} (99%)
 delete mode 100644 vocabularies/de/Freizeitaktivitäten.vocabulary

diff --git a/htroot/IndexFederated_p.java b/htroot/IndexFederated_p.java
index 2d35e9855..ce0f8a33b 100644
--- a/htroot/IndexFederated_p.java
+++ b/htroot/IndexFederated_p.java
@@ -40,7 +40,7 @@ import net.yacy.kelondro.logging.Log;
 import net.yacy.search.Switchboard;
 import net.yacy.search.index.Segments;
 import net.yacy.search.index.SolrField;
-import net.yacy.search.index.SolrScheme;
+import net.yacy.search.index.SolrConfiguration;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 
@@ -87,7 +87,7 @@ public class IndexFederated_p {
                 sb.indexSegments.segment(Segments.Process.LOCALCRAWLING).connectSolr(null);
             }
 
-            final SolrScheme scheme = new SolrScheme(new File(env.getDataPath(), "DATA/SETTINGS/" + schemename));
+            final SolrConfiguration scheme = new SolrConfiguration(new File(env.getDataPath(), "DATA/SETTINGS/" + schemename));
 
             if (solrIsOnAfterwards) {
                 // switch on
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index c94013065..b3b52a934 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -141,7 +141,7 @@ import net.yacy.repository.FilterEngine;
 import net.yacy.repository.LoaderDispatcher;
 import net.yacy.search.index.Segment;
 import net.yacy.search.index.Segments;
-import net.yacy.search.index.SolrScheme;
+import net.yacy.search.index.SolrConfiguration;
 import net.yacy.search.query.AccessTracker;
 import net.yacy.search.query.QueryParams;
 import net.yacy.search.query.SearchEvent;
@@ -242,7 +242,7 @@ public final class Switchboard extends serverSwitch
     public SeedDB peers;
     public WorkTables tables;
     public Tray tray;
-    public SolrScheme solrScheme;
+    public SolrConfiguration solrScheme;
 
     public WorkflowProcessor<indexingQueueEntry> indexingDocumentProcessor;
     public WorkflowProcessor<indexingQueueEntry> indexingCondensementProcessor;
@@ -640,8 +640,8 @@ public final class Switchboard extends serverSwitch
         if ( !solrWorkProfile.exists() ) {
             FileUtils.copy(solrBackupProfile, solrWorkProfile);
         }
-        final SolrScheme backupScheme = new SolrScheme(solrBackupProfile);
-        this.solrScheme = new SolrScheme(solrWorkProfile);
+        final SolrConfiguration backupScheme = new SolrConfiguration(solrBackupProfile);
+        this.solrScheme = new SolrConfiguration(solrWorkProfile);
 
         // update the working scheme with the backup scheme. This is necessary to include new features.
         // new features are always activated by default
diff --git a/source/net/yacy/search/index/SolrScheme.java b/source/net/yacy/search/index/SolrConfiguration.java
similarity index 99%
rename from source/net/yacy/search/index/SolrScheme.java
rename to source/net/yacy/search/index/SolrConfiguration.java
index 4c2b30bee..545c413db 100644
--- a/source/net/yacy/search/index/SolrScheme.java
+++ b/source/net/yacy/search/index/SolrConfiguration.java
@@ -50,13 +50,13 @@ import net.yacy.kelondro.logging.Log;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrInputDocument;
 
-public class SolrScheme extends ConfigurationSet {
+public class SolrConfiguration extends ConfigurationSet {
 
     /**
      * initialize with an empty ConfigurationSet which will cause that all the index
      * attributes are used
      */
-    public SolrScheme() {
+    public SolrConfiguration() {
         super();
     }
 
@@ -65,7 +65,7 @@ public class SolrScheme extends ConfigurationSet {
      * the configuration file simply contains a list of lines with keywords
      * @param configurationFile
      */
-    public SolrScheme(final File configurationFile) {
+    public SolrConfiguration(final File configurationFile) {
         super(configurationFile);
         // check consistency: compare with YaCyField enum
         for (String name: this) {
diff --git a/vocabularies/de/Freizeitaktivitäten.vocabulary b/vocabularies/de/Freizeitaktivitäten.vocabulary
deleted file mode 100644
index d26af3e8a..000000000
--- a/vocabularies/de/Freizeitaktivitäten.vocabulary
+++ /dev/null
@@ -1,27 +0,0 @@
-Eislaufen
-Drachensteigen
-Saunabaden=Sauna
-Spazieren und Wandern=Spazieren,Wandern,Park,Ufer
-Skaten=Inline,Inliner
-Skateboarden=Skateboard
-Museumsbesuch=Museum
-Altstadtbesuch=Altstadt
-Parkbesuch=Park,Zoo,Freilichtmuseum,Burg
-Ausflug=Schifstouren,Schifffahrt,Aussicht,Aussichtspunkt,Geocaching
-Schwimmen=Schwimmbad,Freibad,Hallenbad,Schwimmbäder,Freibäder,Hallenbäder,Therme
-Fastnacht
-Eislaufen
-Saunabaden=Sauna
-Theater=Bühnen
-Oper=Operette,Opernhaus
-Spielplätze=Spielplatz
-Museum
-Camping
-Picknick=Picknicken
-Essen und Trinken=Essen,Trinken,Bar,Restaurant,Kneipe
-Kochen
-Singen=Gesang,Chor
-Kegeln
-Bowling
-Kartbahn=Kart
-Kino=Kinoprogramm,Cine
\ No newline at end of file