First attempt to parsing summary files from FTP

modified:   FulltiltToFpdb.py
		* Modified re_HandInfo regex to take into account Matrix Tournament Hands Histories
		* Add Regex for Tourney Summaries files parsing
		* New methods : readSummaryInfo, determineTourneyType, getPlayersPositionsAndWinnings

	modified:   HandHistoryConverter.py
		* Add a Tourney object in the attributes to allow storing the summary info retrieved and the ability to hand it over after parsing
		* Add a new attribut parsedObjectType (string : "HH" or "Summary")
		* In follow = False mode : read the first line to swicth between HH & Summary parsing
		* TO DO : Deal with parsing summary files in follow = True mode
		* New methods added : isSummary, getParsedObjectType (to be called in fpdb_import), readSummaryInfo : abstract (to be implemented in each specific HHC), getTourney (returns the new attribute)

	new file:   Tourney.py
		* New object
		* Lots of attributes regarding the tourney info (buy-in, fee, entries, speed, Rebuy/add-on info, starting chips, KnockOut info, isHeadsUp, isShootout, isMatrix, ...
		* List of players with finishing positions (when available) and winnings (when available)
		* Methods :
		  ** addPlayer(self, rank, name, winnings)
		  ** incrementPlayerWinnings(self, name, additionnalWinnings): used for KO tourneys when KO occured (for Hero only)
		  ** calculatePayinAmount : unused yet, should be necessary for DB storage
		  ** some Hand methods copied that are still to be done including : assemble and insert
		  ** TO DO : write the insert method for the object to be stored in DB. This will have to deal with the fact that the DB write can occur both before (Bulk Import) or after the HH file info has been stored (tourney might or might not already exist)

	modified:   fpdb_import.py
		* import_file_dict modified :
		  ** after the construction of the hhc, it now calls the new getParsedObjectType method of HHC in order to know what has been parsed by the HHC
		  ** If it's a hand history file (actual expected behaviour) : do as before
		  ** If it's a summary file, gets the tourney object that has been built from the hhc and calls the insert method on it (similar to NEWIMPORT=True for HH)

pyfpdb/fpdb_import.py

@@ -395,29 +395,45 @@ class Importer:
             out_path     = os.path.join(hhdir, "x"+strftime("%d-%m-%y")+os.path.basename(file))
 
         filter_name = filter.replace("ToFpdb", "")
-
-        mod = __import__(filter)
-        obj = getattr(mod, filter_name, None)
-        if callable(obj):
-            hhc = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
-            if(hhc.getStatus() and self.NEWIMPORT == False):
-                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(db, out_path, site, q)
-            elif (hhc.getStatus() and self.NEWIMPORT == True):
-                #This code doesn't do anything yet
-                handlist = hhc.getProcessedHands()
-                self.pos_in_file[file] = hhc.getLastCharacterRead()
-
-                for hand in handlist:
-                    #hand.prepInsert()
-                    hand.insert(self.database)
-            else:
-                # conversion didn't work
-                # TODO: appropriate response?
-                return (0, 0, 0, 1, 0, -1)
-        else:
-            print "Unknown filter filter_name:'%s' in filter:'%s'" %(filter_name, filter)
-            return (0, 0, 0, 1, 0, -1)
-
+        mod = __import__(filter)
+        obj = getattr(mod, filter_name, None)
+        if callable(obj):
+            hhc = obj(in_path = file, out_path = out_path, index = 0) # Index into file 0 until changeover
+            if hhc.getParsedObjectType() == "HH":
+                if(hhc.getStatus() and self.NEWIMPORT == False):
+                    (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(db, out_path, site, q)
+                elif (hhc.getStatus() and self.NEWIMPORT == True):
+                    #This code doesn't do anything yet
+                    handlist = hhc.getProcessedHands()
+                    self.pos_in_file[file] = hhc.getLastCharacterRead()
+
+                    for hand in handlist:
+                        #hand.prepInsert()
+                        hand.insert(self.database)
+                else:
+                    # conversion didn't work
+                    # TODO: appropriate response?
+                    return (0, 0, 0, 1, 0, -1)
+            elif hhc.getParsedObjectType() == "Summary":
+                if(hhc.getStatus()):
+                    tourney = hhc.getTourney()
+                    #print tourney
+                    #tourney.prepInsert()
+                    (stored, duplicates, partial, errors, ttime) = tourney.insert(self.database)␍
+                    return (stored, duplicates, partial, errors, ttime)
+                    
+                else:
+                    # conversion didn't work
+                    # Could just be the parsing of a non summary file (classic HH file)
+                    return (0, 0, 0, 0, 0)
+            else:
+                print "Unknown objects parsed by HHC :'%s'" %(hhc.getObjectTypeRead())
+                return (0, 0, 0, 1, 0, -1)
+            
+        else:
+            print "Unknown filter filter_name:'%s' in filter:'%s'" %(filter_name, filter)
+            return (0, 0, 0, 1, 0, -1)
+    
         #This will barf if conv.getStatus != True
         return (stored, duplicates, partial, errors, ttime)