OpenMRS

Timestamp:

08/18/08 18:27:47 (5 months ago)

Author:

vanand

Message:

openmrs-logic-api-refactoring: removed call to setRightOperand of LogicCriteria and the code for LogicQueryParser lives in logic folder

Files:

• openmrs/branches/logic-api-refactoring/src/api/org/openmrs/arden/ArdenRecognizer.g (modified) (3 diffs)

openmrs/branches/logic-api-refactoring/src/api/org/openmrs/arden/ArdenRecognizer.g

@@ -1135 +1135 @@
-;
-
-// test for Openmrs parser
-start_test 
-        :( (of_read_func_op) | (from_of_func_op (INTLIT )?) ) expr (temporal_comp_op iso_date_time) ?   SEMI!;
-
-/*************************************************************************************/
@@ -2099 +2096 @@
- 
- 
-//(of_read_func_op) | (from_of_func_op (INTLIT )?) expr (temporal_comp_op iso_date_time) ?      SEMI; 
- 
-start_test [LogicCriteria lc] returns [LogicCriteria lc_return = null]
-{String a = "", b="";
-Operator transform = null, comp_op = null, temporal_op = null;
-}
-:
-(
-        (transform = of_from_AST[lc])? 
-        (
-                #(ift:ID 
-                                      { a = ift.getText(); System.err.println("text = " + a);
-                                        lc.setRightOperand(ift.getText());
-                                        
-                                      }
-                                    
-                   )  
-                |
-                #(ifst:STRING_LITERAL 
-                                      { a = ifst.getText(); System.err.println("text = " + a);
-                                        lc.setRightOperand(ifst.getText());
-                                        
-                                      }
-                                    
-                   )
-                |
-                #(val:INTLIT
-                                      { a = val.getText(); System.err.println("text = " + a);
-                                        lc.setRightOperand(val.getText());
-                                      }
-                
-                )      
-        )       
-        (
-                (             
-                        comp_op = simple_comp_op_for_test[lc,a]  
-                        (
-                                #(idt:ID 
-                                              { b += idt.getText(); System.err.println("text = " + b);
-                                                LogicCriteria ac = new LogicCriteria(comp_op, b);
-                                                lc = lc.appendCriteria(Operator.AND, ac);
-                                                    //System.out.println(lc.toString()); 
-                                              }
-                                            
-                            )
-                            |
-                                #(idstr:STRING_LITERAL 
-                                                  { b += idstr.getText(); System.err.println("text = " + b);
-                                                        LogicCriteria ac = new LogicCriteria(comp_op, b);
-                                                lc = lc.appendCriteria(Operator.AND, ac);
-                                                    //System.out.println(lc.toString());
-                                                  }
-                                                    
-                                   )
-                                |
-                                #(valstr:INTLIT
-                                                  { b += valstr.getText(); System.err.println("text = " + b);
-                                                        LogicCriteria ac = new LogicCriteria(comp_op, b);
-                                                lc = lc.appendCriteria(Operator.AND, ac);
-                                                    //System.out.println(lc.toString());
-                                                  }
-                                
-                                )      
-                        )
-                ) ?
-                |
-                (
-                        temporal_op = temporal_comp_op_for_test[lc,a]  
-                        (
-                                {GregorianCalendar gc = new GregorianCalendar();} b = dateAST [gc] 
-                                                  { 
-                                                        LogicCriteria ac = new LogicCriteria(temporal_op, gc);
-                                                lc = lc.appendCriteria(Operator.AND, ac);
-                                                    System.out.println(gc.toString());
-                                                    {System.err.println("date = " + b);}
-                                                  }
-                                                 
-                                
-                                    
-                        )
-                )?
-        ) 
-        {
-                lc_return = lc.applyTransform(transform);
-                //System.out.println(lc_return.toString());
-                return lc_return;
-        }                      
-)
-;
-
-dateAST [GregorianCalendar calendar] returns [String s = ""]
@@ -2216 +2124 @@
-        ;
-
-simple_comp_op_for_test[LogicCriteria lc, String operand] returns [Operator s = null]
-{String a,b;}
-:
-(
-   #(EQUALS {
-                                System.err.println("Found = ");
-                                s = Operator.EQUALS;
-                        }
-         )
-        |
-        #(GTE {
-                                System.err.println("Found >= ");
-                                s = Operator.GTE;
-                        }
-         )
-         |
-         #(GT {
-                                System.err.println("Found > ");
-                                s = Operator.GT; 
-                        }
-         )
-         |
-         #(LT {
-                                System.err.println("Found < ");
-                                s = Operator.LT;
-                                 
-                        }
-         )
-         |
-         #(LTE {
-                                System.err.println("Found <= ");
-                                s = Operator.LTE; 
-                        }
-         )
-         #(NE {
-                                System.err.println("Found <> ");
-                                s = Operator.NOT_EXISTS; 
-                        }
-         )
-)
-;
-
-temporal_comp_op_for_test[LogicCriteria lc, String operand] returns [Operator s = null]
-{String a,b;}
-:
-(
-   #(BEFORE {
-                                System.err.println("Found BEFORE ");
-                                s = Operator.BEFORE;
-                        }
-         )
-        |
-        #(AFTER {
-                                System.err.println("Found AFTER ");
-                                s = Operator.AFTER;
-                        }
-         )
-         
-)
-;
-
-
-of_from_AST [LogicCriteria lc] returns [Operator s = null]
-{}
-:
-          ( (LAST | LATEST) 
-          {s = Operator.LAST; }
-          )
-          |
-          ( (FIRST | EARLIEST) 
-          {s = Operator.FIRST; }
-          )
-          |
-          ( (EXIST | EXISTS) 
-          {s = Operator.EXISTS; }
-          )
-           
-
-
-; 
- 
-
-/*************************************************************************************/