Merge branch 'master' of git://git.assembla.com/fpdboz.git

pyfpdb/HandHistoryConverter.py

@@ -88,7 +88,7 @@ class HandHistoryConverter:
         self.hhbase    = os.path.expanduser(self.hhbase)
         self.hhdir     = os.path.join(self.hhbase,sitename)
         self.gametype  = []
-        self.ofile     = os.path.join(self.hhdir,file)
+        self.ofile     = os.path.join(self.hhdir, os.path.basename(file))
         self.rexx      = FpdbRegex.FpdbRegex()
 
     def __str__(self):

pyfpdb/fpdb_import.py

@@ -205,6 +205,9 @@ class Importer:
             if filter == "EverleafToFpdb":
                 print "converting ", file
                 conv = EverleafToFpdb.Everleaf(self.config, file)
+            elif filter == "FulltiltToFpdb":
+                print "converting ", file
+                conv = FulltiltToFpdb.Fulltilt(self.config, file)
             else:
                 print "Unknown filter ", filter
                 return