Changeset 400

Timestamp:

06/29/12 20:54:52 (9 years ago)

Author:

sc

Message:

• fixes for Puzzlebox Jigsaw to export ThinkGear? Connect host

Location:

trunk/Puzzlebox/Synapse

Files:

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

trunk/Puzzlebox/Synapse/Interface.py

@@ -7 +7 @@
 
 __changelog__ = """\
-Last Update: 2012.05.11
+Last Update: 2012.06.29
 """
 
 __todo__ = """
+- exporting data columns twice (attention through mid gamma"
+- undesirable data in control panel's debug window:
+        Timestamp: 2012-06-29 07:53:59.336689 PDT
+        poorSignalLevel: 200
 - update configuration.ini file with settings entered into interface
 """

trunk/Puzzlebox/Synapse/Session.py

@@ -7 +7 @@
 
 __changelog__ = """\
-Last Update: 2012.06.22
+Last Update: 2012.06.29
 """
 
@@ -459 +459 @@
                 
                 
+                #print source.name
+                #print source.packets['signals']
+                
+                
                 # NOTE: no need to scrub emulated data
                 try:
@@ -479 +483 @@
                         customDataHeaders.append(header)
                 for plugin in parent.activePlugins:
-                        print plugin.name
+                        #print plugin.name
                         for header in plugin.customDataHeaders:
                                 customDataHeaders.append(header)
@@ -529 +533 @@
                                 csv[timestamp]['Date'] = date
                                 csv[timestamp]['Time'] = localtime
-                                
-                                
+                        
+                        
                         for plugin in parent.activePlugins:
                                 if plugin.customDataHeaders != []:
+                                        if self.DEBUG > 2:
+                                                print "INFO: [Synapse:Session] Exporting:",
+                                                print plugin.name
                                         try:
                                                 csv[timestamp] = plugin.processPacketForExport(packet=packet, output=csv[timestamp])
+                                                if self.DEBUG > 2:
+                                                        print "INFO [Synapse:Session]: Export Successful"
+                                                        print plugin.name
                                         except Exception, e:
                                                 if self.DEBUG:
@@ -582 +592 @@
                                         #row = row + ','
                                         row = ''
-                                        if self.DEBUG:
-                                                print "WARN: empty signals packet:,"
+                                        if self.DEBUG > 1:
+                                                print "WARN: empty signals packet:",
                                                 print csv[timestamp]
                                         break

trunk/Puzzlebox/Synapse/ThinkGear/Server.py

@@ -7 +7 @@
 
 __changelog__ = """\
-Last Update: 2012.05.11
+Last Update: 2012.06.29
 """
 
@@ -491 +491 @@
         def processPacketForExport(self, packet={}, output={}):
                 
+                #print "INFO: [Synapse:ThinkGear:Server] processPacketForExport:",
+                #print packet
+                
                 if 'blinkStrength' in packet.keys():
                         # Skip any blink packets from log