Index: trunk/ippToPsps/jython/forcedwarpbatch.py
===================================================================
--- trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 37592)
+++ trunk/ippToPsps/jython/forcedwarpbatch.py	(revision 37917)
@@ -224,5 +224,10 @@
         self.generateRandomIDs()
 
+        self.logger.infoPair("Adding 'row' columns to", "ForcedWarpMeasurement")
+        self.scratchDb.addRowCountColumn("ForcedWarpMeasurement", "row")
+        self.logger.infoPair("Adding unique ids to", "ForcedWarpMeasurement")
         self.generateUniquePspsIDs()
+        self.logger.infoPair("Dropping row column from", "ForcedWarpMeasurement table")
+        self.scratchDb.dropColumn("ForcedWarpMeasurement", "row")
            
         # add indexes ForcedWarpMeasurement
@@ -342,7 +347,9 @@
 
     def generatePspsUniqueIDs(self):
-        sql = "UPDATE ForcedWarpMeasurement join (select @r:=@r+1 rownum, objID from \
-        (select @r:=0) r, ForcedWarpMeasurement t) as foo using (objID) set \
-        uniquePspsFWid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
+#        sql = "UPDATE ForcedWarpMeasurement join (select @r:=@r+1 rownum, objID from \
+#        (select @r:=0) r, ForcedWarpMeasurement t) as foo using (objID) set \
+#        uniquePspsFWid = ((" +str(self.batchID)+ "*1000000000 ) + rownum)"
+        sql = "UPDATE ForcedWarpMeasurement set uniquePspsFWid = (("+str(self.batchID)+"*1000000000 ) + row)"
+
         try: self.scratchDb.execute(sql)
         except: