Update of /var/cvs/contributions/lucene/src/org/mmbase/module/lucene
In directory james.mmbase.org:/tmp/cvs-serv5816/src/org/mmbase/module/lucene

Modified Files:
        Indexer.java Lucene.java 
Log Message:
conventions only


See also: 
http://cvs.mmbase.org/viewcvs/contributions/lucene/src/org/mmbase/module/lucene


Index: Indexer.java
===================================================================
RCS file: 
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Indexer.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Indexer.java        12 Feb 2009 12:34:11 -0000      1.63
+++ Indexer.java        30 Apr 2009 10:07:34 -0000      1.64
@@ -34,7 +34,7 @@
  *
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: Indexer.java,v 1.63 2009/02/12 12:34:11 michiel Exp $
+ * @version $Id: Indexer.java,v 1.64 2009/04/30 10:07:34 michiel Exp $
  **/
 public class Indexer {
 
@@ -43,7 +43,7 @@
     /**
      *  An empty index definition that can be used to obtain nodes from the 
cloud.
      */
-    protected static final MMBaseIndexDefinition nodeLoader = new 
MMBaseIndexDefinition();
+    static final MMBaseIndexDefinition nodeLoader = new 
MMBaseIndexDefinition();
 
     /**
      * @since MMBase-1.9
@@ -58,7 +58,9 @@
      * @since MMBase-1.9
      */
     public static void addField(Document document, Field field, Multiple 
multiple) {
-        if (multiple == null) multiple = Multiple.ADD;
+        if (multiple == null) { 
+          multiple = Multiple.ADD;
+        }
         switch(multiple) {
         case FIRST:
             if (document.get(field.name()) == null) {
@@ -184,7 +186,9 @@
     public Node getNode(Cloud userCloud, Document doc) {
         for (IndexDefinition id : queries) {
             Node n = id.getNode(userCloud, doc);
-            if (n != null) return n;
+            if (n != null) {
+              return n;
+            }
         }
         return nodeLoader.getNode(userCloud, doc);
     }
@@ -377,7 +381,13 @@
                     addError(ioe.getMessage());
                     log.error(ioe);
                 } finally {
-                    if (reader != null) try {reader.close(); } catch 
(IOException ioe) { log.error(ioe);}
+                    if (reader != null) {
+                      try {
+                        reader.close();
+                      } catch  (IOException ioe) {
+                        log.error(ioe);
+                      }
+                  }
                 }
                 if (mains.size() > 0) {
                     log.debug("Found lucene documents " + mains + " for node " 
+ number + " which must be updated now");


Index: Lucene.java
===================================================================
RCS file: 
/var/cvs/contributions/lucene/src/org/mmbase/module/lucene/Lucene.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- Lucene.java 4 Mar 2009 18:02:46 -0000       1.131
+++ Lucene.java 30 Apr 2009 10:07:34 -0000      1.132
@@ -17,7 +17,6 @@
 import javax.sql.DataSource;
 
 import org.mmbase.bridge.*;
-import org.mmbase.bridge.util.Queries;
 import org.mmbase.storage.search.*;
 import org.mmbase.cache.*;
 import org.mmbase.module.ReloadableModule;
@@ -31,12 +30,9 @@
 import org.mmbase.util.functions.*;
 import org.mmbase.util.logging.*;
 import 
org.mmbase.storage.implementation.database.DatabaseStorageManagerFactory;
-import org.mmbase.storage.StorageManagerFactory;
 
 import java.util.concurrent.*;
 
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.analysis.StopAnalyzer;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.queryParser.ParseException;
@@ -48,7 +44,7 @@
  *
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
- * @version $Id: Lucene.java,v 1.131 2009/03/04 18:02:46 sdeboer Exp $
+ * @version $Id: Lucene.java,v 1.132 2009/04/30 10:07:34 michiel Exp $
  **/
 public class Lucene extends ReloadableModule implements NodeEventListener, 
RelationEventListener, IdEventListener, AssignmentEvents.Listener {
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to