lucene-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject cvs commit: jakarta-lucene/src/java/org/apache/lucene/queryParser QueryParser.jj
Date Sun, 23 Feb 2003 08:51:33 GMT
otis        2003/02/23 00:51:33

  Modified:    src/java/org/apache/lucene/queryParser QueryParser.jj
  Log:
  - Indentation (4 -> 2, to fit the rest).
  
  Revision  Changes    Path
  1.26      +41 -44    jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj
  
  Index: QueryParser.jj
  ===================================================================
  RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- QueryParser.jj	23 Jan 2003 02:03:55 -0000	1.25
  +++ QueryParser.jj	23 Feb 2003 08:51:33 -0000	1.26
  @@ -157,29 +157,27 @@
     /** Gets the default slop for phrases. */
     public int getPhraseSlop() { return phraseSlop; }
   
  -    // CODE ADDED BY PETER HALACSY
  +  public static final int DEFAULT_OPERATOR_OR  = 0;
  +  public static final int DEFAULT_OPERATOR_AND = 1;
   
  -    public static final int DEFAULT_OPERATOR_OR  = 0;
  -    public static final int DEFAULT_OPERATOR_AND = 1;
  +  /** The actual operator that parser uses to combine query terms */
  +  private int operator = DEFAULT_OPERATOR_OR;
   
  -    /** The actual operator that parser uses to combine query terms */
  -    private int operator = DEFAULT_OPERATOR_OR;
  -
  -    /**
  -     * Set the boolean operator of the QueryParser.
  -     * In classic mode (<code>DEFAULT_OPERATOR_OR</mode>) terms without any
modifiers
  -     * are considered optional: for example <code>capital of Hungary</code>
is equal to
  -     * <code>capital OR of OR Hungary</code>.<br/>
  -     * In <code>DEFAULT_OPERATOR_AND</code> terms are considered to be in conjuction:
the
  -     * above mentioned query is parsed as <code>capital AND of AND Hungary</code>
  -     */
  -    public void setOperator(int operator) {
  -	this.operator = operator;
  -    }
  -
  -    public int getOperator() {
  -	return this.operator;
  -    }
  +  /**
  +   * Set the boolean operator of the QueryParser.
  +   * In classic mode (<code>DEFAULT_OPERATOR_OR</mode>) terms without any modifiers
  +   * are considered optional: for example <code>capital of Hungary</code> is
equal to
  +   * <code>capital OR of OR Hungary</code>.<br/>
  +   * In <code>DEFAULT_OPERATOR_AND</code> terms are considered to be in conjuction:
the
  +   * above mentioned query is parsed as <code>capital AND of AND Hungary</code>
  +   */
  +  public void setOperator(int operator) {
  +    this.operator = operator;
  +  }
  +
  +  public int getOperator() {
  +    return this.operator;
  +  }
   
     private void addClause(Vector clauses, int conj, int mods, Query q) {
       boolean required, prohibited;
  @@ -191,17 +189,16 @@
         if (!c.prohibited)
           c.required = true;
       }
  -    // THIS CODE ADDED PETER HALACSY
  +
       if (operator == DEFAULT_OPERATOR_AND && conj == CONJ_OR) {
  -	// If this term is introduced by OR, make the preceding term optional,
  -	// unless it's prohibited (that means we leave -a OR b but +a OR b-->a OR b)
  -	// notice if the input is a OR b, first term is parsed as required; without
  -	// this modification a OR b would parsed as +a OR b
  -	BooleanClause c = (BooleanClause) clauses.elementAt(clauses.size()-1);
  +      // If this term is introduced by OR, make the preceding term optional,
  +      // unless it's prohibited (that means we leave -a OR b but +a OR b-->a OR b)
  +      // notice if the input is a OR b, first term is parsed as required; without
  +      // this modification a OR b would parsed as +a OR b
  +      BooleanClause c = (BooleanClause) clauses.elementAt(clauses.size()-1);
         if (!c.prohibited)
  -          c.required = false;
  +        c.required = false;
       }
  -    // THIS CODE ADDED BY PETER HALACSY
   
       // We might have been passed a null query; the term might have been
       // filtered away by the analyzer.
  @@ -209,21 +206,21 @@
         return;
   
       if (operator == DEFAULT_OPERATOR_OR) {
  -	// THIS IS THE ORIGINAL CODE
  -        // We set REQUIRED if we're introduced by AND or +; PROHIBITED if
  -        // introduced by NOT or -; make sure not to set both.
  -	prohibited = (mods == MOD_NOT);
  -	required = (mods == MOD_REQ);
  -	if (conj == CONJ_AND && !prohibited) {
  -	    required = true;
  -	}
  -     } else {
  -	 // THIS CODE ADDED BY PETER HALACSY
  -	 // We set PROHIBITED if we're  introduced by NOT or -; We set REQUIRED
  -	 // if not PROHIBITED and not introduced by OR
  -	 prohibited = (mods == MOD_NOT);
  -	 required   = (!prohibited && conj != CONJ_OR);
  -	}
  +      // THIS IS THE ORIGINAL CODE
  +      // We set REQUIRED if we're introduced by AND or +; PROHIBITED if
  +      // introduced by NOT or -; make sure not to set both.
  +      prohibited = (mods == MOD_NOT);
  +      required = (mods == MOD_REQ);
  +      if (conj == CONJ_AND && !prohibited) {
  +        required = true;
  +      }
  +    } else {
  +      // THIS CODE ADDED BY PETER HALACSY
  +      // We set PROHIBITED if we're introduced by NOT or -; We set REQUIRED
  +      // if not PROHIBITED and not introduced by OR
  +      prohibited = (mods == MOD_NOT);
  +      required   = (!prohibited && conj != CONJ_OR);
  +    }
       clauses.addElement(new BooleanClause(q, required, prohibited));
     }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lucene-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: lucene-dev-help@jakarta.apache.org


Mime
View raw message