Index: trunk/ippToPsps/jython/queue.py
===================================================================
--- trunk/ippToPsps/jython/queue.py	(revision 33787)
+++ trunk/ippToPsps/jython/queue.py	(revision 35097)
@@ -29,19 +29,19 @@
         # create various objects
         self.gpc1Db = Gpc1Db(self.logger, self.config)
-        self.datastore = Datastore(self.logger, self.config, self.ippToPspsDb)
+        self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
+
         try:
-            self.dvoObjects = DvoObjects(self.logger, self.config)
+            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb)
         except:
             self.exitProgram("Unable to create instance of DvoObject")
             raise
 
-        self.config.printAll()
+        self.skychunk.printAll()
 
         if len(argv) > 2: self.parsePollTimeArg(sys.argv[2])
-    
 
     '''
     Main processing loop.
-    Tiled area is defined in config and looks for available stage_ids for each tile and writes them to ippToPsps database ready for processing
+    Tiled area is defined in 'skychunk' and looks for available stage_ids for each tile and writes them to ippToPsps database ready for processing
     by one or more loading clients that may be running on any host
     '''
@@ -54,5 +54,5 @@
         
             # queue up batches that are processed but not loaded to datastore
-            for batchType in self.config.batchTypes: 
+            for batchType in self.skychunk.batchTypes: 
 
                 self.logger.infoTitle("Previous failed datastore loads")
@@ -64,10 +64,11 @@
 
                 # for object batches, get full list of stuff from Dvo
+                # XXX : need to fix 'dvo.setSkyArea' or this may not return the full list for a parallel dvo
                 if batchType == "OB":
                     self.dvoObjects.setSkyArea(
-                            self.config.minRa,
-                            self.config.maxRa,
-                            self.config.minDec,
-                            self.config.maxDec)
+                            self.skychunk.minRa,
+                            self.skychunk.maxRa,
+                            self.skychunk.minDec,
+                            self.skychunk.maxDec)
                     rows = self.dvoObjects.allPopulatedRegionInfo
                     self.dvoObjects.printSummary()
@@ -76,10 +77,13 @@
                 else:
                     rows = self.gpc1Db.getItemsInThisDVODbForThisStage(
-                            self.config.dvoLabel, 
+                            self.skychunk.dvoLabel, 
                             batchType, 
-                            self.config.minRa, 
-                            self.config.maxRa, 
-                            self.config.minDec, 
-                            self.config.maxDec)
+                            self.skychunk.minRa, 
+                            self.skychunk.maxRa, 
+                            self.skychunk.minDec, 
+                            self.skychunk.maxDec)
+
+                # EAM TEST I/O
+                self.logger.infoPair("received rows from db:", len(rows))
 
                 # first report total stuff
@@ -104,5 +108,5 @@
                 self.ippToPspsDb.storeAllItems(pending)
 
-                # loop through full range of RA/Dec queueing stuff in boxes of size self.config.boxSize
+                # loop through full range of RA/Dec queueing stuff in boxes of size self.skychunk.boxSize
                 if len(ids) > 0:
 
@@ -112,9 +116,9 @@
     
                     # starting positions
-                    ra = self.config.minRa + self.config.halfBox
-                    dec = self.config.minDec + self.config.halfBox
+                    ra = self.skychunk.minRa + self.skychunk.halfBox
+                    dec = self.skychunk.minDec + self.skychunk.halfBox
     
-                    while ra <= self.config.maxRa:
-                       while dec <= self.config.maxDec:
+                    while ra <= self.skychunk.maxRa:
+                       while dec <= self.skychunk.maxDec:
             
                            box_id = self.ippToPspsDb.insertBox(ra, dec)
@@ -125,12 +129,12 @@
                                        ra, 
                                        dec, 
-                                       self.config.boxSize, 
+                                       self.skychunk.boxSize, 
                                        len(ids)))
                 
                            if len(ids) > 0: self.ippToPspsDb.insertPending(box_id, batchType, ids)
 
-                           dec = dec + self.config.boxSize
-                       dec = self.config.minDec + self.config.halfBox
-                       ra = ra + self.config.boxSize
+                           dec = dec + self.skychunk.boxSize
+                       dec = self.skychunk.minDec + self.skychunk.halfBox
+                       ra = ra + self.skychunk.boxSize
             
                 self.logger.info("+-------------+-------------+-------------+-------------+")
@@ -150,5 +154,5 @@
     
             batchName = Batch.getNameFromID(batchID)
-            subDir = Batch.getSubDir(self.config.basePath, batchType, self.config.dvoLabel)
+            subDir = Batch.getSubDir(self.skychunk.basePath, batchType, self.skychunk.dvoLabel)
             tarballFile = Batch.getTarballFile(batchID)
             self.logger.infoPair("Batch name", batchName)