clean up

zhuang · Jan 13, 2011 · 9122026 · 9122026
1 parent 37d85ca
commit 9122026
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/contrib/solr/java/proj/zoie/solr/ZoieSystemHome.java b/contrib/solr/java/proj/zoie/solr/ZoieSystemHome.java
@@ -23,7 +23,8 @@
 
 import proj.zoie.api.DefaultZoieVersion;
 import proj.zoie.api.ZoieException;
-import proj.zoie.api.impl.DefaultZoieVersionFactory;
+import proj.zoie.api.DefaultZoieVersion.DefaultZoieVersionFactory;
+import proj.zoie.impl.indexing.ZoieConfig;
 import proj.zoie.impl.indexing.DefaultIndexReaderDecorator;
 import proj.zoie.impl.indexing.ZoieSystem;
 import proj.zoie.mbean.ZoieSystemAdmin;
@@ -61,8 +62,12 @@ private ZoieSystemHome(SolrCore core){
 		long batchDelay = config.getInt("zoie.batchDelay",300000);
 		boolean realtime = config.getBool("zoie.realtime", true);
 
+		ZoieConfig<DefaultZoieVersion> zoieConfig = new ZoieConfig<DefaultZoieVersion>(new DefaultZoieVersionFactory());
+		zoieConfig.setBatchSize(batchSize);
+		zoieConfig.setBatchDelay(batchDelay);
+		zoieConfig.setRtIndexing(realtime);
 
-		_zoieSystem = new ZoieSystem<IndexReader,DocumentWithID, DefaultZoieVersion>(idxFile,new ZoieSolrIndexableInterpreter(),new DefaultIndexReaderDecorator(),analyzer,similarity,batchSize,batchDelay,realtime, new DefaultZoieVersionFactory());
+		_zoieSystem = new ZoieSystem<IndexReader,DocumentWithID, DefaultZoieVersion>(idxFile,new ZoieSolrIndexableInterpreter(),new DefaultIndexReaderDecorator(),zoieConfig);
 
 		log.info("Zoie System loaded with: ");
 		log.info("zoie.batchSize: "+batchSize);

diff --git a/contrib/solr/java/proj/zoie/solr/ZoieUpdateHandler.java b/contrib/solr/java/proj/zoie/solr/ZoieUpdateHandler.java
@@ -48,7 +48,10 @@ public ZoieUpdateHandler(SolrCore core) {
 		super(core);
 		_core = core;
 
-		_autocommit = core.getSolrConfig().getBool("zoie.autocommit", true);
+		// _autocommit = core.getSolrConfig().getBool("zoie.autocommit", true);
+
+		// this should NOT be enabled until Solr stops caching searchers
+		_autocommit = false;
 	}
 
 	@Override

diff --git a/java/proj/zoie/api/impl/DefaultZoieVersionFactory.java b/java/proj/zoie/api/impl/DefaultZoieVersionFactory.java