cvs commit: xml-xindice/java/src/org/apache/xindice/core/indexer IndexManager.java

vgritsenko    2004/02/11 06:00:33

  Modified:    java/src/org/apache/xindice/core Collection.java
               java/src/org/apache/xindice/core/indexer IndexManager.java
  Log:
  Exception handling: processChildren() catches all exceptions, no need to do 
this again.
  Propagate DBException from getSymbols (it does not throw any right now) in 
IndexManager
  constructor.
  
  Revision  Changes    Path
  1.47      +3 -3      
xml-xindice/java/src/org/apache/xindice/core/Collection.java
  
  Index: Collection.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/Collection.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Collection.java   8 Feb 2004 02:51:06 -0000       1.46
  +++ Collection.java   11 Feb 2004 14:00:32 -0000      1.47
  @@ -1454,7 +1454,7 @@
                   indexManager.setConfig(idxConfig);
               } catch (Exception e) {
                   if (log.isWarnEnabled()) {
  -                    log.warn("ignored exception", e);
  +                    log.warn("Failed to initialize indexer", e);
                   }
               }
           }
  
  
  
  1.27      +15 -29    
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java
  
  Index: IndexManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- IndexManager.java 8 Feb 2004 02:50:21 -0000       1.26
  +++ IndexManager.java 11 Feb 2004 14:00:33 -0000      1.27
  @@ -20,22 +20,19 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.apache.xindice.Stopwatch;
   import org.apache.xindice.core.Collection;
   import org.apache.xindice.core.DBException;
   import org.apache.xindice.core.data.Key;
  -import org.apache.xindice.core.data.Record;
   import org.apache.xindice.core.data.RecordSet;
   import org.apache.xindice.util.Configuration;
   import org.apache.xindice.util.ConfigurationCallback;
   import org.apache.xindice.util.ObjectStack;
   import org.apache.xindice.util.SimpleConfigurable;
   import org.apache.xindice.util.XindiceException;
  -import org.apache.xindice.xml.NodeSource;
   import org.apache.xindice.xml.SymbolTable;
  -import org.apache.xindice.xml.dom.DocumentImpl;
   import org.apache.xindice.xml.sax.CompressionHandler;
   import org.apache.xindice.xml.sax.SAXEventGenerator;
  -import org.apache.xindice.Stopwatch;
   
   import org.w3c.dom.Document;
   import org.xml.sax.Attributes;
  @@ -88,38 +85,27 @@
       private SymbolTable symbols;
       private List newIndexers = new ArrayList(); // of IndexerInfo
   
  -    public IndexManager(Collection collection) {
  +
  +    public IndexManager(Collection collection) throws DBException {
           this.collection = collection;
  -        try {
  -            symbols = collection.getSymbols();
  -        } catch (Exception e) {
  -            if (log.isWarnEnabled()) {
  -                log.warn("ignored exception", e);
  -            }
  -        }
  +        this.symbols = collection.getSymbols();
       }
   
       public void setConfig(Configuration config) throws XindiceException {
           super.setConfig(config);
   
  -        try {
  -            config.processChildren(INDEX, new ConfigurationCallback() {
  -                public void process(Configuration cfg) {
  -                    String className = cfg.getAttribute(CLASS);
  -                    try {
  -                        register(Class.forName(className), cfg);
  -                    } catch (Exception e) {
  -                        if (log.isWarnEnabled()) {
  -                            log.warn("ignored exception", e);
  -                        }
  +        config.processChildren(INDEX, new ConfigurationCallback() {
  +            public void process(Configuration cfg) {
  +                String className = cfg.getAttribute(CLASS);
  +                try {
  +                    register(Class.forName(className), cfg);
  +                } catch (Exception e) {
  +                    if (log.isWarnEnabled()) {
  +                        log.warn("Failed to register index with class '" + 
className + "'", e);
                       }
                   }
  -            });
  -        } catch (Exception e) {
  -            if (log.isWarnEnabled()) {
  -                log.warn("setConfig", e);
               }
  -        }
  +        });
       }
   
       /**