Changeset 38990 for trunk/ippToPsps/jython/scratchdb.py

Timestamp:

Oct 28, 2015, 7:55:59 AM (11 years ago)

Author:

eugene

Message:

enable ohana fits_to_mysql

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (4 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -5 +5 @@
 import os
 import logging
+import tempfile
+from subprocess import call, PIPE, Popen
 
 from java.lang import *
@@ -809 +811 @@
     def loadFITStoMYSQL(self, filename, tablename):
 
+        self.logger.infoPair("starting loadFITStoMYSQL: ", filename)
+
         # TODO path to DVO prog hardcoded temporarily
-        cmd = "fits_to_mysql"
-        cmd += " -dbhost " + self.scratchDb.dbHost
-        cmd += " -dbname " + self.scratchDb.dbName
-        cmd += " -dbuser " + self.scratchDb.dbUser
-        cmd += " -dbpass " + self.scratchDb.dbPass
-        cmd += filename
+        cmd = "fits_to_mysql " + filename
+        cmd += " -dbhost " + self.dbHost
+        cmd += " -dbname " + self.dbName
+        cmd += " -dbuser " + self.dbUser
+        cmd += " -dbpass " + self.dbPass
+
+        self.logger.debugPair("preparing command: ", cmd)
 
         if tablename != "none":
@@ -822 +827 @@
         (stdoutFile, stdoutName) = tempfile.mkstemp(prefix="fits_to_mysql.stdout.", dir="/tmp")
         (stderrFile, stderrName) = tempfile.mkstemp(prefix="fits_to_mysql.stderr.", dir="/tmp")
+
+        self.logger.debugPair("generated tmpfiles: ", cmd)
 
         self.logger.infoPair("Running fits_to_mysql", cmd)
@@ -838 +845 @@
             os._exit(1)
 
-        os.close(loadFITStoMYSQL)
-        os.close(loadFITStoMYSQL)
+        os.close(stdoutFile)
+        os.close(stderrFile)