dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9419
committer: Bob Jolliffe <bobjolliffe@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-01-02 19:10:00 +0000
message:
  Helping to identify period type for longer form of monthly period.
  
  Supports http://bazaar.launchpad.net/~dhis2-devs-core/dhis2/trunk/revision/8460.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java


--
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-api/src/main/java/org/hisp/dhis/period/PeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java	2012-11-26 12:54:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java	2013-01-02 19:10:00 +0000
@@ -278,7 +278,7 @@
         {
             return new YearlyPeriodType();
         }
-        if ( isoPeriod.matches( "\\b\\d{6}\\b" ) )
+        if ( isoPeriod.matches( "\\b\\d{4}[-]?\\d{2}\\b" ) )
         {
             return new MonthlyPeriodType();
         }