From 5f3ee8aa078a1870f9439773db2253948c2051d7 Mon Sep 17 00:00:00 2001
From: anupsawant <anupsawant@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 30 Jun 2011 12:10:16 +0000
Subject: [PATCH] r 8364 changes to exclude check on betamap

---
 .../vitro/webapp/search/solr/SolrIndexer.java | 42 ++++++++++---------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
index b8dfea16a..b32a08b05 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrIndexer.java
@@ -177,32 +177,21 @@ public class SolrIndexer implements IndexerIface {
         }
     }
    
-    
     @Override
     public synchronized void endIndexing() {
         try {
-            UpdateResponse res = server.commit();
-            log.debug("Response after committing to server: "+ res );
-         } catch (SolrServerException e) {
-             log.error("Could not commit to solr server", e);
-         } catch(IOException e){
-             log.error("Could not commit to solr server", e);
-         }finally{
-             if(!individualToSolrDoc.documentModifiers.isEmpty()){
-                 if(individualToSolrDoc.documentModifiers.get(0) instanceof CalculateParameters){
-                     CalculateParameters c = (CalculateParameters) individualToSolrDoc.documentModifiers.get(0);
-                     c.clearMap();
-                     log.info("BetaMap cleared");
-                 }
-             }
-         }
-        
+           UpdateResponse res = server.commit();
+           log.debug("Response after committing to server: "+ res );
+        } catch (SolrServerException e) {
+            log.error("Could not commit to solr server", e);
+        } catch(IOException e){
+        	log.error("Could not commit to solr server", e);
+        }
         try {
             server.optimize();
         } catch (Exception e) {
             log.error("Could not optimize solr server", e);
         }
-        
         indexing = false;
         notifyAll();
     }
@@ -230,8 +219,23 @@ public class SolrIndexer implements IndexerIface {
     }
 
     public boolean isIndexEmpty() {
-        // TODO Auto-generated method stub
+    	SolrQuery query = new SolrQuery();
+    	query.setQuery("*:*");
+    	try {
+    		QueryResponse rsp = server.query(query);
+    		SolrDocumentList docs = rsp.getResults();
+    		if(docs==null || docs.size()==0){
+    			return true;
+    		}
+    	} catch (SolrServerException e) {
+    		// TODO Auto-generated catch block
+    		log.error(e,e);
+    	}
         return false;
     }
 
+    
+   
+   
+
 }