[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 c9955fe84800430c63d6de0fc890ee7f40bbf8ff
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Mon Aug 24 23:53:32 2009 +0200

    opimd: handle comp_value correctly

diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 5fa3b94..bd44c4d 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -137,6 +137,7 @@ class GenericEntry():
                 self._field_idx[field_name] = [field_idx]
 
     def make_comp_value(self, field_value):
+        # We only generate compare values for specific fields
         if str(field_value).startswith('tel:'):
             return get_compare_for_tel(field_value)
         else:
@@ -160,14 +161,14 @@ class GenericEntry():
                     if self._fields[field][3]==backend_name:
                         for field_value in field_value_to_list(entry_data[field_name]):
                             self._fields[field][1]=field_value
+                            self._fields[field][2] = self.make_comp_value(field_value)
                     else:
                         for field_value in field_value_to_list(entry_data[field_name]):
-                            self._fields.append([field_name, field_value, '', backend_name])
+                            self._fields.append([field_name, field_value, self.make_comp_value(field_value), backend_name])
                             self._field_idx[field_name].append(len(self._fields)-1)
             except KeyError:
                 for field_value in field_value_to_list(entry_data[field_name]):
 
-                    # We only generate compare values for specific fields
                     compare_value = self.make_comp_value(field_value)
 
                     our_field = [field_name, field_value, compare_value, backend_name]
@@ -656,12 +657,13 @@ class GenericDomain():
                         for value in data[field_name]:
                             #newfieldid = len(entryif._fields)-1
                             #entryif._field_idx[field_name].append(newfieldid)
-                            entryif._fields.append([field_name, value, '', backend])
+                            entryif._fields.append([field_name, value, entryif.make_comp_value(value), backend])
                     entryif.rebuild_index()
                 else:
                     for field_nr in entryif._field_idx[field_name]:
                         #if entry[field_name]!=data[field_name]:
                         entryif._fields[field_nr][1]=data[field_name]
+                        entryif._fields[field_nr][2]=entryif.make_comp_value(data[field_name])
 
         for backend_name in entryif._used_backends:
             backend = self._backends[backend_name]

-- 
FSO frameworkd Debian packaging