Minor changes and bug fixes

Author: demiangomez

com/ArchiveService.py

@@ -124,7 +124,7 @@ def insert_station_w_lock(cnn, StationCode, filename, lat, lon, h, x, y, z, otl)
                        country_code=ISO3)
         except dbConnection.dbErrInsert as e:
             # another process did the insert before, ignore the error
-            file_append('errors_pyArchiveService.log',
+            file_append('errors_ArchiveService.log',
                         'ON ' + datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') +
                         ' an unhandled error occurred:\n' +
                         str(e) + '\n' +
@@ -142,10 +142,10 @@ def callback_handle(job):
 
     def log_job_error(msg):
         tqdm.write(' -- There were unhandled errors during this batch. '
-                   'Please check errors_pyArchiveService.log for details')
+                   'Please check errors_ArchiveService.log for details')
 
         # function to print any error that are encountered during parallel execution
-        file_append('errors_pyArchiveService.log',
+        file_append('errors_ArchiveService.log',
                     'ON ' + datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') +
                     ' an unhandled error occurred:\n' +
                     msg + '\n' +
@@ -414,7 +414,6 @@ def fill_event(ev, desc = None):
 
                 # check for unreasonable heights
                 if ppp.h[0] > 9000 or ppp.h[0] < -400:
-                    cnn.close()
                     raise pyRinex.pyRinexException(os.path.relpath(crinez, Config.repository_data_in) +
                                                    ' : unreasonable geodetic height (%.3f). '
                                                    'RINEX file will not enter the archive.' % (ppp.h[0]))
@@ -442,7 +441,6 @@ def fill_event(ev, desc = None):
                                os.path.join(retry_folder, filename),
                                os.path.join(retry_folder, filename.replace(StationCode, match[0]['StationCode'])),
                                StationCode, ppp.x, ppp.y, ppp.z, ppp.lat[0], ppp.lon[0], ppp.h[0])
-                    cnn.close()
                     raise pyPPP.pyRunPPPExceptionCoordConflict(error)
 
                 elif len(match) > 1:
@@ -464,7 +462,6 @@ def fill_event(ev, desc = None):
                                ', '.join(['%s.%s: %.3f m' %
                                           (m['NetworkCode'], m['StationCode'], m['distance']) for m in match]),
                                StationCode, ppp.x, ppp.y, ppp.z, ppp.lat[0], ppp.lon[0], ppp.h[0])
-                    cnn.close()
                     raise pyPPP.pyRunPPPExceptionCoordConflict(error)
 
                 else:
@@ -767,7 +764,7 @@ def main():
                              depfuncs,
                              callback_handle,
                              pbar,
-                             modules=('pgamit.pyRinex', 'pgamit.pyArchiveStruct', 'pgamit.pyOTL',
+                             modules=('pgamit.pyRinex', 'pgamit.pyArchiveStruct', 'pgamit.pyOTL', 'pgamit.pyPPP',
                                       'pgamit.pyStationInfo', 'pgamit.dbConnection', 'pgamit.Utils', 'pgamit.pyDate',
                                       'pgamit.pyProducts', 'pgamit.pyOptions', 'pgamit.pyEvents', 'pgamit.pyRinexName',
                                       'os', 'uuid', 'datetime', 'numpy', 'traceback', 'platform'))

pgamit/pyArchiveStruct.py

@@ -41,8 +41,8 @@ def __init__(self, cnn, path_cfg=''):
 
         self.keys     = cnn.query('SELECT * FROM keys').dictresult()
         # read the station and network tables
-        self.networks = cnn.query('SELECT * FROM networks').dictresult()
-        self.stations = cnn.query('SELECT * FROM stations').dictresult()
+        # self.networks = cnn.query('SELECT * FROM networks').dictresult()
+        # self.stations = cnn.query('SELECT * FROM stations').dictresult()
 
         self.Config = pyOptions.ReadOptions(os.path.join(path_cfg, 'gnss_data.cfg'))
 

pgamit/pyJobServer.py

@@ -18,7 +18,7 @@
 import dispy
 import dispy.httpd
 
-DELAY = 45
+DELAY = 60
 
 
 def test_node(check_gamit_tables=None, check_archive=True, check_executables=True, check_atx=True, software_sync=()):

pgamit/pyRinex.py

@@ -569,7 +569,7 @@ def ConvertRinex(self, to_version):
             # most programs still don't support RINEX 3 (partially implemented in this code)
             # convert to RINEX 2.11 using gfzrnx_lx
             cmd = pyRunWithRetry.RunCommand('gfzrnx_lx -finp %s -fout %s.t -vo %i -f'
-                                            % (self.rinex, self.rinex, to_version), 15, self.rootdir)
+                                            % (self.rinex, self.rinex, to_version), 45, self.rootdir)
 
             _, err = cmd.run_shell()
 
@@ -1574,7 +1574,7 @@ def __add__(self, other):
         #                                 % (f1.rinex_path, f1.rinex_path, f2.rinex_path), 5)
         cmd = pyRunWithRetry.RunCommand('gfzrnx_lx -finp %s %s -fout %s -vo %i'
                                         % (f1.rinex_path, f2.rinex_path, f1.rinex_path + '.t',
-                                           int(self.rinex_version * 10) / 10), 15)
+                                           int(self.rinex_version * 10) / 10), 45)
         # leave errors un-trapped on purpose (will raise an error to the parent)
         out, err = cmd.run_shell()