[Mpuls-commits] r914 - wasko/branches/2.0/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-01-26 18:11:16 +0100 (Tue, 26 Jan 2010)
New Revision: 914

Modified:
   wasko/branches/2.0/waskaweb/lib/evaluation.py
Log:
* waskaweb/lib/evaluation.py (Evaluation_14.perform): Call format_number
instead of formatNumber. Changed import from formatNumber to format_number


Modified: wasko/branches/2.0/waskaweb/lib/evaluation.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-01-26 17:08:40 UTC (rev 913)
+++ wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-01-26 17:11:16 UTC (rev 914)
@@ -30,7 +30,7 @@
 
 import psycopg2
 
-from waskaweb.lib.helpers import formatNumber, timedelta_in_minutes 
+from waskaweb.lib.helpers import format_number, timedelta_in_minutes 
 from waskaweb.lib.base import _, c, session
 from waskaweb.lib.db import db
 from waskaweb.lib.sql_helper import where_ids
@@ -208,17 +208,17 @@
                     divisor = 1
 
                 result['avg_cat1'][0] = count 
-                result['avg_cat1'][1] = formatNumber(float(result['sum_cat1'][1] / divisor))
+                result['avg_cat1'][1] = format_number(float(result['sum_cat1'][1] / divisor))
                 result['avg_cat2'][0] = count 
-                result['avg_cat2'][1] = formatNumber(float(result['sum_cat2'][1] / divisor))
+                result['avg_cat2'][1] = format_number(float(result['sum_cat2'][1] / divisor))
                 result['avg_cat3'][0] = count 
-                result['avg_cat3'][1] = formatNumber(float(result['sum_cat3'][1] / divisor))
+                result['avg_cat3'][1] = format_number(float(result['sum_cat3'][1] / divisor))
                 result['avg_cat4'][0] = count 
-                result['avg_cat4'][1] = formatNumber(float(result['sum_cat4'][1] / divisor))
+                result['avg_cat4'][1] = format_number(float(result['sum_cat4'][1] / divisor))
                 result['avg_cat5'][0] = count 
-                result['avg_cat5'][1] = formatNumber(float(result['sum_cat5'][1] / divisor))
+                result['avg_cat5'][1] = format_number(float(result['sum_cat5'][1] / divisor))
                 result['avg_all'][0] = count 
-                result['avg_all'][1] = formatNumber(float(result['sum_all'][1] / divisor))
+                result['avg_all'][1] = format_number(float(result['sum_all'][1] / divisor))
 
                 return result
             except StandardError, e: