[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 bebd0575c7997d3ca691e1e83f3a48ea72c4b7e4
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Tue Aug 25 00:23:56 2009 +0200

    opimd: handle correctly blank fields

diff --git a/framework/subsystems/opimd/TODO b/framework/subsystems/opimd/TODO
new file mode 100644
index 0000000..b03b717
--- /dev/null
+++ b/framework/subsystems/opimd/TODO
@@ -0,0 +1,20 @@
+Near future:
+* quering "Phone" should check also "Office phone"
+* sorting
+In mean-time:
+* Initialized, GetInitialized
+* removing entries from cache when disabling backend
+After that:
+* finished inteligent queries (ContactDeleted, ConactUpdated)
+* updating with SIM-Messages-FSO
+* adding new fields to for example SIM entry (by merging)
+* RSS-Messages backend (handler)
+* Messages on GenericDomain
+Think about:
+* way for quering using all or multiple fields?
+* quering "greater than" and "lesser than"?
+* more domains?
+Finishing:
+* faster merging and avoiding duplicates
+* using backend engine to query instead of cache when possible
+* world domination!
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index bd44c4d..0905732 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -641,18 +641,19 @@ class GenericDomain():
 
         for field_name in data:
             if not field_name in entryif._field_idx:
-                if backend!='':
-                    entryif.import_fields({field_name:data[field_name]}, backend)
-                else:
-                    raise InvalidBackend( "There is no backend which can store new field" )
+                if data[field_name]!='':
+                    if backend!='':
+                        entryif.import_fields({field_name:data[field_name]}, backend)
+                    else:
+                        raise InvalidBackend( "There is no backend which can store new field" )
             elif not field_name.startswith('_'):
-                if not data[field_name] or isinstance(data[field_name], list) or isinstance(data[field_name], dbus.Array):
+                if data[field_name]=='' or isinstance(data[field_name], list) or isinstance(data[field_name], dbus.Array):
                     field_idx = entryif._field_idx[field_name]
                     field_idx.reverse()
                     for field_nr in field_idx:
                         del entryif._fields[field_nr]
                     del entryif._field_idx[field_name]
-                    if data[field_name]:
+                    if data[field_name]!='':
                         entryif._field_idx[field_name] = []
                         for value in data[field_name]:
                             #newfieldid = len(entryif._fields)-1

-- 
FSO frameworkd Debian packaging