dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5361
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: dhis2
timestamp: Sun 2011-12-11 12:43:38 +0000
message:
  [mydatamart] Included '!' to the list of nasty characters to be sanitized in category names
modified:
  tools/datamart/mydatamart.vfs/libdhis/dhisdb/dhisdb.tcl
  tools/datamart/mydatamart.vfs/resource/xslt/functions.xsl
  tools/datamart/mydatamart.vfs/stats.tcl


--
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 'tools/datamart/mydatamart.vfs/libdhis/dhisdb/dhisdb.tcl'
--- tools/datamart/mydatamart.vfs/libdhis/dhisdb/dhisdb.tcl	2011-08-02 19:21:56 +0000
+++ tools/datamart/mydatamart.vfs/libdhis/dhisdb/dhisdb.tcl	2011-12-11 12:43:38 +0000
@@ -188,4 +188,9 @@
 	    }
 	}
     }
+
+    proc deleteValues {handle periodType level orgunit valueType from to} {
+	puts "delete old values"
+    }
+
 }

=== modified file 'tools/datamart/mydatamart.vfs/resource/xslt/functions.xsl'
--- tools/datamart/mydatamart.vfs/resource/xslt/functions.xsl	2011-09-11 21:58:32 +0000
+++ tools/datamart/mydatamart.vfs/resource/xslt/functions.xsl	2011-12-11 12:43:38 +0000
@@ -21,7 +21,7 @@
         <xsl:param name="raw"/>
         <xsl:variable name="tick">'</xsl:variable>
         <xsl:variable name="clean1"            
-            select="translate($raw,' .,-+:','______')" />
+            select="translate($raw,' .,-+:!','_______')" />
         <xsl:variable name="clean2"            
             select="translate($clean1,'/()','')" />
         <xsl:variable name="clean3" select="str:replace($clean2,'&lt;','_lt_')"/>

=== modified file 'tools/datamart/mydatamart.vfs/stats.tcl'
--- tools/datamart/mydatamart.vfs/stats.tcl	2011-11-29 15:33:50 +0000
+++ tools/datamart/mydatamart.vfs/stats.tcl	2011-12-11 12:43:38 +0000
@@ -190,7 +190,10 @@
 		    indicator {set valueTypeParam IndicatorValues}
 		}
 		
-		${::log}::debug "Downloading for $periodtype $valuetype"
+		# delete old values
+		dhisdb::deleteValues db $periodType $level $orgunit $valueType $from $to
+		
+		${::log}::debug "Downloading for $periodType $valueType"
 		set tok [::dhisweb::fetchValues $::dhis(url) $level $orgunit $valueTypeParam $periodtype $from $to db]
 		
 		if {$tok ne 0} {