Fix Freeseer#675 Update csv import plugin to support presentation fields

SRomansky · Dec 19, 2014 · 82f800b · 82f800b
1 parent 145f7f9
commit 82f800b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/freeseer/framework/database.py b/src/freeseer/framework/database.py
@@ -384,14 +384,25 @@ def add_talks_from_csv(self, fname):
 
         if presentations:
             for presentation in presentations:
-                talk = Presentation(presentation["Title"],
-                                    presentation["Speaker"],
-                                    presentation["Abstract"],  # Description
-                                    presentation["Level"],
-                                    presentation["Event"],
-                                    presentation["Room"],
-                                    presentation["Time"],
-                                    presentation["Time"])
+                if presentation['Time']:
+                    talk = Presentation(presentation["Title"],
+                                        presentation["Speaker"],
+                                        presentation["Abstract"],  # Description
+                                        presentation["Level"],
+                                        presentation["Event"],
+                                        presentation["Room"],
+                                        presentation["Time"],
+                                        presentation["Time"])  # Presentation using legacy time field
+                else:
+                    talk = Presentation(presentation["Title"],
+                                        presentation["Speaker"],
+                                        presentation["Abstract"],  # Description
+                                        presentation["Level"],
+                                        presentation["Event"],
+                                        presentation["Room"],
+                                        presentation["Date"],
+                                        presentation["StartTime"],
+                                        presentation["EndTime"])
                 self.insert_presentation(talk)
 
         else:

diff --git a/src/freeseer/plugins/importer/csv_importer.py b/src/freeseer/plugins/importer/csv_importer.py
@@ -63,7 +63,10 @@ def get_presentations(self, fname):
                         'Level': unicode(row.get('Level', ''), 'utf-8'),
                         'Event': unicode(row.get('Event', ''), 'utf-8'),
                         'Room': unicode(row.get('Room', ''), 'utf-8'),
-                        'Time': unicode(row.get('Time', ''), 'utf-8')
+                        'Time': unicode(row.get('Time', ''), 'utf-8'),  # Legacy csv time field
+                        'Date': unicode(row.get('Date', ''), 'utf-8'),
+                        'StartTime': unicode(row.get('StartTime', ''), 'utf-8'),
+                        'EndTime': unicode(row.get('EndTime', ''), 'utf-8')
                     }
 
                     presentations.append(talk)