Changeset 20890

Timestamp:

07/13/16 10:19:51 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed BinRead with new marshall files

File:

• issm/trunk-jpl/scripts/BinRead.py (modified) (3 diffs)

issm/trunk-jpl/scripts/BinRead.py

@@ -18 +18 @@
         while True:
                 try:
-                        #Step 1: read the enum to identify this record uniquely
-                        enum=struct.unpack('i',f.read(struct.calcsize('i')))[0]
+                        #Step 1: read size of record name
+                        recordnamesize=struct.unpack('i',f.read(struct.calcsize('i')))[0]
                 except struct.error as e:
                         print "probable EOF: %s" % e
                         break
-                print "\nenum = %d (%s)" % (enum,EnumToString(enum)[0])
+                print "\nrecordnamesize = \"%d\"" % (recordnamesize)
+                recordname=struct.unpack('%ds' % recordnamesize,f.read(recordnamesize))[0]
+                print "recordname = '%s'" % recordname
 
                 #Step 2: read the data itself.
@@ -110 +112 @@
 
                 else:
-                        raise TypeError('BinRead error message: data type: %d not supported yet! (%s)' % (code,EnumToString(enum)[0]))
+                        raise TypeError('BinRead error message: data type: %d not supported yet! (%s)' % (code,recordname))
 
         f.close()
@@ -163 +165 @@
 
         from MatlabFuncs import *
-        from EnumDefinitions import *
-        from EnumToString import EnumToString
 
         BinRead(args.filin, args.filout)