[Mulgara-svn] r1779 - trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene

[pag at mulgara.org]

Author: pag
Date: 2009-08-19 22:09:53 -0700 (Wed, 19 Aug 2009)
New Revision: 1779

Modified:
   trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java
Log:
Removed exception chains for FullTextStringIndexExceptions as these may not be instantiated at the client side.

Modified: trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java
===================================================================
--- trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java	2009-08-17 21:53:10 UTC (rev 1778)
+++ trunk/src/jar/resolver-lucene/java/org/mulgara/resolver/lucene/LuceneResolver.java	2009-08-20 05:09:53 UTC (rev 1779)
@@ -263,7 +263,7 @@
           } catch (org.mulgara.util.conversion.html.ParseException e) {
             throw new ResolverException("Couldn't parse content of " + resource, e);
           } catch (FullTextStringIndexException e) {
-            throw new ResolverException("Unable to modify full text index", e);
+            throw new ResolverException("Unable to modify full text index:" + e);
           }
         } else if (objectNode instanceof Literal) {
           Literal objectLiteral = (Literal) objectNode;
@@ -292,7 +292,7 @@
             }
           } catch (FullTextStringIndexException e) {
             throw new ResolverException("Unable to " + (occurs ? "add" : "delete") + "'" +
-                                        literal + "' to full text string index", e);
+                                        literal + "' to full text string index\n" + e);
           }
         } else {
           if (logger.isInfoEnabled()) {
@@ -307,7 +307,7 @@
     } catch (IOException ioe) {
       throw new ResolverException("Failed to open string index", ioe);
     } catch (FullTextStringIndexException ef) {
-      throw new ResolverException("Error in string index", ef);
+      throw new ResolverException("Error in string index: " + ef);
     }
   }
 
@@ -324,7 +324,7 @@
     } catch (IOException ioe) {
       throw new ResolverException("Failed to open string index", ioe);
     } catch (FullTextStringIndexException ef) {
-      throw new ResolverException("Query failed against string index", ef);
+      throw new ResolverException("Query failed against string index: " + ef);
     }
   }
 
@@ -361,7 +361,7 @@
     } catch (IOException ioe) {
       throw new QueryException("Failed to open string index", ioe);
     } catch (FullTextStringIndexException ef) {
-      throw new QueryException("Query failed against string index", ef);
+      throw new QueryException("Query failed against string index: " + ef);
     } catch (TuplesException te) {
       throw new QueryException("Failed to query string index", te);
     }
@@ -456,7 +456,15 @@
 
     protected void doStart(LuceneTxInfo tx, int flags, boolean isNew) {
       currentIndexes.set(tx.indexes);
+      boolean newIndexReference = resolver.indexes == null;
       resolver.indexes = tx.indexes.values();
+      if (newIndexReference) {
+        try {
+          for (FullTextStringIndex index: resolver.indexes) index.optimize();
+        } catch (FullTextStringIndexException e) {
+          logger.error("Unable to optimize the Lucene indexes", e);
+        }
+      }
     }
 
     protected void doEnd(LuceneTxInfo tx, int flags) {