some more cleaning up

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/LuceneSearch.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/LuceneSearch.java
index f417a64a88b2716ca7db74e06c7ccf8ff0b1a509..68b8ec07a0def4e19fe3f49ecb158c4219a042ed 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/LuceneSearch.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/LuceneSearch.java
@@ -59,6 +59,8 @@ public class LuceneSearch {
 
     private static final String GROUP_BY_FIELD = GroupByTaxonClassBridge.GROUPBY_TAXON_FIELD;
 
+    public final static String ID_FIELD = "id";
+
     public static final Logger logger = Logger.getLogger(LuceneSearch.class);
 
     protected Session session;
@@ -284,29 +286,6 @@ public class LuceneSearch {
         groupsResult = new TopGroups(groupsResult, c3.getGroupCount());
 
         return groupsResult;
-
-
-        //TODO when switched to Lucene 3.x which is included in hibernate 4.x
-        //     use TopDocCollector.topDocs(int start, int howMany);
-        //     since this method might be more memory save than our own implementation
-        //
-        //     ALSO READ http://dev.e-taxonomy.eu/trac/ticket/3118 !!!
-        //
-//        TopDocs topDocs = hitCollector.topDocs();
-//        ScoreDoc[] scoreDocs = topDocs.scoreDocs;
-
-//        int docsAvailableInPage = Math.min(scoreDocs.length - offset, pageSize);
-//        logger.debug("docsAvailableInPage:" + docsAvailableInPage);
-//
-//        ScoreDoc[] pagedDocs = new ScoreDoc[docsAvailableInPage];
-//        for(int i = 0; i < docsAvailableInPage; i++){
-//            pagedDocs[i] = scoreDocs[offset + i];
-//        }
-//        TopDocs pagedTopDocs = new TopDocs(topDocs.totalHits, pagedDocs, topDocs.getMaxScore());
-        //
-        /////////////////////////////////////////////
-
-//        return pagedTopDocs;
     }
 
     /**

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResult.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResult.java
index 23f5499686b1b7ed4ac0ab2f83624f070a5a70fe..520072c2ebda3623e522c30ae47f8aa3e4e62f38 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResult.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/search/SearchResult.java
@@ -31,8 +31,6 @@ public class SearchResult<T extends CdmBase> {
 
     private float maxScore = 0;
 
-    //FIXME move to somewhere else
-    private final String ID_FIELD = "id";
 
     /**
      * key will be a combination of DocumentBuilder.CLASS_FIELDNAME and id field: ID_FIELD
@@ -70,14 +68,6 @@ public class SearchResult<T extends CdmBase> {
         this.fieldHighlightMap = fieldHighlightMap;
     }
 
-    /**
-     * @param doc
-     * @param entity
-     */
-    public SearchResult(Document doc) {
-        addDoc(doc);
-    }
-
     public SearchResult() {
     }
 
@@ -98,7 +88,7 @@ public class SearchResult<T extends CdmBase> {
 
 
     public void addDoc(Document doc) {
-        String key = doc.getValues(DocumentBuilder.CLASS_FIELDNAME)[0] + "." + doc.getValues(ID_FIELD)[0];
+        String key = doc.getValues(DocumentBuilder.CLASS_FIELDNAME)[0] + "." + doc.getValues(LuceneSearch.ID_FIELD)[0];
         this.docs.put(key, doc);
     }