NUTCH-694 - Distributed Search Server fails

git-svn-id: https://svn.apache.org/repos/asf/lucene/nutch/trunk@746900 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 23, 2009 · f645351 · f645351
1 parent 186c716
commit f645351
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -351,6 +351,8 @@ Unreleased changes (1.0-dev)
 
 131. NUTCH-695 - incorrect mime type detection by MoreIndexingFilter plugin
      (Dmitry Lihachev via siren)
+
+132. NUTCH-694 - Distributed Search Server fails (siren)
 
 Release 0.9 - 2007-04-02
 

diff --git a/src/java/org/apache/nutch/searcher/NutchBean.java b/src/java/org/apache/nutch/searcher/NutchBean.java
@@ -48,13 +48,10 @@ public class NutchBean
 //    LogFormatter.setShowThreadIDs(true);
 //  }
 
-  private String[] segmentNames;
-
   private SearchBean searchBean;
   private SegmentBean segmentBean;
   private final HitInlinks linkDb;
 
-
   /** BooleanQuery won't permit more than 32 required/prohibited clauses.  We
    * don't want to use too many of those. */
   private static final int MAX_PROHIBITED_TERMS = 20;
@@ -149,8 +146,8 @@ public static List<String> readConfig(Path path, Configuration conf)
     }
   }
 
-  public String[] getSegmentNames() {
-    return segmentNames;
+  public String[] getSegmentNames() throws IOException {
+    return segmentBean.getSegmentNames();
   }
 
   public Hits search(Query query, int numHits) throws IOException {
@@ -374,17 +371,23 @@ public static void main(String[] args) throws Exception {
 
     final Configuration conf = NutchConfiguration.create();
     final NutchBean bean = new NutchBean(conf);
-    final Query query = Query.parse(args[0], conf);
-    final Hits hits = bean.search(query, 10);
-    System.out.println("Total hits: " + hits.getTotal());
-    final int length = (int)Math.min(hits.getTotal(), 10);
-    final Hit[] show = hits.getHits(0, length);
-    final HitDetails[] details = bean.getDetails(show);
-    final Summary[] summaries = bean.getSummary(details, query);
-
-    for (int i = 0; i < hits.getLength(); i++) {
-      System.out.println(" " + i + " " + details[i] + "\n" + summaries[i]);
+    try {
+      final Query query = Query.parse(args[0], conf);
+      final Hits hits = bean.search(query, 10);
+      System.out.println("Total hits: " + hits.getTotal());
+      final int length = (int)Math.min(hits.getTotal(), 10);
+      final Hit[] show = hits.getHits(0, length);
+      final HitDetails[] details = bean.getDetails(show);
+      final Summary[] summaries = bean.getSummary(details, query);
+
+      for (int i = 0; i < hits.getLength(); i++) {
+        System.out.println(" " + i + " " + details[i] + "\n" + summaries[i]);
+      }
+    } catch (Throwable t) {
+       LOG.error("Exception occured while executing search: " + t, t);
+       System.exit(1);
     }
+    System.exit(0);
   }
 
   public long getProtocolVersion(String className, long clientVersion)
@@ -394,7 +397,7 @@ public long getProtocolVersion(String className, long clientVersion)
 
       final RPCSearchBean rpcBean = (RPCSearchBean)searchBean;
       return rpcBean.getProtocolVersion(className, clientVersion);
-    } else if (SegmentBean.class.getName().equals(className) &&
+    } else if (RPCSegmentBean.class.getName().equals(className) &&
                segmentBean instanceof RPCSegmentBean) {
 
       final RPCSegmentBean rpcBean = (RPCSegmentBean)segmentBean;