Index: trunk/ippToPsps/jython/ipptopsps.py
===================================================================
--- trunk/ippToPsps/jython/ipptopsps.py	(revision 31844)
+++ trunk/ippToPsps/jython/ipptopsps.py	(revision 31845)
@@ -8,4 +8,5 @@
 from xml.etree.ElementTree import ElementTree, Element, tostring
 
+from pslogger import PSLogger
 from gpc1db import Gpc1Db
 from ipptopspsdb import IppToPspsDb
@@ -21,4 +22,5 @@
 
 logging.config.fileConfig("logging.conf")
+logging.setLoggerClass(PSLogger)
 logger = logging.getLogger("ippToPspsLog")
 logger.setLevel(logging.INFO)
@@ -27,27 +29,34 @@
 dvoGpc1Label = configDoc.find("dvo/gpc1Label").text
 
-gpc1Db = Gpc1Db(logger)
-ippToPspsDb = IppToPspsDb(logger)
+gpc1Db = Gpc1Db(logger, configDoc)
+ippToPspsDb = IppToPspsDb(logger, configDoc)
 POLLPERIOD = 600
 FORCE = int(configDoc.find("options/force").text)
 TEST = int(configDoc.find("options/testMode").text)
 EPOCH = configDoc.find("options/epoch").text
+PUBLISH = int(configDoc.find("options/publishToDatastore").text)
 
-logger.info("--------------------------------------------------------------------------")
-logger.info("")
-logger.info("Batch type              " + batchType)
-logger.info("Loading epoch           " + EPOCH)
-logger.info("Forcing?                %d" % FORCE)
-logger.info("DVO gpc1 label          " + dvoGpc1Label)
+if FORCE and PUBLISH:
+   response = raw_input("Are you sure you want to publish data with the 'force' option enabled (y/n)? ")
+   if response != "y": sys.exit(1)
+
+logger.infoSeparator()
+logger.infoPair("Batch type", batchType)
+logger.infoPair("Loading epoch", EPOCH)
+logger.infoPair("Forcing?", "%d" % FORCE)
+logger.infoPair("Test mode?", "%d" % TEST)
+logger.infoPair("DVO gpc1 label", dvoGpc1Label)
 
 while True:
 
     if FORCE: 
+        logger.infoPair("Querying GPC1 for", "all available IDs")
         ids = gpc1Db.getIDsInThisDVODbForThisStage(dvoGpc1Label, batchType)
 
-    else: ids = ippToPspsDb.getUnprocessedIDsForThisStage(dvoGpc1Label, batchType, epoch)
+    else:
+        logger.infoPair("Querying GPC1 for", "all unprocessed IDs")
+        ids = ippToPspsDb.getUnprocessedIDsForThisStage(dvoGpc1Label, batchType, EPOCH)
 
-    logger.info("Queuing                 %d items" % len(ids))
-    logger.info("")
+    logger.infoPair("Queuing", "%d items" % len(ids))
 
     for id in ids:
@@ -76,5 +85,5 @@
 
     # wait for ten minutes before checking for new ids
-    logger.info("Waiting for %.1f minutes before checking DVO for new items" % (POLLPERIOD/60.0))
+    logger.infoPair("Finished. Waiting for", "%.1f minutes before checking DVO for new items" % (POLLPERIOD/60.0))
     time.sleep(POLLPERIOD)