[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit ac11349cdcaa22c8e21157fd5d55cb38b451c714
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Dec 20 15:07:15 2008 +0100

    ogsmd: [FREESCALE NEPTUNE] override numberToPhonebookTuple
    Storing international numbers works on this modem now.

diff --git a/framework/subsystems/ogsmd/modems/abstract/modem.py b/framework/subsystems/ogsmd/modems/abstract/modem.py
index 842c75c..00b3202 100644
--- a/framework/subsystems/ogsmd/modems/abstract/modem.py
+++ b/framework/subsystems/ogsmd/modems/abstract/modem.py
@@ -17,6 +17,7 @@ __version__ = "0.9.9.2"
 MODULE_NAME = "ogsmd.modem.abstract"
 
 import gobject
+import types
 
 import logging
 logger = logging.getLogger( MODULE_NAME )
diff --git a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
index f293366..9a1501a 100644
--- a/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
+++ b/framework/subsystems/ogsmd/modems/freescale_neptune/modem.py
@@ -11,7 +11,7 @@ Module: modem
 Freescale Neptune modem class
 """
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 MODULE_NAME = "ogsmd.modems.freescale_neptune"
 
 import mediator
@@ -24,6 +24,8 @@ from .unsolicited import UnsolicitedResponseDelegate
 from ogsmd.gsm.decor import logged
 from ogsmd.gsm.channel import AtCommandChannel
 
+import types
+
 #=========================================================================#
 class FreescaleNeptune( AbstractModem ):
 #=========================================================================#
@@ -66,6 +68,20 @@ class FreescaleNeptune( AbstractModem ):
         # configure channels
         self._channels["UNSOL"].setDelegate( UnsolicitedResponseDelegate( self._object, mediator ) )
 
+    def numberToPhonebookTuple( self, nstring ):
+        """
+        Modem violating GSM 07.07 here. It always includes the '+' for international numbers,
+        although this should only be encoded via ntype = '145'.
+        """
+        if type( nstring ) != types.StringType():
+            # even though we set +CSCS="UCS2" (modem charset), the name is always encoded in text format, not PDU.
+            nstring = nstring.encode( "iso-8859-1" )
+
+        if nstring[0] == '+':
+            return nstring, 145
+        else:
+            return nstring, 129
+
     def channel( self, category ):
         if category == "CallMediator":
             return self._channels["CALL"]

-- 
FSO frameworkd Debian packaging