add options to reindex page

server/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java

@@ -1,5 +1,7 @@
 package org.zanata.action;
 
+import java.util.Collection;
+
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
@@ -17,6 +19,11 @@ public class ReindexActionBean
    @In
    ReindexAsyncBean reindexAsync;
 
+   public Collection<ReindexClassOptions> getClasses()
+   {
+      return reindexAsync.getReindexOptions();
+   }
+
    public boolean isReindexing()
    {
       return reindexAsync.isReindexing();

server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

@@ -1,5 +1,7 @@
 package org.zanata.action;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -45,6 +47,7 @@ public class ReindexAsyncBean
    private FullTextSession session;
 
    private Set<Class<?>> indexables = new HashSet<Class<?>>();
+   private HashMap<Class<?>, ReindexClassOptions> indexingOptions = new HashMap<Class<?>, ReindexClassOptions>();
 
    private boolean reindexing;
 
@@ -69,6 +72,16 @@ public void create()
       indexables.add(HTextFlowTarget.class);
       indexables.add(HGlossaryTerm.class);
       indexables.add(HGlossaryEntry.class);
+
+      for (Class<?> clazz : indexables)
+      {
+         indexingOptions.put(clazz, new ReindexClassOptions(clazz));
+      }
+   }
+
+   public Collection<ReindexClassOptions> getReindexOptions()
+   {
+      return indexingOptions.values();
    }
 
    /**
@@ -92,7 +105,10 @@ public void prepareReindex()
       objectCount = 0;
       for (Class<?> clazz : indexables)
       {
-         objectCount += (Integer) session.createCriteria(clazz).setProjection(Projections.rowCount()).list().get(0);
+         if (indexingOptions.get(clazz).isReindex())
+         {
+            objectCount += (Integer) session.createCriteria(clazz).setProjection(Projections.rowCount()).list().get(0);
+         }
       }
       objectProgress = 0;
    }
@@ -109,10 +125,31 @@ public void startReindex()
          throw new RuntimeException("startReindex() must not be called before prepareReindex()");
       }
 
-      // reindex all @Indexed entities
       for (Class<?> clazz : indexables)
       {
-         reindex(clazz);
+         if (indexingOptions.get(clazz).isPurge())
+         {
+            log.info("purging index for {0}", clazz);
+            session.purgeAll(clazz);
+         }
+      }
+
+      for (Class<?> clazz : indexables)
+      {
+         if (indexingOptions.get(clazz).isReindex())
+         {
+            log.info("reindexing {0}", clazz);
+            reindex(clazz);
+         }
+      }
+
+      for (Class<?> clazz : indexables)
+      {
+         if (indexingOptions.get(clazz).isOptimize())
+         {
+            log.info("optimizing {0}", clazz);
+            session.getSearchFactory().optimize(clazz);
+         }
       }
 
       if (objectCount != objectProgress)
@@ -135,11 +172,9 @@ private void reindex(Class<?> clazz)
       ScrollableResults results = null;
       try
       {
-         session.purgeAll(clazz);
-
          // TODO try this, see how it affects reindexing time:
          //session.flushToIndexes();
-         //session.getSearchFactory().optimize(clazz);
+//         session.getSearchFactory().optimize(clazz);
 
          session.setFlushMode(FlushMode.MANUAL);
          session.setCacheMode(CacheMode.IGNORE);
@@ -159,8 +194,6 @@ private void reindex(Class<?> clazz)
             }
          }
          session.flushToIndexes(); // apply changes to indexes
-         // TODO try this too, see how it affects reindexing time:
-         //session.getSearchFactory().optimize(clazz);
          session.clear(); // clear since the queue is processed
       }
       catch (Exception e)

server/zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java

@@ -0,0 +1,57 @@
+package org.zanata.action;
+
+/**
+ * Stores options for the lucene indexing
+ * 
+ * @author David Mason, damason@redhat.com
+ */
+public class ReindexClassOptions
+{
+   private Class<?> clazz;
+   private boolean purge = false;
+   private boolean reindex = false;
+   private boolean optimize = false;
+
+   public ReindexClassOptions(Class<?> indexableClass)
+   {
+      clazz = indexableClass;
+   }
+
+   public String getClassName()
+   {
+      return clazz.getSimpleName();
+   }
+
+   public boolean isPurge()
+   {
+      return purge;
+   }
+
+   public void setPurge(boolean shouldPurge)
+   {
+      this.purge = shouldPurge;
+   }
+
+   public boolean isReindex()
+   {
+      return reindex;
+   }
+
+   public void setReindex(boolean shouldReindex)
+   {
+      this.reindex = shouldReindex;
+   }
+
+   public boolean isOptimize()
+   {
+      return optimize;
+   }
+
+   public void setOptimize(boolean optimize)
+   {
+      this.optimize = optimize;
+   }
+
+
+
+}

server/zanata-war/src/main/webapp/admin/search.xhtml

@@ -13,7 +13,7 @@
     <ui:define name="center_content">
       <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
       <rich:panel>
-      <h1>#{messages['jsf.Search']}</h1>
+        <h1>#{messages['jsf.Search']}</h1>
 
         <!-- TODO reformat indentation, change button label id to match progress message id -->
         <a4j:form>
@@ -26,6 +26,27 @@
               <h:outputText rendered="#{reindexAction.reindexError}" escape="false">
                 <p>#{messages['jsf.search.reindex.PleaseReindex']}</p>
               </h:outputText>
+
+              <rich:dataTable id="classList" rows="#{reindexAction.classes.size}"
+                              value="#{reindexAction.classes.toArray()}" var="clazz">
+                <rich:column width="270px" sortBy="#{clazz.className}">
+                  <f:facet name="header">Class</f:facet>
+                  <h:outputText value="#{clazz.className}" />
+                </rich:column>
+                <rich:column width="auto" styleClass="centered">
+                  <f:facet name="header">Purge index</f:facet>
+                  <h:selectBooleanCheckbox value="#{clazz.purge}" />
+                </rich:column>
+                <rich:column width="auto" styleClass="centered">
+                  <f:facet name="header">Reindex</f:facet>
+                  <h:selectBooleanCheckbox value="#{clazz.reindex}" />
+                </rich:column>
+                <rich:column width="auto" styleClass="centered">
+                  <f:facet name="header">Optimize</f:facet>
+                  <h:selectBooleanCheckbox value="#{clazz.optimize}" />
+                </rich:column>
+              </rich:dataTable>
+
               <a4j:commandButton id="reindex"
                   value="#{messages['jsf.ReindexFullTextSearchDatabase']}"
                   action="#{reindexAction.reindexDatabase}"