Changeset 1944 for trunk/loplug/plugins/lockon/alarm.py

Timestamp:

04/03/10 18:42:09 (2 years ago)

Author:

dart

Message:

I18n:
o Last translations update

LoPlug?:
o Fix last deliveries for logger (need more work later)

File:

• trunk/loplug/plugins/lockon/alarm.py (modified) (7 diffs)

trunk/loplug/plugins/lockon/alarm.py

@@ -332 +332 @@
   # @param supInfo                   suplementary info
   def _data_requested( self, srcPlugId, itemId, period, supInfo):
-    self.logger.debug( "[Alarm] itemId %s requested from %s [period:%s, supInfo:%s]" % ( itemId, srcPlugId, period, supInfo) )
+    self.debug( "[Alarm] itemId %s requested from %s [period:%s, supInfo:%s]" % ( itemId, srcPlugId, period, supInfo) )
 
     # Create entry for this itemId if it does not exist
@@ -381 +381 @@
   # @param szobj                     object
   def _data_received( self, destSvc, srcPlugId, szobj):
-    self.logger.debug( "[Alarm] data received, itemId: ", szobj.data_id )
+    self.debug( "[Alarm] data received, itemId: "+str(szobj.data_id ))
     # -----------------------------------------------------------
     # Message from Lockon.LuaServer
@@ -415 +415 @@
     # NEXT_FUEL_THRESHOLD
     elif szobj.data_id == self.build_full_itemId( Alarm.NEXT_FUEL_THRESHOLD):
-      self.logger.debug( self.FuelThresholdIndex )
+      self.debug( self.FuelThresholdIndex )
       self.FuelThresholdIndex = ( self.FuelThresholdIndex + 1) % len( self.FuelAlarmInfoByIndex)
-      self.logger.debug( self.FuelThresholdIndex )
+      self.debug( self.FuelThresholdIndex )
       self.__sendData__( Alarm.FUEL_THRESHOLD_NAME)
 
@@ -452 +452 @@
   # @param cmdData                   associated data
   def _execute_command( self, cmdId, cmdData):
-    self.logger.debug( "[Alarm] Execute command %s with data %s" % ( cmdId, cmdData) )
+    self.debug( "[Alarm] Execute command %s with data %s" % ( cmdId, cmdData) )
 #----------------------------------------------------------------
   # To shutdown the instance
@@ -488 +488 @@
           
         if not self.luaParamsInfo[luaItemId]["itemIds"].has_key( itemId):
-          self.logger.debug( serviceInfo["Period"] )
+          self.debug( serviceInfo["Period"] )
           self.luaParamsInfo[luaItemId]["itemIds"][itemId] = { "srcPlugIds":[], "Period":serviceInfo["Period"]}
           
@@ -506 +506 @@
             destPlug, dataId = cst_split_on_first_part_of_address( luaItemId)
             szDataRequest = SzDataRequest( self.build_full_itemId(), dataId, period=pgcd)
-            self.logger.debug( self.get_name() )
-            self.logger.debug( "Request itemId: %s with period: %s" % ( dataId, pgcd) )
+            self.debug( self.get_name() )
+            self.debug( "Request itemId: %s with period: %s" % ( dataId, pgcd) )
             self.parentPlug.send_object( [destPlug], PGPluginClient.OPCODE_DATA_REQUESTED, szDataRequest)
 #----------------------------------------------------------------
@@ -554 +554 @@
   # @param options                   optional parameters which indicates if the options are to be sent
   def __sendData__( self, itemId, plugId=None):
-    self.logger.debug( "[Alarm] __sendData__ for itemId ", itemId )
+    self.debug( "[Alarm] __sendData__ for itemId "+ str(itemId ) )
     if self.plugItemRequests.has_key( itemId):
       obj_to_send = None