Changeset 2751 for trunk/python

Timestamp:

01/30/13 13:42:55 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Update is_scantable.

File:

• trunk/python/scantable.py (modified) (2 diffs)

trunk/python/scantable.py

@@ -2 +2 @@
 
 import os
+import re
 import tempfile
 import numpy
@@ -45 +46 @@
         l=f.readline()
         f.close()
-        if ( l.find('Scantable') != -1 ):
+        match_pattern = '^Type = Scantable *$'
+        unmatch_pattern = '^Type = (MeasurementSet|Image|ApplyTable) *$'
+        #if ( l.find('Scantable') != -1 ):
+        if re.match(match_pattern,l):
             return True
-        elif ( l.find('Measurement Set') == -1 and 
-               l.find('Image') == -1 ):
+        #elif ( l.find('Measurement Set') == -1 and
+        #       l.find('Image') == -1):
+        elif re.match(unmatch_pattern,l) is None:
             return True
         else: