Changeset 0e576fc in flex_extract.git for source/python/classes/MarsRetrieval.py

Timestamp:

Oct 8, 2018, 3:44:58 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

0aaeb04

Parents:

ae88f7d

Message:

implemented extraction possibility of EA5 und CERA

File:

• source/python/classes/MarsRetrieval.py (modified) (3 diffs)

source/python/classes/MarsRetrieval.py

@@ -463 +463 @@
         # find all keys without a value and convert all other values to strings
         empty_keys = []
-        for key, value in attrs.itteritems():
+        for key, value in attrs.iteritems():
             if value == '':
                 empty_keys.append(str(key))
@@ -486 +486 @@
                 print("ERROR: ", e)
                 print('MARS Request failed!')
-            if not self.public and os.stat(target).st_size == 0:
-                print('MARS Request returned no data - please check request')
-                raise IOError
-            elif self.public and os.stat(target).st_size == 0:
-                print('Public MARS Request returned no data - '
-                      'please check request')
-                raise IOError
-            else:
-                raise IOError
+                if not self.public and os.stat(target).st_size == 0:
+                    print('MARS Request returned no data - '
+                          'please check request')
+                    raise IOError
+                elif self.public and os.stat(target).st_size == 0:
+                    print('Public MARS Request returned no data - '
+                          'please check request')
+                    raise IOError
+                else:
+                    raise IOError
         # MARS request via extra process in shell
         else:
@@ -515 +516 @@
                 print('MARS Request returned no data - please check request')
                 raise IOError
-            else:
-                raise
 
         return