Skip to content
Snippets Groups Projects
Commit c022bcbd authored by felmer's avatar felmer
Browse files

SSDM-4925: remove dead code

SVN: 38082
parent 30b8ef6f
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.server.dataaccess.db; package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -43,7 +42,6 @@ import org.apache.lucene.index.FieldInfo; ...@@ -43,7 +42,6 @@ import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfo.DocValuesType; import org.apache.lucene.index.FieldInfo.DocValuesType;
import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParser;
...@@ -68,7 +66,6 @@ import org.hibernate.search.SearchFactory; ...@@ -68,7 +66,6 @@ import org.hibernate.search.SearchFactory;
import org.hibernate.search.engine.ProjectionConstants; import org.hibernate.search.engine.ProjectionConstants;
import org.hibernate.search.indexes.spi.DirectoryBasedIndexManager; import org.hibernate.search.indexes.spi.DirectoryBasedIndexManager;
import org.hibernate.search.indexes.spi.ReaderProvider; import org.hibernate.search.indexes.spi.ReaderProvider;
import org.hibernate.search.metadata.IndexedTypeDescriptor;
import org.hibernate.search.spi.SearchIntegrator; import org.hibernate.search.spi.SearchIntegrator;
import org.hibernate.transform.BasicTransformerAdapter; import org.hibernate.transform.BasicTransformerAdapter;
import org.hibernate.transform.ResultTransformer; import org.hibernate.transform.ResultTransformer;
...@@ -821,10 +818,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate ...@@ -821,10 +818,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate
}; };
} }
public Highlighter getRawHighlighter()
{
return highlighter;
}
} }
private static final class MyIndexReaderProvider private static final class MyIndexReaderProvider
...@@ -833,8 +826,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate ...@@ -833,8 +826,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate
private final IndexReader indexReader; private final IndexReader indexReader;
private final IndexedTypeDescriptor indexedTypeDescriptor;
/** opens the index reader. Closing the index after usage must be done with #close() method. */ /** opens the index reader. Closing the index after usage must be done with #close() method. */
public MyIndexReaderProvider(final FullTextSession fullTextSession, public MyIndexReaderProvider(final FullTextSession fullTextSession,
final SearchableEntity searchableEntity) final SearchableEntity searchableEntity)
...@@ -846,7 +837,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate ...@@ -846,7 +837,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate
(DirectoryBasedIndexManager) searchIntegrator.getIndexManager(searchableEntity.getMatchingEntityClass().getSimpleName()); (DirectoryBasedIndexManager) searchIntegrator.getIndexManager(searchableEntity.getMatchingEntityClass().getSimpleName());
this.readerProvider = indexManager.getReaderProvider(); this.readerProvider = indexManager.getReaderProvider();
this.indexReader = readerProvider.openIndexReader(); this.indexReader = readerProvider.openIndexReader();
this.indexedTypeDescriptor = searchIntegrator.getIndexedTypeDescriptor(searchableEntity.getMatchingEntityClass());
} }
public IndexReader getReader() public IndexReader getReader()
...@@ -854,49 +844,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate ...@@ -854,49 +844,6 @@ final class HibernateSearchDAO extends HibernateDaoSupport implements IHibernate
return indexReader; return indexReader;
} }
private void collectFields(IndexReaderContext context, Set<String> fields)
{
if (context == null)
{
return;
}
if (context instanceof AtomicReaderContext)
{
try
{
for (String fieldName : ((AtomicReaderContext) context).reader().fields())
{
fields.add(fieldName);
}
} catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
}
if (context.children() == null)
{
return;
}
for (IndexReaderContext child : context.children())
{
collectFields(child, fields);
}
}
public String[] getIndexedFields()
{
Set<String> fieldNames = new HashSet<String>();
collectFields(indexReader.getContext(), fieldNames);
fieldNames.remove(SearchFieldConstants.ID);
for (String prefix : SearchFieldConstants.PREFIXES)
{
fieldNames.remove(prefix + SearchFieldConstants.ID);
}
return fieldNames.toArray(new String[fieldNames.size()]);
}
/** must be called to close the index reader when it is not needed anymore */ /** must be called to close the index reader when it is not needed anymore */
public void close() public void close()
{ {
......
...@@ -63,12 +63,6 @@ public final class SearchFieldConstants ...@@ -63,12 +63,6 @@ public final class SearchFieldConstants
public static final String PREFIX_CONTENT_COPY = "content copy" + SEPARATOR; public static final String PREFIX_CONTENT_COPY = "content copy" + SEPARATOR;
public static final String[] PREFIXES =
{ PREFIX_PROPERTIES, PREFIX_EXPERIMENT, PREFIX_SAMPLE, PREFIX_ENTITY_TYPE,
PREFIX_FILE_FORMAT_TYPE, PREFIX_FILE_FORMAT_TYPE, PREFIX_PROJECT, PREFIX_SPACE,
PREFIX_REGISTRATOR, PREFIX_ATTACHMENT, PREFIX_PROPERTIES + PREFIX_VOCABULARY_TERM,
PREFIX_METAPROJECT };
public static final String ID = "id"; public static final String ID = "id";
public static final String EXPERIMENT_ID = PREFIX_EXPERIMENT + ID; public static final String EXPERIMENT_ID = PREFIX_EXPERIMENT + ID;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment