Changeset 399

Timestamp:

06/23/12 06:56:49 (9 years ago)

Author:

sc

Message:

• Jigsaw version 1.3.0
• fixes for CSV export

Location:

trunk/Puzzlebox/Synapse

Files:

• Session.py (modified) (5 diffs)
• ThinkGear/Server.py (modified) (1 diff)

trunk/Puzzlebox/Synapse/Session.py

@@ -7 +7 @@
 
 __changelog__ = """\
-Last Update: 2012.05.07
+Last Update: 2012.06.22
 """
 
@@ -495 +495 @@
                         
                         # NOTE: Move this to ThinkGear Server object
-                        if 'rawEeg' in packet.keys():
+                        #if 'rawEeg' in packet.keys():
+                                #continue
+                        
+                        
+                        if 'timestamp' in packet.keys() and len(packet.keys()) == 1:
+                                if self.DEBUG:
+                                        print "WARN: Skipping empty packet:",
+                                        print packet
+                                # skip empty packets
                                 continue
                         
                         
-                        if packet['timestamp'] not in csv.keys():
+                        timestamp = packet['timestamp']
+                        #(date, localtime) = self.parseTimeStamp(timestamp, \
+                                                                                #truncate_time_zone=truncate_csv_timezone)
+                        (date, localtime) = source.parseTimeStamp(timestamp, \
+                                                                                truncate_time_zone=truncate_csv_timezone)
+                        
+                        if timestamp not in csv.keys():
                                 
                                 #if 'blinkStrength' in packet.keys():
@@ -506 +520 @@
                                 
                                 
-                                timestamp = packet['timestamp']
-                                #(date, localtime) = self.parseTimeStamp(timestamp, \
+                                #timestamp = packet['timestamp']
+                                ##(date, localtime) = self.parseTimeStamp(timestamp, \
+                                                    ##truncate_time_zone=truncate_csv_timezone)
+                                #(date, localtime) = source.parseTimeStamp(timestamp, \
                                                     #truncate_time_zone=truncate_csv_timezone)
-                                (date, localtime) = source.parseTimeStamp(timestamp, \
-                                                    truncate_time_zone=truncate_csv_timezone)
                                 
                                 csv[timestamp] = {}
@@ -517 +531 @@
                                 
                                 
-                                for plugin in parent.activePlugins:
-                                        if plugin.customDataHeaders != []:
-                                                try:
-                                                        csv[timestamp] = plugin.processPacketForExport(output=csv[timestamp], packet=packet)
-                                                except Exception, e:
-                                                        if self.DEBUG:
-                                                                print "ERROR: [Synapse:Session] Exception calling processPacketForExport on",
-                                                                print plugin.name
+                        for plugin in parent.activePlugins:
+                                if plugin.customDataHeaders != []:
+                                        try:
+                                                csv[timestamp] = plugin.processPacketForExport(packet=packet, output=csv[timestamp])
+                                        except Exception, e:
+                                                if self.DEBUG:
+                                                        print "ERROR: [Synapse:Session] Exception calling processPacketForExport on",
+                                                        print plugin.name
                         
                         
                         for header in customDataHeaders:
-                                
-                                #if header in packet.keys():
-                                        #csv[timestamp][header] = packet[header]
                                 
                                 if 'custom' in packet.keys() and \
                                    header in packet['custom'].keys():
+                                        
+                                        timestamp = packet['timestamp']
+                                        (date, localtime) = source.parseTimeStamp(timestamp, \
+                                                               truncate_time_zone=truncate_csv_timezone)
+                                        
+                                        if timestamp not in csv.keys():
+                                                csv[timestamp] = {}
+                                                csv[timestamp]['Date'] = date
+                                                csv[timestamp]['Time'] = localtime
+                                                if self.DEBUG:
+                                                        print "WARN: Unmatched custom packet:",
+                                                        print packet
+                                        
                                         csv[timestamp][header] = packet['custom'][header]
                 
@@ -596 +620 @@
                 
                 
+                try:
+                        truncate_csv_timezone = target.configuration.EXPORT_CSV_TRUNCATE_TIMEZONE
+                except:
+                        truncate_csv_timezone = False
+                
+                
                 if source.packets['rawEeg'] == []:
                         return(None)
                 
                 
-                headers = 'Date,Time,rawEeg'
+                headers = 'Date,Time,Raw EEG'
+                headers = headers + '\n'
                 
                 csv = {}

trunk/Puzzlebox/Synapse/ThinkGear/Server.py

@@ -509 +509 @@
                 
                 for header in self.customDataHeaders:
-                        output[header] = ''
+                        if header not in output.keys():
+                                output[header] = ''
                 
                 if 'eSense' in packet.keys():