[jboss-svn-commits] JBL Code SVN: r5950 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang main/java/org/drools/xml test/resources/org/drools/integrationtests

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2006-08-19 21:46:08 -0400 (Sat, 19 Aug 2006)
New Revision: 5950

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl
Log:
JBRULES-393 Xml dump with illegal characters
-fixed by Javier Prieto

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java	2006-08-20 00:45:06 UTC (rev 5949)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java	2006-08-20 01:46:08 UTC (rev 5950)
@@ -324,6 +324,10 @@
 
     private String processParameters(final List parameterNames,
                                      final List parameterTypes) {
+        if ( parameterNames.isEmpty() ) {
+            return "";
+        }
+
         String paramList = "";
         int i = 0;
         for ( final Iterator it = parameterNames.iterator(); it.hasNext(); i++ ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java	2006-08-20 00:45:06 UTC (rev 5949)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlDumper.java	2006-08-20 01:46:08 UTC (rev 5950)
@@ -98,7 +98,7 @@
 
     public void visitFieldConstraintDescr(final FieldConstraintDescr descr) {
         if ( !descr.getRestrictions().isEmpty() ) {
-            processFieldConstraint( descr.getRestrictions() );
+            this.template = "<field-constraint field-name=\"" + descr.getFieldName() + "\"> " + processFieldConstraint( descr.getRestrictions() ) + "</field-constraint>";            
         }
     }
 
@@ -173,7 +173,7 @@
 
     public void visitReturnValueRestrictionDescr(final ReturnValueRestrictionDescr descr) {
         this.template = new String();
-        this.template = "<return-value-restriction evaluator=\"" + replaceIllegalChars( descr.getEvaluator() ) + "\" >" + replaceIllegalChars( descr.getText() ) + "</return-value>" + XmlDumper.eol;
+        this.template = "<return-value-restriction evaluator=\"" + replaceIllegalChars( descr.getEvaluator() ) + "\" >" + replaceIllegalChars( descr.getText() ) + "</return-value-restriction>" + XmlDumper.eol;
     }
 
     public void visitQueryDescr(final QueryDescr descr) {
@@ -212,9 +212,7 @@
         String descrString = "";
         for ( final Iterator it = list.iterator(); it.hasNext(); ) {
             final Object temp = it.next();
-            descrString += "<field-restrictions name=\"" + ((FieldConstraintDescr) temp).getFieldName() + "\"> ";
             visit( temp );
-            descrString += "</field-restrictions>";
             descrString += this.template;
         }
         return descrString.substring( 0,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl	2006-08-20 00:45:06 UTC (rev 5949)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Dumpers.drl	2006-08-20 01:46:08 UTC (rev 5950)
@@ -4,10 +4,17 @@
 
 global java.util.List list;
 
+function boolean testIllegalChars() {
+    return ( 3 < 4 && 4 > 3 );
+}
+
 rule "test MAIN 1"
 	salience  10
     when
-    	Cheese( )
+    	Cheese( $type : type -> ( 3 < 4 && 4 > 3 ),
+    	        price < ( new Integer( 100 ) ) )
+    	eval( 3 < 4 && 4 > 3 )
+        eval( testIllegalChars() )
     then
         // lets also make sure that special chars are converted
         if ( 3 < 4 && 4 > 3 ) {