Changeset 31183

Timestamp:

Apr 5, 2011, 4:00:21 PM (15 years ago)

Author:

rhenders

Message:

Changing name of gpc1 database class

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (2 diffs)
• gpc1.py (deleted)
• gpc1db.py (added)
• stackbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/batch.py

@@ -6 +6 @@
 import sys
 
-from gpc1 import Gpc1
+from gpc1db import Gpc1Db
 
 from java.lang import *
@@ -47 +47 @@
 
         # create Gpc1 object
-        self.gpc1 = Gpc1()
+        self.gpc1Db = Gpc1Db()
 
         # set up JDBC connection to gpc1 Db

trunk/ippToPsps/jython/stackbatch.py

@@ -5 +5 @@
 from java.sql import *
 
-from gpc1 import Gpc1
+from gpc1db import Gpc1Db
 from batch import Batch
 
@@ -398 +398 @@
 
 sky_id = 299
-gpc1 = Gpc1()
-cmfFiles = gpc1.getStackStageCmfs(sky_id)
+gpc1Db = Gpc1Db()
+cmfFiles = gpc1Db.getStackStageCmfs(sky_id)
 
 i = 0
@@ -406 +406 @@
     stackBatch = StackBatch(sky_id, file)
     stackBatch.createEmptyPspsTables()
-    stackBatch.importIppTables(".*psf")
+    stackBatch.importIppTables("")
     stackBatch.populatePspsTables()
     stackBatch.reportNullsInAllPspsTables(False)