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

tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/CQLQuery.java (revision 1153)
77	77	* Instantiates a new query.
78	78	*/
79	79	protected CQLQuery() {
	80	this.queryString = "";
80	81	}
81	82
82	83	/**
...	...
139	140	*
140	141	* @return the query string
141	142	*/
142		public String getQueryString() {
	143	public final String getQueryString() {
143	144	return queryString;
144	145	}
145	146

     	 */
     	public QueryFocus(Focus focus) {
     		this.focus = focus;
     		this.queryString = focus.getQueryString();
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.searchengine.cqp.corpus.query.Query#getQueryString()
     	 */
     	@Override
     	public String getQueryString() {
     		return this.focus.getQueryString();
+    	}
     //	/* (non-Javadoc)
     //	 * @see org.txm.searchengine.cqp.corpus.query.Query#getQueryString()
     //	 */
     //	@Override
     //	public String getQueryString() {
     //		return this.focus.getQueryString();
     //	}
+    }

     		queryString = query.toString();
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see org.txm.searchengine.cqp.corpus.query.Query#getQueryString()
     	 */
     	/*
     	 * Produce a query such as: [_.struct_property="value"] expand to struct
+    	 *
     	 * OLD VERSION: /region[TEI_type,a]::a.TEI_type="value"
     	 */
     	@Override
     	public String getQueryString() {
     		return queryString;
     		// another way to query parts less restrictif but missleading
     		//return String.format("[_.%s=\"%s\"] expand to %s", tag, value, structure.getName());
+    	}
     //	/*
     //	 * (non-Javadoc)
     //	 *
     //	 * @see org.txm.searchengine.cqp.corpus.query.Query#getQueryString()
     //	 */
     //	/*
     //	 * Produce a query such as: [_.struct_property="value"] expand to struct
     //	 *
     //	 * OLD VERSION: /region[TEI_type,a]::a.TEI_type="value"
     //	 */
     //	@Override
     //	public String getQueryString() {
     //		return queryString;
     //
     //		// another way to query parts less restrictif but missleading
     //		//return String.format("[_.%s=\"%s\"] expand to %s", tag, value, structure.getName());
     //	}
+    }

     	@Override
     	public String toString() {
     		if (this.userName != null) {
     		if (!this.userName.isEmpty()) {
     			return this.userName;
+    		}
     		return super.toString();

     	/**
     	 * To determine what kind of parameters has been changed between to computing/rendering and do only computing, rendering or both.
     	 */
     	public final int COMPUTING = 0, RENDERING = 1;
     	public final int COMPUTING = 0, RENDERING = 1, INTERNAL = 3;
     	/**
     	 * String representation of the types for logging purpose.
     	 */
     	public final String[] types = {"Computing", "Rendering"}; //$NON-NLS-1$
     	public final String[] types = {"Computing", "Rendering", "Internal"}; //$NON-NLS-1$
     	/**
     	 * The parameter key name. If filled with some preference key, it can be used to automatically load or save parameters from and to the preferences nodes.

     	/**
     	 * The visibility state.
     	 */
     	protected boolean visible;
     	@Parameter(key=TXMPreferences.VISIBLE, type=Parameter.INTERNAL)
     	private Boolean visible;
     	/**
     	 * The user name (to rename a result).
     	 */
     	@Parameter(key=TXMPreferences.USER_NAME, type=Parameter.INTERNAL)
     	protected String userName;
     	/**
     	 *  To store the simple name for unserialization and lazy loading.
     	 */
     	@Parameter(key=TXMPreferences.LAZY_NAME, type=Parameter.INTERNAL)
     	protected String lazyName;
-...
     		Log.finest("TXMResult.TXMResult(): command preferences node path: " + this.commandPreferencesNodePath);
     		this.visible = true;
     		this.dirty = true;
     		this.internalPersistable = false;
     		this.userPersistable = TBXPreferences.getInstance().getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED);
-...
+    			}
+    		}
     		// retrieving user name
     		if (!this.getStringParameterValue(TXMPreferences.USER_NAME).isEmpty()) {
     			this.userName = this.getStringParameterValue(TXMPreferences.USER_NAME);
+    		}
     		// retrieving lazy name
     		if (!this.getStringParameterValue(TXMPreferences.LAZY_NAME).isEmpty()) {
     			this.lazyName = this.getStringParameterValue(TXMPreferences.LAZY_NAME);
+    		}
     		// retrieving visibility state
     		if (this.parameterExists(TXMPreferences.VISIBLE)) {
     			this.visible = this.getBooleanParameterValue(TXMPreferences.VISIBLE);
+    		}
     		else	{
     			this.visible = true;
+    		}
     		// loads parameters from local result node, current command preferences or default command preferences
     		try {
     			this.autoLoadParametersFromAnnotations(); // auto fill from Parameter annotations
-...
     		// internal data to save for unserialization
     		this.saveParameter("class", this.getClass().getName()); //$NON-NLS-1$
     		// store the user name if exists, otherwise the simple name as lazy name (to display something at reloading otherwise the simple name can leads to error because the result is not computed until it will be reopen)
     		if (this.userName != null)	{
     			this.saveParameter(TXMPreferences.USER_NAME, this.userName);
+    		}
     		this.saveParameter(TXMPreferences.LAZY_NAME, this.getSimpleName());
     		this.saveParameter(TXMPreferences.VISIBLE, this.visible);
     		this.saveParameter(TXMPreferences.RESULT_PARAMETERS_NODE_PATH, this.parametersNodePath);
     		this.saveParameter(TXMPreferences.RESULT_UUID, this.uniqueID);
-...
     	 * @throws Exception
     	 */
     	protected boolean autoLoadParametersFromAnnotations() throws Exception {
     		return this.autoLoadParametersFromAnnotations(Parameter.COMPUTING);
     		return this.autoLoadParametersFromAnnotations(Parameter.COMPUTING) && this.autoLoadParametersFromAnnotations(Parameter.INTERNAL);
+    	}
     	/**
-...
     	 * @return the current name
     	 */
     	public String getCurrentName() {
     		if (this.userName != null) {
     		if (this.userName.length() > 0) {
     			return this.userName;
+    		}
     		else if (this.lazyName != null) {

     	 */
     	public Edition(Text text) {
     		super(text);
     		this.visible = false;
     		this.setVisible(false);
     		this.internalPersistable = true;
+    	}
-...
     	 */
     	public Edition(String parametersNodePath) {
     		super(parametersNodePath);
     		this.visible = false;
     		this.setVisible(false);
     		this.internalPersistable = true;
+    	}

     		try {
     			if(!this.getStringParameterValue(ConcordancePreferences.QUERY).isEmpty())	{
     				this.setQuery(this.getStringParameterValue(ConcordancePreferences.QUERY));
+    			}
     			this.setQuery(this.getStringParameterValue(ConcordancePreferences.QUERY));
     			this.setCQLSeparator(this.getCorpus().getCQLLimitQuery());
-...
     	@Override
     	public boolean canCompute() {
     		boolean go = true;
     		if(this.getCorpus() == null)	{
     			System.err.println("Concordance.canCompute(): Corpus is not set.");
     			return false;
     			go = false;
+    		}
     		if(pQuery == null || pQuery.isEmpty())	{
     			System.err.println("Concordance.canCompute(): Query is not set or empty.");
     			return false;
     			go = false;
+    		}
     		return true;
     		return go;
+    	}
     	@Override

     	@Override
     	public String getLabel(Object result) {
     		if (result instanceof TXMResult) {
     			String star = ((TXMResult) result).isUserPersistable()?"":" *";
     			String star = (((TXMResult) result).isInternalPersistable() || ((TXMResult) result).isUserPersistable())?"":" *";
     			return ((TXMResult) result).getCurrentName()+star;
+    		}
     		else {

     				f.setAccessible(true);
     				Object object = f.get(this);
     				Object value = this.getResult().getParameter(parameter.key(), true); // propagate to parent one time
     				if (value == null) {
     					//System.out.println("Warning: "+this.getPartName()+" result "+this.getResult()+" "+parameter.key()+" is not initialized.");
     					continue; // not initialized
+    				}
     				if(object instanceof ToolItem)	{
     					((ToolItem)object).setSelection((Boolean) value);
+    				}

Laboratoire ICAR » Plateforme TXM

Révision 1153