Changeset 31921

Timestamp:

Jul 22, 2011, 3:45:04 PM (15 years ago)

Author:

rhenders

Message:

changes to make this batch type work with new Batch class

File:

• trunk/ippToPsps/jython/initbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/initbatch.py

@@ -6 +6 @@
 from java.lang import *
 from java.sql import *
+
+from xml.etree.ElementTree import ElementTree, Element, tostring
+
 from batch import Batch
+from pslogger import PSLogger
+from gpc1db import Gpc1Db
+from ipptopspsdb import IppToPspsDb
+from stackbatch import StackBatch
+from detectionbatch import DetectionBatch
+
+
 
 '''
@@ -16 +26 @@
     Constructor
     '''
-    def __init__(self, logger):
-       super(InitBatch, self).__init__(logger, "init")
+    def __init__(self, logger, configDoc, gpc1Db, ippToPspsDb):
+       super(InitBatch, self).__init__(logger, configDoc, gpc1Db, ippToPspsDb, 0, "init", None)
 
        self.outputFitsFile = "00000000.FITS";
        self.outputFitsPath = self.localOutPath + "/" + self.outputFitsFile
 
+
+
+
+# set up logging
 logging.config.fileConfig("logging.conf")
-logger = logging.getLogger("initbatch")
-initBatch = InitBatch(logger)
+logging.setLoggerClass(PSLogger)
+logger = logging.getLogger("ippToPspsLog")
+logger.setLevel(logging.INFO)
+
+# open config file
+configDoc = ElementTree(file="config.xml")
+
+# create database objects
+gpc1Db = Gpc1Db(logger, configDoc)
+ippToPspsDb = IppToPspsDb(logger, configDoc)
+
+
+initBatch = InitBatch(logger, configDoc, gpc1Db, ippToPspsDb)
 initBatch.createEmptyPspsTables()
 initBatch.exportPspsTablesToFits()