Index: trunk/ippToPsps/jython/dvoToMySQL.py
===================================================================
--- trunk/ippToPsps/jython/dvoToMySQL.py	(revision 31389)
+++ trunk/ippToPsps/jython/dvoToMySQL.py	(revision 31390)
@@ -7,4 +7,5 @@
 import os
 import logging
+import glob
 from subprocess import call, PIPE, Popen
 
@@ -43,7 +44,10 @@
 
         # create DVO tables
-        self.scratchDb.createDvoTables()
+        #self.scratchDb.createDvoTables()
 
         # import Images.dat table
+        sql = "DELETE FROM dvoMetaFull"
+        self.scratchDb.stmt.execute(sql)
+
         imagesTableName = self.importFits(self.pathToDvo, 
                 "", 
@@ -52,7 +56,7 @@
         self.scratchDb.createIndex(imagesTableName, "IMAGE_ID")
 
-        # insert into dvoMeta
+        # insert into dvoMetaFull
         self.logger.info("Inserting all image meta data into database")
-        sql = "INSERT INTO dvoMeta ( \
+        sql = "INSERT INTO dvoMetaFull ( \
                sourceID, \
                imageID, \
@@ -66,14 +70,20 @@
                FROM " + imagesTableName
         self.scratchDb.stmt.execute(sql)
-
+        
         subdirs = ['n0000']
 
         for subdir in subdirs:
 
-            files = ['0247.06', '0244.06', '0244.10']
+            files = glob.glob(pathToDvo + "/" + subdir + "/*.cpm")
+
+            #files = ['0247.06', '0244.06', '0244.10']
 
             for file in files:
 
-                self.logger.info("---------------------------------------------")
+                # get just filename, without extension
+                file = os.path.basename(os.path.splitext(file)[0])
+                self.logger.info("---------------------------------------------: " + file)
+
+                if self.scratchDb.alreadyImportedThisDvoTable(file): continue
 
                 # import cpm table and index
@@ -112,7 +122,6 @@
                 self.scratchDb.stmt.execute(sql)
 
-                # now put everything into dvoDetection table
-                self.logger.info("Putting everything into dvoDetection table")
-                sql = "INSERT INTO dvoDetection (\
+                self.logger.info("Putting everything into dvoDetectionFull table")
+                sql = "INSERT IGNORE INTO dvoDetectionFull (\
                        sourceID \
                        ,imageID \
@@ -137,5 +146,7 @@
                 self.scratchDb.dropTable(cpmTableName)
                 self.scratchDb.dropTable(cptTableName)
-        
+       
+                self.scratchDb.setImportedThisDvoTable(file)
+
         self.scratchDb.dropTable(imagesTableName)
 
@@ -176,4 +187,5 @@
 
           #try:
+          self.logger.info("Writing FITS table to database")
           table.cmd_keepcols(columns).write(self.scratchDb.url + '#' + tableName)
           #except:
@@ -190,4 +202,5 @@
 
 dvoToMySql = DvoToMySql(logger, "/data/ipp005.0/gpc1/catdirs/MD04.merges/MD04.merge")
+#dvoToMySql = DvoToMySql(logger, "/export/ippc00.1/rhenders/MD04.merge")
 
 logger.info("Program complete")