Changeset 1614 for branches/alma/python/__init__.py

Timestamp:

08/06/09 15:48:39 (15 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-729, CAS-1147

Ready to Release: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: No

Module(s): Module Names change impacts.

Description: Describe your changes here...

1. Added level parameter to print_log()
2. Replaced casalog.post() to asaplog.push() + print_log().

File:

• branches/alma/python/__init__.py (modified) (5 diffs)

branches/alma/python/__init__.py

@@ -213 +213 @@
         if len(tup) !=2:
             #print ('Illegal line #%d\n\t%s\n\tin file "%s"' % (cnt, line, fname))
-            casalog.post('Illegal line #%d\n\t%s\n\tin file "%s"' % (cnt, line, fname), 'WARN')
+            asaplog.push('Illegal line #%d\n\t%s\n\tin file "%s"' % (cnt, line, fname))
+            print_log('WARN')
             continue
 
@@ -220 +221 @@
         if not defaultParams.has_key(key):
             #print ('Bad key "%s" on line %d in %s' % (key, cnt, fname))
-            casalog.post('Bad key "%s" on line %d in %s' % (key, cnt, fname), 'WARN')
+            asaplog.push('Bad key "%s" on line %d in %s' % (key, cnt, fname))
+            print_log('WARN')
             continue
 
@@ -231 +233 @@
         except ValueError, msg:
             #print ('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg))
-            casalog.post('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg), 'WARN')
+            asaplog.push('Bad val "%s" on line #%d\n\t"%s"\n\tin file "%s"\n\t%s' % (val, cnt, line, fname, msg))
+            print_log('WARN')
             continue
         else:
@@ -355 +358 @@
     asaplog.disable()
 
-def print_log():
+def print_log(level='INFO'):
     log = asaplog.pop()
     #if len(log) and rcParams['verbose']: print log
-    if len(log) and rcParams['verbose']: casalog.post( log )
+    if len(log) and rcParams['verbose']: casalog.post( log, priority=level )
     return
 
@@ -395 +398 @@
     except ImportError:
         #print "Matplotlib not installed. No plotting available"
-        casalog.post( "Matplotlib not installed. No plotting available", 'WARN' )
+        asaplog.post( "Matplotlib not installed. No plotting available")
+        print_log('WARN')
 
 __date__ = '$Date$'.split()[1]