[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 5378e404d0c6f40f99b50150e970b8b9d85929c2
Merge: 5aa05e19ce1f1680b8ff93138168a91b9eacef72 0b60adf5382cc9e333c228cee272a218024af53d
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Fri Aug 14 22:18:39 2009 +0200

    Merge branch 'master' into dos/opimd-tracking

diff --combined framework/subsystems/opimd/pimb_sqlite_contacts.py
index 268c779,14af9c3..ae7927b
--- a/framework/subsystems/opimd/pimb_sqlite_contacts.py
+++ b/framework/subsystems/opimd/pimb_sqlite_contacts.py
@@@ -155,7 -155,7 +155,7 @@@ class SQLiteContactBackend(Backend)
  
      def load_entries_from_db(self):
          """Loads all entries from db"""
-         keys = {0:'_backend_entry_id', 1:'Name', 2:'Surname', 3:'Nickname', 4:'Birthdate', 5:'MarrDate', 6:'Partner', 7:'Spouse', 8:'MetAt', 9:'HomeLoc', 10:'Departnment'}
+         keys = {0:'_backend_entry_id', 1:'Name', 2:'Surname', 3:'Nickname', 4:'Birthdate', 5:'MarrDate', 6:'Partner', 7:'Spouse', 8:'MetAt', 9:'HomeLoc', 10:'Department'}
          cur = self.con.cursor()
          try:
              cur.execute('SELECT id, Name, Surname, Nickname, Birthdate, MarrDate, Partner, Spouse, MetAt, HomeLoc, Department FROM contacts WHERE deleted=0')
@@@ -182,12 -182,12 +182,12 @@@
                  logger.error("%s: Could not read from database (table contact_values)! Possible reason is old, uncompatible table structure. If you don't have important data, please remove %s file.", self.name, _SQLITE_FILE_NAME)
                  raise OperationalError
  
 -            entry_id = self._domain_handlers['Contacts'].register_contact(self, entry)
 +            entry_id = self._domain_handlers['Contacts'].register_entry(self, entry)
              self._entry_ids.append(entry_id)
          cur.close()
  
  
 -    def del_contact(self, contact_data):
 +    def del_entry(self, contact_data):
          cur = self.con.cursor()
          for (field_name, field_value) in contact_data:
              if field_name=='_backend_entry_id':
@@@ -198,7 -198,7 +198,7 @@@
          self.con.commit()
          cur.close()
  
 -    def upd_contact(self, contact_data):
 +    def upd_entry(self, contact_data):
          reqfields = ['Name', 'Surname', 'Nickname', 'Birthdate', 'MarrDate', 'Partner', 'Spouse', 'MetAt', 'HomeLoc', 'Department']
          cur = self.con.cursor()
          for (field, value) in contact_data:
@@@ -217,7 -217,7 +217,7 @@@
          self.con.commit()
          cur.close()
  
 -    def add_contact(self, contact_data):
 +    def add_entry(self, contact_data):
          contact_id = self.add_contact_to_db(contact_data)
          return contact_id
  
@@@ -246,5 -246,5 +246,5 @@@
  
          contact_data['_backend_entry_id']=cid
  
 -        contact_id = self._domain_handlers['Contacts'].register_contact(self, contact_data)
 +        contact_id = self._domain_handlers['Contacts'].register_entry(self, contact_data)
          return contact_id

-- 
FSO frameworkd Debian packaging