From ff675fb3aea6282ba82eae564045e018996ac4a7 Mon Sep 17 00:00:00 2001
From: Matt Turnbull <mcturnbull@fastmail.fm>
Date: Thu, 12 Mar 2009 03:15:34 +0000
Subject: [PATCH] import working?

---
 pyfpdb/Hand.py        | 4 ----
 pyfpdb/fpdb_import.py | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py
index f77b9425..9591525e 100644
--- a/pyfpdb/Hand.py
+++ b/pyfpdb/Hand.py
@@ -102,10 +102,6 @@ If a player has None chips he won't be added."""
         else:
             logging.error("markstreets didn't match")
 
-#def addHoleCards -- to Holdem subclass
-
-
-
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
             print "checkPlayerExists", player, "fail"
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index d86c4214..15c25ac8 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -252,9 +252,9 @@ class Importer:
             supp = conv.readSupportedGames() # Should this be done by HHC on init?
             #gt = conv.determineGameType()
             # TODO: Check that gt is in supp - error appropriately if not
-            conv.processFile()
+            #conv.processFile()
             if(conv.getStatus()):
-                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site)
+                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site)
             else:
                 # conversion didn't work
                 # TODO: appropriate response?