/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

     public class EmptySelection extends Selection {
     	private static final List<? extends Match> EMPTY = new ArrayList<Match>();
     	protected Query query;
     	protected IQuery query;
     	public EmptySelection(Query query) {
     	public EmptySelection(IQuery query) {
     		this.query = query;
+    	}
-...
     		return 0;
+    	}
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return query;
+    	}

     public interface ISearchEngine extends Engine {
     	public Selection query(CorpusBuild corpus, Query query, String name, boolean saveQuery) throws Exception;
     	public Selection query(CorpusBuild corpus, IQuery query, String name, boolean saveQuery) throws Exception;
     	/**
+    	 *
     	 * @return an empty Query for the engine implementation
     	 */
     	public Query newQuery();
     	public IQuery newQuery();
     	/**
+    	 *

     // Copyright © 2010-2013 ENS de Lyon.
     // Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
     // Lyon 2, University of Franche-Comté, University of Nice
     // Sophia Antipolis, University of Paris 3.
     //
     // The TXM platform is free software: you can redistribute it
     // and/or modify it under the terms of the GNU General Public
     // License as published by the Free Software Foundation,
     // either version 2 of the License, or (at your option) any
     // later version.
     //
     // The TXM platform is distributed in the hope that it will be
     // useful, but WITHOUT ANY WARRANTY; without even the implied
     // warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
     // PURPOSE. See the GNU General Public License for more
     // details.
     //
     // You should have received a copy of the GNU General
     // Public License along with the TXM platform. If not, see
     // http://www.gnu.org/licenses.
     //
     //
     //
     // $LastChangedDate: 2015-05-13 09:46:56 +0200 (Wed, 13 May 2015) $
     // $LastChangedRevision: 2967 $
     // $LastChangedBy: mdecorde $
     //
     package org.txm.searchengine.core;
     import java.util.ArrayList;
     import java.util.List;
     import org.txm.core.preferences.TXMPreferences;
     /**
      * Represent a search engine query
      * Implements a SearchEngine generic query with a query and a search engine.
+     *
      * @author mdecorde
+     *
      * TODO stop using CQLQuery and TIGERQuery with this class
      */
     public interface Query {
     	public String getQueryString();
     	public boolean isEmpty();
     public class Query implements IQuery {
     	/**
     	 * Converts the specified list of Query to a string.
     	 * Queries strings are separated by a tabulation.
     	 * @param queries
     	 * @return
     	 */
     	public static String queriesToString(List<Query> queries) {
     		String str = "";
     		for (int i = 0; i < queries.size(); i++) {
     			if(i > 0)	{
     				str += TXMPreferences.LIST_SEPARATOR;
+    			}
     			str += queries.get(i).getQueryString();
     			str += TXMPreferences.LIST_SEPARATOR+queries.get(i).getSearchEngine().getName();
+    		}
     		return str;
+    	}
     	/**
     	 * Converts the specified string to a list of Query.
     	 * Input string must contains queries separated by a tabulation.
     	 * @param str
     	 * @return
     	 */
     	public static List<Query> stringToQueries(String str) {
     		ArrayList<Query> queries = new ArrayList<Query>();
     		if (str == null || str.length() == 0) {
     			return queries;
+    		}
     		String[] split = str.split(TXMPreferences.LIST_SEPARATOR);
     		for (int i = 0 ; i +1 < split.length ; i = i+2) {
     			String s = split[i];
     			String eName = split[i];
     			SearchEngine e = SearchEnginesManager.getSearchEngine(eName);
     			queries.add(new Query(s, e));
+    		}
     		return queries;
+    	}
     	/**
     	 * Converts the specified string to a Query.
     	 * Input string must contains queries separated by a tabulation.
     	 * @param str
     	 * @return
     	 */
     	public static Query stringToQuery(String str) {
     		String[] split = str.split(TXMPreferences.LIST_SEPARATOR, 2);
     		String eName = split[1];
     		SearchEngine e = SearchEnginesManager.getSearchEngine(eName);
     		return new Query(split[0], e);
+    	}
     	/**
     	 * The query string.
     	 */
     	protected SearchEngine engine = null;
     	/**
     	 * The query string.
     	 */
     	protected String queryString = "";
     	/**
     	 * Instantiates a new query.
+    	 *
     	 * @return the Query SearchEngine that can resolve the query
     	 * @param queryString
     	 *            the query string
+    	 *
     	 *            public Query(String queryString){
     	 *            this.queryString=queryString.trim(); }
     	 */
     	public SearchEngine getSearchEngine();
     	public Query(String queryString, SearchEngine engine) {
     		if (queryString != null) {
     			this.queryString = queryString.trim();
+    		}
     		else {
     			this.queryString = "";
+    		}
     		this.engine = engine;
+    	}
     	@Override
     	public boolean equals(IQuery q) {
     		return this.engine.equals(q.getSearchEngine()) && this.getQueryString().equals(q.getQueryString());
+    	}
     	@Override
     	public boolean equals(Object obj) {
     		if (obj == null) return false;
     		if (!(obj instanceof Query)) {
     			return false;
+    		}
     		if (this.queryString == null) return false;
     		if (this.engine == null) return false;
     		return this.queryString.equals(((Query) obj).queryString) && this.engine.equals(((Query) obj).engine);
+    	}
     	@Override
     	public IQuery fixQuery() {
     		return new Query(queryString, this.engine);
+    	}
     	/**
     	 * update the query
     	 * Gets the query string.
+    	 *
     	 * @param rawQuery
     	 * @return this
     	 * @return the query string
     	 */
     	public Query setQuery(String rawQuery);
     	public final String getQueryString() {
     		return queryString;
+    	}
     	@Override
     	public SearchEngine getSearchEngine() {
     		return engine;
+    	}
     	/**
     	 * fix the query using sugar syntax rules
     	 * @return this
     	 * Checks whatever the query is empty (null, empty or contains only double quotes) or not.
     	 * @return true if empty otherwise false
     	 */
     	public Query fixQuery();
     	public boolean equals(Query q);
     	public boolean isEmpty() {
     		return queryString == null || queryString.length() == 0 || "\"\"".equals(queryString);
+    	}
     	@Override
     	public IQuery setQuery(String rawQuery) {
     		queryString = rawQuery;
     		return this;
+    	}
     	/* (non-Javadoc)
     	 * @see java.lang.Object#toString()
     	 */
     	@Override
     	public String toString() {
     		return queryString;
+    	}
+    }

     	public abstract int getNMatch() throws Exception;
     	public abstract Query getQuery();
     	public abstract IQuery getQuery();
     	public abstract boolean isTargetUsed() throws Exception;

     	public static SearchEngine getTIGERSearchEngine() {
     		return (SearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine("TIGER");
+    	}
     	/**
+    	 *
     	 * @return
     	 */
     	public static SearchEngine getSearchEngine(String name) {
     		return (SearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine(name);
+    	}
     	@Override
     	public boolean fetchEngines() {

tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/SearchEngine.java (revision 2132)
19	19	return start(new LogMonitor("Starting "+getName()));
20	20	}
21	21
22		public abstract Selection query(CorpusBuild corpus, Query query, String name, boolean saveQuery) throws Exception;
	22	public abstract Selection query(CorpusBuild corpus, IQuery query, String name, boolean saveQuery) throws Exception;
23	23
24		public abstract Query newQuery();
	24	public abstract IQuery newQuery();
25	25
26	26	/**
27	27	*
...	...
34	34	return this.getClass()+ " "+this.toString();
35	35	}
36	36
	37	public boolean equals(SearchEngine e) {
	38
	39	if (e == null) return false;
	40	if (this.getName() == null) return false;
	41
	42	return this.getName().equals(e.getName());
	43	}
	44
37	45	/**
38	46	*
39	47	* @param match

     package org.txm.searchengine.core;
     /**
      * Represent a search engine query
+     *
      * @author mdecorde
+     *
      */
     public interface IQuery {
     	public String getQueryString();
     	public boolean isEmpty();
     	/**
+    	 *
     	 * @return the Query SearchEngine that can resolve the query
     	 */
     	public SearchEngine getSearchEngine();
     	/**
     	 * update the query
+    	 *
     	 * @param rawQuery
     	 * @return this
     	 */
     	public IQuery setQuery(String rawQuery);
     	/**
     	 * fix the query using sugar syntax rules
     	 * @return this
     	 */
     	public IQuery fixQuery();
     	public boolean equals(IQuery q);
+    }

     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.Selection;
     import org.txm.searchengine.cqp.AbstractCqiClient;
     import org.txm.searchengine.cqp.CQPSearchEngine;
-...
     	/** The query. */
     	@Parameter(key=ConcordancePreferences.QUERY)
     	protected Query pQuery;
     	protected IQuery pQuery;
     	/** The keyword analysis properties */
-...
     		if (!this.getCorpus().equals(other.getCorpus())) return false;
     		Query q1 = other.getQuery();
     		Query q2 = this.getQuery();
     		IQuery q1 = other.getQuery();
     		IQuery q2 = this.getQuery();
     		if (q1 != null && q2 != null) return q1.equals(q2);
     		return true;
-...
+    	 *
     	 * @return the query
     	 */
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return pQuery;
+    	}

     package org.txm.searchengine.ts;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEnginesManager;
     public class TIGERQuery implements Query {
     public class TIGERQuery implements IQuery {
     	String query;
-...
+    	}
     	@Override
     	public Query setQuery(String rawQuery) {
     	public IQuery setQuery(String rawQuery) {
     		query = rawQuery;
     		return this;
+    	}
     	@Override
     	public Query fixQuery() {
     	public IQuery fixQuery() {
     		return this;
+    	}
     	@Override
     	public boolean equals(Query q) {
     	public boolean equals(IQuery q) {
     		return this.getClass().equals(q.getClass()) && this.getQueryString().equals(q.getQueryString());
+    	}

     import java.util.List;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.Selection;
     public class TIGERSelection extends Selection {
     	List<? extends Match> matches;
     	Query query;
     	IQuery query;
     	public TIGERSelection(Query query, List<? extends Match> result2) {
     	public TIGERSelection(IQuery query, List<? extends Match> result2) {
     		this.query = query;
     		matches = result2;
+    	}
-...
+    	}
     	@Override
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return query;
+    	}

     import org.txm.objects.Match;
     import org.txm.objects.Project;
     import org.txm.searchengine.core.EmptySelection;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEngineProperty;
     import org.txm.searchengine.core.Selection;
-...
+    	}
     	@Override
     	public Selection query(CorpusBuild corpus, Query query, String name, boolean saveQuery) throws Exception {
     	public Selection query(CorpusBuild corpus, IQuery query, String name, boolean saveQuery) throws Exception {
     		File tigerDirectory = new File(corpus.getProjectDirectory(), "tiger");
     		File configfile = new File(tigerDirectory, "tigersearch.logprop");
-...
+    	}
     	@Override
     	public Query newQuery() {
     	public IQuery newQuery() {
     		return new TIGERQuery();
+    	}

     import org.txm.objects.CorpusBuild;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.EmptySelection;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEngineProperty;
     import org.txm.searchengine.core.Selection;
-...
+    	}
     	@Override
     	public Selection query(CorpusBuild corpus, Query query, String name, boolean saveQuery) throws CqiClientException {
     	public Selection query(CorpusBuild corpus, IQuery query, String name, boolean saveQuery) throws CqiClientException {
     		if (query instanceof CQLQuery && corpus instanceof CQPCorpus) {
     			return ((CQPCorpus)corpus).query((CQLQuery)query, name, saveQuery);
     		} else {
-...
+    	}
     	@Override
     	public Query newQuery() {
     	public IQuery newQuery() {
     		return new CQLQuery(""); //$NON-NLS-1$
+    	}

     import java.util.regex.Pattern;
     import org.txm.core.preferences.TXMPreferences;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEnginesManager;
     import org.txm.searchengine.cqp.CQPSearchEngine;
-...
      * @author sjacquot
      */
     public class CQLQuery implements Query {
     public class CQLQuery implements IQuery {
     	/** The Constant NoStrategy. */
     	private static final Integer NoStrategy = 0;
-...
+    	}
     	@Override
     	public Query setQuery(String rawQuery) {
     	public IQuery setQuery(String rawQuery) {
     		this.queryString = rawQuery;
     		return this;
+    	}
     	@Override
     	public Query fixQuery() {
     	public IQuery fixQuery() {
     		this.queryString = fixQuery(this.queryString);
     		return this;
+    	}
     	@Override
     	public boolean equals(Query q) {
     	public boolean equals(IQuery q) {
     		return this.getClass().equals(q.getClass()) && this.getQueryString().equals(q.getQueryString());
+    	}
+    }

     import org.txm.rcp.swt.widget.structures.StructuralUnitPropertiesComboViewer;
     import org.txm.rcp.swt.widget.structures.StructuralUnitsComboViewer;
     import org.txm.rcp.swt.widget.structures.StructuralUnitsCombosGroup;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.cqp.corpus.query.CQLQuery;
     import org.txm.utils.io.IOUtils;
     import org.txm.utils.logger.Log;
-...
     			assistedQueryWidget.setText(query);
+    		}
     		public Query getQuery() {
     		public IQuery getQuery() {
     			return assistedQueryWidget.getQuery();
+    		}
-...
     		 // initialize query fields
     		if (queryWidgets.size() == 0 && queryList != null) {
     			for (Query q : queryList) {
     			for (IQuery q : queryList) {
     				addFocusQueryField(q.getQueryString());
+    			}
+    		}

     import org.txm.index.core.messages.IndexCoreMessages;
     import org.txm.index.core.preferences.IndexPreferences;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.Selection;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
-...
     	 * The CQP query.
     	 */
     	@Parameter(key=TXMPreferences.QUERY)
     	protected Query pQuery;
     	protected IQuery pQuery;
     	/**
     	 * The line index of the current index page.
-...
+    	 *
     	 * @return the query used
     	 */
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return pQuery;
+    	}

     import org.txm.index.core.messages.IndexCoreMessages;
     import org.txm.index.core.preferences.IndexPreferences;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.Selection;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
-...
     	 * The CQP query.
     	 */
     	@Parameter(key=TXMPreferences.QUERY)
     	protected Query pQuery;
     	protected IQuery pQuery;
     	/**
     	 * The line index of the current index page.
-...
+    	 *
     	 * @return the query used
     	 */
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return pQuery;
+    	}

     import org.txm.rcp.utils.SWTEditorsUtils;
     import org.txm.rcp.views.corpora.CorporaView;
     import org.txm.rcp.views.debug.TXMResultDebugView;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.cqp.ReferencePattern;
     import org.txm.searchengine.cqp.corpus.Property;
     import org.txm.searchengine.cqp.corpus.query.CQLQuery;
-...
     					((NewNavigationWidget)object).setCurrentPosition((Integer) value);
+    				}
     				else if(object instanceof AssistedChoiceQueryWidget)	{
     					if(!((Query)value).getQueryString().isEmpty())	{
     						((AssistedChoiceQueryWidget)object).setText(((Query)value).getQueryString());
     						((AssistedChoiceQueryWidget)object).setSearchEngine(((Query)value).getSearchEngine());
     					if(!((IQuery)value).getQueryString().isEmpty())	{
     						((AssistedChoiceQueryWidget)object).setText(((IQuery)value).getQueryString());
     						((AssistedChoiceQueryWidget)object).setSearchEngine(((IQuery)value).getSearchEngine());
+    					}
+    				}
     				else if(object instanceof AssistedQueryWidget)	{

     import org.txm.rcp.messages.TXMUIMessages;
     import org.txm.rcp.swt.GLComposite;
     import org.txm.rcp.swt.dialog.QueryAssistDialog;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEnginesManager;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
-...
     		querywidget.setText(query);
+    	}
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return this.querywidget.getQuery();
+    	}

     import org.eclipse.swt.widgets.Combo;
     import org.eclipse.swt.widgets.Composite;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEnginesManager;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
-...
+    	 *
     	 * @return the query
     	 */
     	public Query getQuery() {
     	public IQuery getQuery() {
     		if (!this.getQueryString().isEmpty())	{
     			return se.newQuery().setQuery(this.getQueryString());
     		} else {

     import org.eclipse.swt.widgets.Label;
     import org.kohsuke.args4j.NamedOptionDef;
     import org.txm.rcp.swt.widget.QueryWidget;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.cqp.corpus.query.CQLQuery;
     public class QueryField extends ParameterField {
-...
     		resetToDefault();
+    	}
     	public Query getWidgetValue() {
     	public IQuery getWidgetValue() {
     		return w.getQuery();
+    	}

     import org.txm.rcp.swt.dialog.QueryAssistDialog;
     import org.txm.rcp.swt.provider.ListContentProvider;
     import org.txm.rcp.swt.provider.SimpleLabelProvider;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEnginesManager;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
-...
     		querywidget.setText(query);
+    	}
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return this.querywidget.getQuery();
+    	}
+    }

tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/search/URSQuery.java (revision 2132)
2	2
3	3	import org.txm.Toolbox;
4	4	import org.txm.core.engines.EngineType;
5		import org.txm.searchengine.core.Query;
	5	import org.txm.searchengine.core.IQuery;
6	6	import org.txm.searchengine.core.SearchEngine;
7	7
8	8	/**
...	...
12	12	* @author mdecorde
13	13	*
14	14	*/
15		public class URSQuery implements Query {
	15	public class URSQuery implements IQuery {
16	16
17	17	String query = ""; //$NON-NLS-1$
18	18
...	...
32	32	}
33	33
34	34	@Override
35		public Query setQuery(String rawQuery) {
	35	public IQuery setQuery(String rawQuery) {
36	36	query = rawQuery;
37	37	return this;
38	38	}
39	39
40	40	@Override
41		public Query fixQuery() {
	41	public IQuery fixQuery() {
42	42	return this;
43	43	}
44	44
...	...
48	48	}
49	49
50	50	@Override
51		public boolean equals(Query q) {
	51	public boolean equals(IQuery q) {
52	52	return this.getClass().equals(q.getClass()) && this.getQueryString().equals(q.getQueryString());
53	53	}
54	54	}

     import java.util.List;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.Selection;
     public class URSSelection extends Selection {
     	ArrayList<URSMatch> matches;
     	Query query;
     	IQuery query;
     	public URSSelection(Query query, ArrayList<URSMatch> matches2) {
     	public URSSelection(IQuery query, ArrayList<URSMatch> matches2) {
     		this.query = query;
     		matches = matches2;
+    	}
-...
+    	}
     	@Override
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return query;
+    	}

     import org.txm.core.results.TXMResult;
     import org.txm.objects.CorpusBuild;
     import org.txm.objects.Match;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.core.SearchEngine;
     import org.txm.searchengine.core.SearchEngineProperty;
     import org.txm.searchengine.core.Selection;
-...
+    	}
     	@Override
     	public Selection query(CorpusBuild corpus, Query query, String name, boolean saveQuery) throws Exception {
     	public Selection query(CorpusBuild corpus, IQuery query, String name, boolean saveQuery) throws Exception {
     		ArrayList<Element> elements = findAllInCorpus(0, URSCorpora.getCorpus(corpus), corpus, Unite.class, query.getQueryString());
     		ArrayList<URSMatch> matches = new ArrayList<URSMatch>();
-...
+    	}
     	@Override
     	public Query newQuery() {
     	public IQuery newQuery() {
     		return new URSQuery();
+    	}

     import org.txm.rcp.swt.widget.PropertiesSelector;
     import org.txm.rcp.swt.widget.ThresholdsGroup;
     import org.txm.rcp.views.QueriesView;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
     import org.txm.searchengine.cqp.corpus.Property;
-...
     	 * Gets the query of the query widget.
     	 * @return
     	 */
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return queryWidget.getQuery();
+    	}
+    }

     import org.txm.rcp.swt.widget.PropertiesSelector;
     import org.txm.rcp.swt.widget.ThresholdsGroup;
     import org.txm.rcp.views.QueriesView;
     import org.txm.searchengine.core.Query;
     import org.txm.searchengine.core.IQuery;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.CQPCorpus;
     import org.txm.searchengine.cqp.corpus.Part;
-...
     		this.queryWidget.setText(query);
+    	}
     	public Query getQuery() {
     	public IQuery getQuery() {
     		return queryWidget.getQuery();
+    	}
+    }

Laboratoire ICAR » Plateforme TXM

Révision 2132