[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819
Sebastian Krzyszkowiak
seba.dos1 at gmail.com
Sat Aug 6 08:18:46 UTC 2011
The following commit has been merged in the debian branch:
commit 8722da22e7d84abe4c55565487e14d7de091fd8f
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date: Sat Dec 5 21:19:43 2009 +0100
opimd: be aware of different field types
Changes nothing yet :P
diff --git a/framework/subsystems/opimd/helpers.py b/framework/subsystems/opimd/helpers.py
index 9cc0462..e54b1cc 100644
--- a/framework/subsystems/opimd/helpers.py
+++ b/framework/subsystems/opimd/helpers.py
@@ -28,16 +28,15 @@ def field_value_to_list(field_value):
return [ field_value ]
#----------------------------------------------------------------------------#
-def make_comp_value(value):
+def make_comp_value(field_type, value):
#----------------------------------------------------------------------------#
"""Determines and returns a representation of a tel URI that is comparable to human input"""
# Remove tel:
#res = tel_value[4:]
-
#res = normalize_number(res)
- return res
+ return value
#----------------------------------------------------------------------------#
class InvalidBackend( DBusException ):
diff --git a/framework/subsystems/opimd/pimd_calls.py b/framework/subsystems/opimd/pimd_calls.py
index e541aaf..4a852da 100644
--- a/framework/subsystems/opimd/pimd_calls.py
+++ b/framework/subsystems/opimd/pimd_calls.py
@@ -64,11 +64,10 @@ class Call(GenericEntry):
def __init__(self, path):
"""Creates a new entry instance"""
- self.domain_name = _DOMAIN_NAME
+ self.domain = CallDomain
GenericEntry.__init__( self, path )
-
#----------------------------------------------------------------------------#
class QueryManager(DBusFBObject):
#----------------------------------------------------------------------------#
diff --git a/framework/subsystems/opimd/pimd_contacts.py b/framework/subsystems/opimd/pimd_contacts.py
index 3aae33b..025cf2f 100644
--- a/framework/subsystems/opimd/pimd_contacts.py
+++ b/framework/subsystems/opimd/pimd_contacts.py
@@ -64,7 +64,7 @@ class Contact(GenericEntry):
def __init__(self, path):
"""Creates a new entry instance"""
- self.domain_name = _DOMAIN_NAME
+ self.domain = ContactDomain
GenericEntry.__init__( self, path )
diff --git a/framework/subsystems/opimd/pimd_dates.py b/framework/subsystems/opimd/pimd_dates.py
index 6a5dcf9..ad2180b 100644
--- a/framework/subsystems/opimd/pimd_dates.py
+++ b/framework/subsystems/opimd/pimd_dates.py
@@ -65,7 +65,7 @@ class Date(GenericEntry):
def __init__(self, path):
"""Creates a new entry instance"""
- self.domain_name = _DOMAIN_NAME
+ self.domain = DateDomain
GenericEntry.__init__( self, path )
#----------------------------------------------------------------------------#
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index 65833d1..a5d63a1 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -68,7 +68,7 @@ class GenericEntry():
_fields = None
_field_idx = None
_used_backends = None
- domain_name = 'Generic'
+ domain = None
def __init__(self, path):
"""Creates a new entry instance
@@ -153,15 +153,15 @@ 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)
+ self._fields[field][2] = make_comp_value(self.domain.field_type_from_name(field_name), field_value)
else:
for field_value in field_value_to_list(entry_data[field_name]):
- self._fields.append([field_name, field_value, self.make_comp_value(field_value), backend_name])
+ self._fields.append([field_name, field_value, make_comp_value(self.domain.field_type_from_name(field_name), 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]):
- compare_value = self.make_comp_value(field_value)
+ compare_value = make_comp_value(self.domain.field_type_from_name(field_name), field_value)
our_field = [field_name, field_value, compare_value, backend_name]
@@ -429,7 +429,7 @@ class GenericEntry():
field_match = 0.0
if field_match > best_field_match: best_field_match = field_match
- logger.debug("%s: Field match for %s / %s: %f", self.domain_name, comp_value, field_value, field_match)
+ logger.debug("%s: Field match for %s / %s: %f", self.domain.name, comp_value, field_value, field_match)
except KeyError:
# entry has no data for this field contained in the query, so this entry cannot match
@@ -645,6 +645,10 @@ class GenericDomain():
return entry_id
+ @classmethod
+ def field_type_from_name(self, name):
+ return 'generic'
+
def enumerate_items(self, backend):
"""Enumerates all entry data belonging to a specific backend
@@ -745,13 +749,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, entryif.make_comp_value(value), backend])
+ entryif._fields.append([field_name, value, make_comp_value(self.field_type_from_name(field_name), 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])
+ entryif._fields[field_nr][2]=make_comp_value(self.field_type_from_name(field_name), data[field_name])
for backend_name in entryif._used_backends:
backend = self._backends[backend_name]
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index 4d10f69..4cd6fe5 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -68,7 +68,7 @@ class Message(GenericEntry):
def __init__(self, path):
"""Creates a new entry instance"""
- self.domain_name = _DOMAIN_NAME
+ self.domain = MessageDomain
GenericEntry.__init__( self, path )
diff --git a/framework/subsystems/opimd/pimd_notes.py b/framework/subsystems/opimd/pimd_notes.py
index a4ac5e6..3ef14b5 100644
--- a/framework/subsystems/opimd/pimd_notes.py
+++ b/framework/subsystems/opimd/pimd_notes.py
@@ -65,7 +65,7 @@ class Note(GenericEntry):
def __init__(self, path):
"""Creates a new entry instance"""
- self.domain_name = _DOMAIN_NAME
+ self.domain = NoteDomain
GenericEntry.__init__( self, path )
diff --git a/framework/subsystems/opimd/pimd_tasks.py b/framework/subsystems/opimd/pimd_tasks.py
index 49948fa..0b13b9e 100644
--- a/framework/subsystems/opimd/pimd_tasks.py
+++ b/framework/subsystems/opimd/pimd_tasks.py
@@ -64,7 +64,7 @@ class Task(GenericEntry):
def __init__(self, path):
"""Creates a new entry instance"""
- self.domain_name = _DOMAIN_NAME
+ self.domain = TaskDomain
GenericEntry.__init__( self, path )
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list