[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 57c9a1c2e66b496c8b70031531a2bbeee13a9430
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Thu Aug 20 13:17:07 2009 +0200

    opimd: don't fail when can't import phoneutils

diff --git a/framework/subsystems/opimd/helpers.py b/framework/subsystems/opimd/helpers.py
index 6090196..3fe7a26 100644
--- a/framework/subsystems/opimd/helpers.py
+++ b/framework/subsystems/opimd/helpers.py
@@ -13,7 +13,11 @@ Helpers
 """
 
 from dbus import DBusException, Array
-from phoneutils import normalize_number
+try:
+    from phoneutils import normalize_number
+except:
+    def normalize_number(num):
+        return num
 
 #----------------------------------------------------------------------------#
 def field_value_to_list(field_value):
@@ -44,7 +48,7 @@ def get_compare_for_tel(tel_value):
 
     res = normalize_number(res)
 
-    return res
+    return 'tel:'+res
 
 #----------------------------------------------------------------------------#
 class InvalidBackend( DBusException ):
diff --git a/framework/subsystems/opimd/opimd.py b/framework/subsystems/opimd/opimd.py
index baad680..696e2e9 100644
--- a/framework/subsystems/opimd/opimd.py
+++ b/framework/subsystems/opimd/opimd.py
@@ -33,6 +33,14 @@ DIN_BASE_FSO = "org.freesmartphone.PIM"
 
 MODULE_NAME = "opimd"
 
+import logging
+logger = logging.getLogger( MODULE_NAME )
+
+try:
+    import phoneutils
+except ImportError:
+    logger.error('Couldn\'t import phoneutils! Can\'t use normalizing phone numbers. Check if you have python-phoneutils installed.')
+
 # We import the domain modules, so that there classes get registered
 import pimd_contacts
 import pimd_messages
@@ -53,11 +61,6 @@ from backend_manager import BackendManager
 
 from domain_manager import DomainManager
 
-import phoneutils
-
-import logging
-logger = logging.getLogger( MODULE_NAME )
-
 INIT = False
 
 #----------------------------------------------------------------------------#
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index d873d9e..4e26ba5 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -324,7 +324,7 @@ class GenericEntry():
             field_value = str(query_obj[field_name])
             best_field_match = 0.0
 
-            if field_value.startswith('tel:'): field_value=get_compare_for_tel(field_value).replace('+','\+')
+            if field_value.startswith('tel:'): field_value=get_compare_for_tel(field_value).replace('+','\+')+'$'
 
             matcher = re.compile(field_value)
 

-- 
FSO frameworkd Debian packaging