dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08977
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2284: Simplified formula regex
------------------------------------------------------------
revno: 2284
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2010-12-05 18:38:27 +0100
message:
Simplified formula regex
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java 2010-12-04 01:31:11 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java 2010-12-05 17:38:27 +0000
@@ -73,11 +73,9 @@
private static final String NULL_REPLACEMENT = "0";
private static final String SPACE = " ";
- private static final String FORMULA_EXPRESSION = "(\\[\\d+\\" + SEPARATOR + "\\d+\\])";
- private static final String DESCRIPTION_EXPRESSION = "\\[.+?\\" + SEPARATOR + ".+?\\]";
+ private static final String FORMULA_EXPRESSION = "\\[.+?\\]";
private final Pattern FORMULA_PATTERN = Pattern.compile( FORMULA_EXPRESSION );
- private final Pattern DESCRIPTION_PATTERN = Pattern.compile( DESCRIPTION_EXPRESSION );
// -------------------------------------------------------------------------
// Dependencies
@@ -193,7 +191,7 @@
while ( matcher.find() )
{
String match = matcher.group();
-
+
final DataElementOperand operand = DataElementOperand.getOperand( match );
final Integer mappedDataElementId = dataElementMapping.get( operand.getDataElementId() );
@@ -253,7 +251,7 @@
StringBuffer buffer = new StringBuffer();
- final Matcher matcher = DESCRIPTION_PATTERN.matcher( formula );
+ final Matcher matcher = FORMULA_PATTERN.matcher( formula );
int dataElementId = -1;
int categoryOptionComboId = -1;
@@ -321,7 +319,7 @@
{
buffer = new StringBuffer();
- final Matcher matcher = DESCRIPTION_PATTERN.matcher( formula );
+ final Matcher matcher = FORMULA_PATTERN.matcher( formula );
while ( matcher.find() )
{
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java 2010-06-03 17:31:53 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java 2010-12-05 17:38:27 +0000
@@ -176,7 +176,6 @@
final IndicatorType type = new IndicatorType();
indicator.setIndicatorType( type );
-
indicator.setId( Integer.parseInt( values.get( FIELD_ID ) ) );
indicator.setUuid( values.get( FIELD_UUID ) );
indicator.setName( values.get( FIELD_NAME ) );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml 2010-09-17 21:30:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml 2010-12-05 17:38:27 +0000
@@ -574,9 +574,9 @@
<description>DescriptionA</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -584,9 +584,9 @@
<description>DescriptionB</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -594,9 +594,9 @@
<description>DescriptionC</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
</validationRules>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml 2010-02-19 18:38:02 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml 2010-12-05 17:38:27 +0000
@@ -554,9 +554,9 @@
<description>DescriptionA</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -564,9 +564,9 @@
<description>DescriptionB</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -574,9 +574,9 @@
<description>DescriptionC</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
</validationRules>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz'
Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz 2010-02-19 18:38:02 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz 2010-12-05 17:38:27 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip'
Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip 2010-01-19 14:24:53 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip 2010-12-05 17:38:27 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml 2010-09-13 10:47:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml 2010-12-05 17:38:27 +0000
@@ -974,9 +974,9 @@
<description>DescriptionA</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -984,9 +984,9 @@
<description>DescriptionB</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -994,9 +994,9 @@
<description>DescriptionC</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -1004,9 +1004,9 @@
<description>DescriptionD</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -1014,9 +1014,9 @@
<description>DescriptionE</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
</validationRules>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml 2010-09-13 10:47:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml 2010-12-05 17:38:27 +0000
@@ -974,9 +974,9 @@
<description>DescriptionA2</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -984,9 +984,9 @@
<description>DescriptionB2</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -994,9 +994,9 @@
<description>DescriptionC2</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -1004,9 +1004,9 @@
<description>DescriptionD</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
<validationRule>
@@ -1014,9 +1014,9 @@
<description>DescriptionE</description>
<type>absolute</type>
<operator>equal_to</operator>
- <leftSideExpression>[A.65]+[B.65]</leftSideExpression>
+ <leftSideExpression>[65.65]+[66.65]</leftSideExpression>
<leftSideDescription>DescriptionA</leftSideDescription>
- <rightSideExpression>[A.65]+[B.65]</rightSideExpression>
+ <rightSideExpression>[65.65]+[66.65]</rightSideExpression>
<rightSideDescription>DescriptionA</rightSideDescription>
</validationRule>
</validationRules>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-12-02 14:48:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-12-05 17:38:27 +0000
@@ -421,17 +421,20 @@
#-- Indicator ----------------------------------------------------------------------#
-expression = Expression
-left_expression = Left Expression
-right_expression = Right Expression
-indicator_type = Indicator Type
-annualized = Annualized
-aggregation_operator = Aggregation operator
-numerator = Numerator
-numerator_formula = Numerator formula
-numerator_description = Numerator description
-numerator_aggregation_operator = Numerator aggregation operator
-denominator = Denominator
-denominator_formula = Denominator formula
-denominator_description = Denominator description
-denominator_aggregation_operator = Denominator aggregation operator
+expression = Expression
+left_expression = Left Expression
+right_expression = Right Expression
+indicator_type = Indicator Type
+annualized = Annualized
+aggregation_operator = Aggregation operator
+numerator = Numerator
+numerator_formula = Numerator formula
+numerator_description = Numerator description
+numerator_aggregation_operator = Numerator aggregation operator
+denominator = Denominator
+denominator_formula = Denominator formula
+denominator_description = Denominator description
+denominator_aggregation_operator = Denominator aggregation operator
+category_option_combo_does_not_exist = Category option combo does not exist
+data_element_does_not_exist = Data element does not exist
+
