Commit 1079e457 authored by Christian Reuschling's avatar Christian Reuschling
Browse files

now lucene stuff is managed by DynaQ and not by leechcrawler. We are

independent from leechcrawler regarding the lucene version now. | some
new migrations to several dependency versions
parent 5ca3df8e
target
dynaq.keys
.idea
dynaq.iml
This diff is collapsed.
......@@ -19,9 +19,9 @@ import org.apache.lucene.store.NativeFSLockFactory;
import org.kafkaRCP.core.KafkaRCPConstants;
import org.kafkaRCP.ui.KafkaRCP;
import de.dfki.inquisition.exceptions.ExceptionUtils;
import de.dfki.inquisition.file.FileUtils;
import de.dfki.inquisition.resources.ResourceUtilz;
import de.dfki.inquisitor.exceptions.ExceptionUtils;
import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisitor.resources.ResourceUtilz;
......@@ -121,7 +121,7 @@ public class DynaQ
if(bLogConfig)
{
File fLogProps = new File(KafkaRCPConstants.addKafkaBaseDir2RelativePath("config/logging.properties"));
if(!fLogProps.exists()) FileUtils.copyFile(new File(fLogProps.getAbsolutePath() + ".reference"), fLogProps);
if(!fLogProps.exists()) FileUtilz.copyFile(new File(fLogProps.getAbsolutePath() + ".reference"), fLogProps);
LogManager.getLogManager().readConfiguration(new FileInputStream(fLogProps));
System.setProperty("java.util.logging.config.file", fLogProps.getAbsolutePath());
}
......
......@@ -39,22 +39,26 @@ import org.dynaq.core.DynaQDocument;
import org.dynaq.core.DynaQException;
import org.dynaq.index.LuceneIndexSet;
import org.dynaq.util.DateUtils;
import org.dynaq.util.lucene.basic.Buzzwords;
// import org.dynaq.util.lucene.basic.DynamicFieldType;
import org.dynaq.util.lucene.basic.DynaQDefaultFieldConfig;
import org.dynaq.util.lucene.basic.DynamicFieldType;
import org.dynaq.util.lucene.basic.FieldConfig;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.ConfigurationException;
import de.dfki.inquisition.collections.ConfigurationValue;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisition.collections.MultiValueLinkedHashMap;
import de.dfki.inquisition.file.FileUtils;
import de.dfki.inquisition.lucene.Buzzwords;
import de.dfki.inquisition.lucene.DynamicFieldType;
import de.dfki.inquisition.lucene.FieldConfig;
import de.dfki.inquisition.text.DateParser;
import de.dfki.inquisitor.collections.ConfigurationException;
import de.dfki.inquisitor.collections.ConfigurationValue;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.MultiValueLinkedHashMap;
import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisitor.text.DateParser;
import de.dfki.km.leech.lucene.LeechDefaultFieldConfig;
import de.dfki.km.leech.metadata.LeechMetadata;
@SuppressWarnings({"JavaDoc", "ConstantConditions"})
public class AttributeConfig
{
......@@ -573,27 +577,27 @@ public class AttributeConfig
for (String targetAttributeName : targetAttributeNames)
{
if("integer".equals(strFieldType.toLowerCase()))
if("integer".equalsIgnoreCase(strFieldType))
{
numberAttributeQuery.add(NumericRangeQuery.newIntRange(targetAttributeName, (Integer) lowerBound, (Integer) upperBound, true, true), Occur.SHOULD);
}
else if("long".equals(strFieldType.toLowerCase()))
else if("long".equalsIgnoreCase(strFieldType))
{
numberAttributeQuery.add(NumericRangeQuery.newLongRange(targetAttributeName, (Long) lowerBound, (Long) upperBound, true, true), Occur.SHOULD);
}
else if("float".equals(strFieldType.toLowerCase()))
else if("float".equalsIgnoreCase(strFieldType))
{
numberAttributeQuery.add(NumericRangeQuery.newFloatRange(targetAttributeName, (Float) lowerBound, (Float) upperBound, true, true), Occur.SHOULD);
}
else if("double".equals(strFieldType.toLowerCase()))
else if("double".equalsIgnoreCase(strFieldType))
{
numberAttributeQuery.add(NumericRangeQuery.newDoubleRange(targetAttributeName, (Double) lowerBound, (Double) upperBound, true, true), Occur.SHOULD);
}
else if("date".equals(strFieldType.toLowerCase()))
else if("date".equalsIgnoreCase(strFieldType))
{
numberAttributeQuery.add(NumericRangeQuery.newLongRange(targetAttributeName, (Long) lowerBound, (Long) upperBound, true, true), Occur.SHOULD);
}
else if("time".equals(strFieldType.toLowerCase()))
else if("time".equalsIgnoreCase(strFieldType))
{
numberAttributeQuery.add(NumericRangeQuery.newIntRange(targetAttributeName, (Integer) lowerBound, (Integer) upperBound, true, true), Occur.SHOULD);
}
......@@ -1129,10 +1133,10 @@ public class AttributeConfig
// die fieldConfig muß noch aus der Konfiguration erzeugt werden. Wir nehmen schon mal eine StandardConfig, und überschreiben/erweitern dann mit der aus der
// Datei
m_fieldConfig = new LeechDefaultFieldConfig();
m_fieldConfig = new DynaQDefaultFieldConfig();
FieldConfig fieldConfigFromJson = new FieldConfig();
fieldConfigFromJson.fromJson(FileUtils.file2String(KafkaRCPConstants.addKafkaBaseDir2RelativePath(DynaQConstants.fieldsConf)));
fieldConfigFromJson.fromJson(FileUtilz.file2String(KafkaRCPConstants.addKafkaBaseDir2RelativePath(DynaQConstants.fieldsConf)));
if(fieldConfigFromJson.defaultFieldType != null) m_fieldConfig.defaultFieldType = fieldConfigFromJson.defaultFieldType;
m_fieldConfig.fieldName2FieldType.putAll(fieldConfigFromJson.fieldName2FieldType);
......
......@@ -12,6 +12,7 @@ import javax.mail.Folder;
import javax.mail.MessagingException;
import javax.mail.Store;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
......@@ -45,10 +46,10 @@ class CheckTreeTools
// If there are children and they are no dummies, check them
if((top.getChildCount() != 0) && (!(((DefaultMutableTreeNode) top.getFirstChild()).getUserObject().equals(DUMMY.getUserObject()))))
{
Enumeration<DefaultMutableTreeNode> e = top.children();
Enumeration<TreeNode> e = top.children();
for (int i = 0; i < top.getChildCount(); i++)
{
DefaultMutableTreeNode child = e.nextElement();
DefaultMutableTreeNode child = (DefaultMutableTreeNode) e.nextElement();
// Object childInfo = child.getUserObject();
changeChildrenSelectionState(child, set, false);
}
......@@ -76,10 +77,10 @@ class CheckTreeTools
// if a node got "unchecked"
{
// look, whether a other node on the same level is checked, or partly checked
Enumeration<DefaultMutableTreeNode> e = parent.children();
Enumeration<TreeNode> e = parent.children();
while (e.hasMoreElements())
{
DefaultMutableTreeNode child = e.nextElement();
DefaultMutableTreeNode child = (DefaultMutableTreeNode) e.nextElement();
// if one of the node's siblings is checked or partly checked, the selection of the parental nodes doesn't change
if(((Checkable) child.getUserObject()).getSelectionState() != Checkable.UNCHECKED)
{
......
......@@ -4,8 +4,8 @@ package org.dynaq.config;
import java.util.logging.Logger;
import de.dfki.inquisition.collections.ConfigurationException;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.ConfigurationException;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
......@@ -26,7 +26,7 @@ import javax.swing.ListSelectionModel;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
......@@ -26,6 +26,7 @@ import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import org.kafkaRCP.core.KafkaRCPConstants;
......@@ -168,7 +169,7 @@ public class DirectoryTreePanel extends JPanel implements ActionListener,ItemLis
while (!fileStack.empty())
{
DefaultMutableTreeNode node = (DefaultMutableTreeNode)homePath.getLastPathComponent();
Enumeration<DefaultMutableTreeNode> children = node.children();
Enumeration<TreeNode> children = node.children();
// Search the children for the next match
File childFile;
......@@ -177,7 +178,7 @@ public class DirectoryTreePanel extends JPanel implements ActionListener,ItemLis
while (children.hasMoreElements())
{
childNode = children.nextElement();
childNode = (DefaultMutableTreeNode) children.nextElement();
childFile = (File)childNode.getUserObject();
if (pathFile.equals(childFile))
{
......
......@@ -34,8 +34,8 @@ import org.dynaq.config.AttributeConfig.ConfigAttributes.IMAP_DIRECTORY_ATTS;
import org.jasypt.util.text.BasicTextEncryptor;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.ConfigurationValue;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.ConfigurationValue;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
......@@ -25,7 +25,7 @@ import org.dynaq.config.AttributeConfig.ConfigAttributes;
import org.dynaq.config.AttributeConfig.ConfigAttributes.IMAP_DIRECTORY_ATTS;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
......@@ -39,7 +39,7 @@ import org.kafkaRCP.core.RCPPersistentPlugin;
import org.kafkaRCP.core.data.KafkaMessages;
import org.kafkaRCP.ui.KafkaRCP;
import de.dfki.inquisition.exceptions.ExceptionUtils;
import de.dfki.inquisitor.exceptions.ExceptionUtils;
......
......@@ -12,12 +12,7 @@ import javax.mail.Folder;
import javax.mail.MessagingException;
import javax.mail.Store;
import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import javax.swing.tree.*;
......@@ -181,8 +176,8 @@ public class JCheckTree extends JTree
if(((Checkable) node.getUserObject()).getSelectionState() == Checkable.CHILD_IS_CHECKED)
{
Enumeration<DefaultMutableTreeNode> children = node.children();
DefaultMutableTreeNode child = children.nextElement();
Enumeration<TreeNode> children = node.children();
DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
if(child.getUserObject() instanceof String)
{
......@@ -203,7 +198,7 @@ public class JCheckTree extends JTree
while (children.hasMoreElements())
{
list = getCheckedNodesHelper(list, children.nextElement());
list = getCheckedNodesHelper(list, (DefaultMutableTreeNode) children.nextElement());
}
}
}
......@@ -223,11 +218,11 @@ public class JCheckTree extends JTree
// List the children of the root
DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
Enumeration<DefaultMutableTreeNode> children = root.children();
Enumeration<TreeNode> children = root.children();
while (children.hasMoreElements())
{
checkList = getCheckedNodesHelper(checkList, children.nextElement());
checkList = getCheckedNodesHelper(checkList, (DefaultMutableTreeNode) children.nextElement());
}
return checkList.toArray();
......@@ -249,12 +244,12 @@ public class JCheckTree extends JTree
@SuppressWarnings("unchecked")
public Object[] getRootNodesObjects()
{
Enumeration<DefaultMutableTreeNode> e = top.children();
Enumeration<TreeNode> e = top.children();
Object[] result = new Object[top.getChildCount()];
for (int i = 0; i < result.length; i++)
{
result[i] = e.nextElement().getUserObject();
result[i] = ((DefaultMutableTreeNode)e.nextElement()).getUserObject();
}
return result;
......@@ -263,12 +258,12 @@ public class JCheckTree extends JTree
@SuppressWarnings("unchecked")
public DefaultMutableTreeNode[] getRootNodes()
{
Enumeration<DefaultMutableTreeNode> e = top.children();
Enumeration<TreeNode> e = top.children();
DefaultMutableTreeNode[] result = new DefaultMutableTreeNode[top.getChildCount()];
for (int i = 0; i < result.length; i++)
{
result[i] = e.nextElement();
result[i] = (DefaultMutableTreeNode)e.nextElement();
}
return result;
......@@ -291,10 +286,10 @@ public class JCheckTree extends JTree
DefaultTreeModel model = (DefaultTreeModel) this.getModel();
DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
Enumeration<DefaultMutableTreeNode> nodes = root.preorderEnumeration();
Enumeration<TreeNode> nodes = root.preorderEnumeration();
while (nodes.hasMoreElements())
{
DefaultMutableTreeNode node = nodes.nextElement();
DefaultMutableTreeNode node = (DefaultMutableTreeNode) nodes.nextElement();
if (node.getUserObject() instanceof Checkable)
{
boolean removed = ((CheckTreeMutableTreeNode)node).removeHiddenChildrenFromRealChildren();
......@@ -319,10 +314,10 @@ public class JCheckTree extends JTree
DefaultTreeModel model = (DefaultTreeModel) this.getModel();
DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
Enumeration<DefaultMutableTreeNode> nodes = root.preorderEnumeration();
Enumeration<TreeNode> nodes = root.preorderEnumeration();
while (nodes.hasMoreElements())
{
DefaultMutableTreeNode node = nodes.nextElement();
DefaultMutableTreeNode node = (DefaultMutableTreeNode) nodes.nextElement();
if (node.getUserObject() instanceof Checkable)
{
boolean added = ((CheckTreeMutableTreeNode)node).addHiddenChildrenToRealChildren();
......
......@@ -30,9 +30,9 @@ import javax.swing.table.TableColumn;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.ui.table.ComparableColumnComparator;
import de.dfki.inquisition.ui.table.TableUtils;
import de.dfki.inquisition.ui.table.rowheader.Util;
import de.dfki.inquisitor.ui.table.ComparableColumnComparator;
import de.dfki.inquisitor.ui.table.TableUtils;
import de.dfki.inquisitor.ui.table.rowheader.Util;
......
......@@ -17,11 +17,13 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.rmi.server.UID;
import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
......@@ -41,12 +43,15 @@ import javax.swing.SwingUtilities;
import javax.swing.ToolTipManager;
import javax.swing.UIManager;
import com.cedarsoftware.util.io.JsonReader;
import com.jgoodies.binding.beans.PropertyAccessor;
import org.apache.lucene.search.Query;
import org.dynaq.core.Context;
import org.dynaq.core.DynaQQuery;
import org.dynaq.search.pull.ConfigurableSearchingView;
import org.dynaq.search.pull.sections.QueryContextContextualizationPanel;
import org.dynaq.util.lucene.BooleanQueryWithMetaData;
import org.dynaq.util.lucene.basic.LuceneUtilz;
import org.kafkaRCP.core.KafkaRCPConstants;
import org.kafkaRCP.core.RCPPersistentPlugin;
import org.kafkaRCP.ui.KafkaRCP;
......@@ -55,11 +60,10 @@ import com.jgoodies.binding.adapter.BasicComponentFactory;
import com.jgoodies.binding.beans.BeanAdapter;
import com.jgoodies.common.collect.LinkedListModel;
import de.dfki.inquisition.file.FileUtils;
import de.dfki.inquisition.lucene.LuceneUtilz;
import de.dfki.inquisition.ui.SwingUtils;
import de.dfki.inquisition.ui.componentList.ComponentList;
import de.dfki.inquisition.ui.tablelayout.TableLayoutUtil;
import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisitor.ui.SwingUtils;
import de.dfki.inquisitor.ui.componentList.ComponentList;
import de.dfki.inquisitor.ui.tablelayout.TableLayoutUtil;
......@@ -71,15 +75,15 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
{
private static final long serialVersionUID = 2051413894930182977L;
protected final Context context;
protected Context context;
final protected JButton m_add2ActiveQueryContextualizationsButton;
protected JButton m_add2ActiveQueryContextualizationsButton;
final protected JButton m_add2ActiveQueryContextualizationsOrthogonalButton;
protected JButton m_add2ActiveQueryContextualizationsOrthogonalButton;
final protected JTextField m_contextNameJTextField;
protected JTextField m_contextNameJTextField;
final protected JButton m_editButton;
protected JButton m_editButton;
final protected Component m_firstQueryContextLabel = new JLabel("<html><font COLOR=GREEN> &lt;&lt; first query context</font></html>");
......@@ -159,15 +163,20 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
};
final protected JButton m_secondAdd2ActiveQueryContextualizationsOrthogonalButton;
protected JButton m_secondAdd2ActiveQueryContextualizationsOrthogonalButton;
protected QueryContextListEntryComponent()
{
super();
}
public QueryContextListEntryComponent(final Context context)
{
super();
this.context = context;
......@@ -523,8 +532,29 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
String strFileName = KafkaRCPConstants.addKafkaBaseDir2RelativePath(PERSISTENCE_FILEPATH);
// wir füllen das existierende Objekt, da wir die Referenz nicht verändern wollen (die ist ja evtl. schon an unsere Liste
// gebindet...hoffentlich^^)
LinkedList<Context> tmpList = (LinkedList<Context>) FileUtils.file2Object(strFileName);
// gebindet...hoffentlich^^) das funzt einfach ned
LinkedList<Context> tmpList = (LinkedList<Context>) FileUtilz.file2ObjectJsonIO(strFileName);
// JsonReader.assignInstantiator(com.jgoodies.binding.beans.PropertyAccessor.class, new JsonReader.ClassFactoryEx(){
//
// @Override
// public Object newInstance(Class c, Map args)
// {
// com.jgoodies.binding.beans.PropertyAccessor instance = new PropertyAccessor(args.get("jsonObj").get, null, null);
// return instance;
// }
// });
// JsonReader jr = new JsonReader(new FileInputStream(strFileName));
//
// LinkedList<Context> tmpList = (LinkedList<Context>) jr.readObject();
// jr.close();
// LinkedList<Context> tmpList = (LinkedList<Context>) FileUtilz.file2ObjectGSon(strFileName, new LinkedList<Context>().getClass());
// LinkedList<Context> tmpList = (LinkedList<Context>) FileUtilz.file2ObjectKryo(strFileName, new LinkedList<Context>().getClass());
// LinkedList<Context> tmpList = (LinkedList<Context>) FileUtilz.file2ObjectJackson(strFileName, new LinkedList<Context>().getClass());
m_llContextList.addAll(tmpList);
......@@ -570,7 +600,7 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
try
{
UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel");
}
catch (Exception e)
{
......@@ -1056,15 +1086,21 @@ public class QueryContextConfigView extends JPanel implements RCPPersistentPlugi
// wir serialisieren ganz einfach die Liste (zur Sicherheit erzeugen wir mal eine neue, falls die andere nicht serialisierbar ist ;) )
LinkedList<Context> llTmp = new LinkedList<Context>();
llTmp.addAll(getContextListStatic());
// die lazy fields können nicht serialisiert werden - wir laden sie
for (Context context : llTmp)
// die lazy fields können nicht serialisiert werden - wir laden sie. Und wir müssen auch noch Objekte nehmen die persistierbar sind, wir arbeiten hier mit GuiBinding
for (Context context : getContextListStatic())
{
DynaQQuery query2persist = context.getDynaQQuery();
if(query2persist == null) continue;
llTmp.add(context.getPersistableCopy());
}
FileUtils.object2File(llTmp, strFileName);
FileUtilz.object2FileJsonIO(llTmp, strFileName);
// FileUtilz.object2FileGSon(llTmp, strFileName);
// FileUtilz.object2FileKryo(llTmp, strFileName);
// FileUtilz.object2FileJackson(llTmp, strFileName);
}
catch (Exception e)
......
......@@ -25,7 +25,7 @@ import javax.swing.ListSelectionModel;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
......@@ -2,26 +2,19 @@ package org.dynaq.config;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
import info.clearthought.layout.TableLayout;
import info.clearthought.layout.TableLayoutConstants;
import info.clearthought.layout.TableLayoutConstraints;
import java.util.Hashtable;
import javax.swing.JInternalFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import org.dynaq.util.images.ThumbNailer;
import org.dynaq.index.thumbnails.ThumbNailer;
import org.kafkaRCP.core.RCPGlobalMessageListener;
import org.kafkaRCP.core.RCPPersistentPlugin;
import org.kafkaRCP.core.data.KafkaMessages;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import javax.swing.*;
import javax.swing.event.InternalFrameAdapter;
import javax.swing.event.InternalFrameEvent;
import java.util.Hashtable;
......
......@@ -33,8 +33,8 @@ import javax.swing.SwingUtilities;
import org.kafkaRCP.core.KafkaRCPConstants;
import de.dfki.inquisition.collections.ConfigurationValue;
import de.dfki.inquisition.collections.MultiValueConfiguration;
import de.dfki.inquisitor.collections.ConfigurationValue;
import de.dfki.inquisitor.collections.MultiValueConfiguration;
......
......@@ -35,11 +35,11 @@ import org.dynaq.config.AttributeConfig.IndexAttributes;
import org.dynaq.index.LuceneIndexSet;
import org.dynaq.util.lucene.BooleanQueryWithMetaData;
import org.dynaq.util.lucene.BoostedQueriesExtractor;
import org.dynaq.util.lucene.basic.LuceneUtilz;
import org.dynaq.util.swing.ColorFactory;
import de.dfki.inquisition.exceptions.ExceptionUtils;
import de.dfki.inquisition.lucene.LuceneUtilz;
import de.dfki.inquisition.text.StringUtils;
import de.dfki.inquisitor.exceptions.ExceptionUtils;
import de.dfki.inquisitor.text.StringUtils;
......@@ -110,7 +110,7 @@ public class DynaQQuery implements Serializable
* a worker method and will not change the current internal query for sorting, nor the set of internal contextualization documents.
*
* @param lContextDocs a list of documents from which the query should be calculated
* @param strMarkerID a marker id to identify this list of documents afterwards, for extracting them with {@link #extractContextDocs(Query)}
* @param strMarkerID a marker id to identify this list of documents afterwards, for extracting them with {@link #extractContextDocs(Query, String)}
*
* @return a query that can be used for contextualization, or null in the case it was not possible to calculate a query
*/
......@@ -168,7 +168,7 @@ public class DynaQQuery implements Serializable
/**
* Gets the context document list out of a query that was formerly generated with {@link #documents2TextContentContextQuery(List)}. The method also extract the
* Gets the context document list out of a query that was formerly generated with {@link #documents2TextContentContextQuery(List, String)}. The method also extract the
* context docs in the case this query is embedded in another query - just give the root query object. In the case more than one context doc query were embedded, the
* method returns the document set with the given markerID, or a concatenated set of all contextDocs if you leave it empty
*
......
......@@ -26,10 +26,10 @@ import org.dynaq.core.weaving.TermRelevancesQuery;
import org.dynaq.core.weaving.TermRelevancesScoreDoc;
import org.dynaq.index.LuceneIndexSet;
import de.dfki.inquisition.exceptions.ExceptionUtils;
import de.dfki.inquisition.lucene.IndexAccessor;
import de.dfki.inquisition.lucene.RemoteIndexSearcher;
import de.dfki.inquisition.text.StringUtils;
import de.dfki.inquisitor.exceptions.ExceptionUtils;
import de.dfki.inquisitor.text.StringUtils;
import org.dynaq.util.lucene.basic.IndexAccessor;
import org.dynaq.util.lucene.basic.RemoteIndexSearcher;