my changes to make it compile, also minor build file cleanup

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150887 13f79535-47bb-0310-9956-ffa450edef68

sandbox/contributions/searchbean/build.xml

@@ -6,15 +6,14 @@
         (and without typing -D each time it compiles it -->
   <property file="${user.home}/lucene.build.properties" /> 
   <property file="${user.home}/build.properties" />
-  <property file="${basedir}/build.properties" />
-  <property file="${basedir}/default.properties" />
+  <property file="build.properties" />
+  <property file="default.properties" />
+  <property name="lib.dir" location="lib"/>
 
   <!-- Build classpath -->
   <path id="classpath">
-    <pathelement location="${build.classes}"/>
-    <pathelement location="${build.test.classes}"/>
     <pathelement location="."/>
-    <fileset dir="lib.dir">
+    <fileset dir="${lib.dir}">
       <include name="*.jar" />
     </fileset>
   </path>
@@ -22,9 +21,8 @@
   <path id="junit.classpath">
     <pathelement location="${junit.classes}" />
     <pathelement location="${build.classes}"/>
-    <fileset dir="lib.dir">
-      <include name="*.jar" />
-    </fileset>
+    <pathelement location="${build.test.classes}"/>
+    <path refid="classpath"/>
     <pathelement path="${java.class.path}" />
   </path>
 
@@ -35,7 +33,6 @@
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
     <mkdir dir="${build.src}"/>
-    <mkdir dir="lib.dir"/>
     
     <available
       property="junit.present"
@@ -109,7 +106,7 @@
       includes="**/*.java"
       destdir="${build.test.classes}"
       debug="${debug}">
-      <classpath refid="classpath"/>
+      <classpath refid="junit.classpath"/>
     </javac>
   </target>
 
@@ -133,7 +130,7 @@
       includes="**/*.java"
       destdir="${junit.classes}"
       debug="${debug}">
-      <classpath refid="classpath"/>
+      <classpath refid="junit.classpath"/>
     </javac>
 
     <junit printsummary="yes" haltonfailure="no" >

sandbox/contributions/searchbean/src/java/org/apache/lucene/beans/HitsIterator.java

@@ -54,8 +54,8 @@ public class HitsIterator {
     public HitsIterator(Hits hits, String sortFlag) throws IOException{
         this.hitsCollection = hits;
         if (sortFlag != null){
-            if ((sortFlag != "") && (sortFlag.equals(SearchBean.SORT_FIELD_RELEVANCE))){
-                //logger.debug("Sorting hits by field "+sortFlag);
+            if (sortFlag != "") {
+                System.out.println("Sorting hits by field "+sortFlag);
                 sortByField(sortFlag);
                 //logger.debug("Completed sorting by field "+sortFlag);
             }

sandbox/contributions/searchbean/src/java/org/apache/lucene/beans/IteratorAdapter.java

@@ -1,6 +1,7 @@
 package org.apache.lucene.beans;
 
 import java.util.Iterator;
+import java.io.IOException;
 
 /**
  * Acts as an adapter for HitsIterator to comply with the Collections
@@ -25,7 +26,13 @@ public final class IteratorAdapter implements Iterator
 
     public Object next()
     {
-        return hitsIterator.next();
+        Object obj = null;
+        try {
+            obj = hitsIterator.next();
+        } catch (IOException e) {
+            // ignore for now, returning null might be good enough?
+        }
+        return obj;
     }
 
     public void remove()

sandbox/contributions/searchbean/src/java/org/apache/lucene/beans/SearchBean.java

@@ -132,6 +132,7 @@ public class SearchBean extends Object {
     /** does the actual searching
      */
     private Hits searchHits(String queryString, String queryType) throws IOException, ParseException{
+        System.out.println("queryString = " + queryString);
         if (queryString == "") {
             return null;
         }
@@ -140,7 +141,7 @@ public class SearchBean extends Object {
 
         searcher = new IndexSearcher(directory);
         Query query = getQuery(queryString, defaultSearchField);
-        //System.out.println("###querystring= "+query.toString(defaultSearchField));
+        System.out.println("###querystring= "+query.toString(defaultSearchField));
         Hits hits = searcher.search(query);
         //System.out.println("Number hits = "+hits.length());
         //logger.debug("queryString = "+query.toString(searchField)+" hits = "+hits.length()+" queryType = "+queryType+" indexPath = "+indexPath );