Changeset 4817

Timestamp:

Nov 15, 2007, 11:20:04 AM (17 years ago)

Author:

ole

Message:

Fixed cachestat to recognise boolean values of the compression keyword.

File:

• anuga_core/source/anuga/caching/caching.py (modified) (4 diffs)

anuga_core/source/anuga/caching/caching.py

@@ -1775 +1775 @@
   import os
   import os.path
-  from string import split, rstrip, find, atof, atoi
+  from string import split, rstrip, find
   from time import strptime, localtime, strftime, mktime, ctime
 
@@ -1827 +1827 @@
       for record in A:
         record = tuple(split(rstrip(record),','))
-        #print record
-
-        if len(record) in [8,9]:
-          n = 0
-          timestamp = record[n]; n=n+1
+        #print record, len(record)
+
+        if len(record) == 9:
+          timestamp = record[0]
         
           try:
@@ -1844 +1843 @@
             firstday = t
 
-          user     = record[n]; n=n+1
-          func     = record[n]; n=n+1
+          user     = record[1]
+          func     = record[2]
 
           # Strip hash-stamp off 
@@ -1852 +1851 @@
           func = func[:i]
 
-          size        = atof(record[n]); n=n+1
-          compression = atoi(record[n]); n=n+1
-          hit         = atoi(record[n]); n=n+1
-          reason      = atoi(record[n]); n=n+1   # Not used here    
-          cputime     = atof(record[n]); n=n+1
-          loadtime    = atof(record[n]); n=n+1
+          size        = float(record[3])
+
+          # Compression kepword can be Boolean
+          if record[4] in ['True', '1']:
+            compression = 1
+          elif record[4] in ['False', '0']:  
+            compression = 0
+          else:
+            print 'Unknown value of compression', record[4]
+            print record
+            total_discarded = total_discarded + 1            
+            continue
+
+          #compression = int(record[4]) # Can be Boolean
+          hit         = int(record[5])
+          reason      = int(record[6])   # Not used here    
+          cputime     = float(record[7])
+          loadtime    = float(record[8])
 
           if hit: