[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 6d41a54278457f161b9c69cdc8074dd7e6dbe657
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sun Aug 23 19:20:11 2009 +0200

    opimd: SQLite-*: fix traceback when editing

diff --git a/framework/subsystems/opimd/pimb_sqlite_calls.py b/framework/subsystems/opimd/pimb_sqlite_calls.py
index 48e9665..99c2d5a 100644
--- a/framework/subsystems/opimd/pimb_sqlite_calls.py
+++ b/framework/subsystems/opimd/pimb_sqlite_calls.py
@@ -171,12 +171,12 @@ class SQLiteCallBackend(Backend):
             if field in reqfields:
                 cur.execute('UPDATE calls SET '+field+'=? WHERE id=?',(value,callId))
             elif not field.startswith('_'):
-                cur.execute('DELETE FROM call_values WHERE callId=? AND field=?',(entryId,field))
+                cur.execute('DELETE FROM call_values WHERE callId=? AND field=?',(callId,field))
                 if isinstance(value, Array) or isinstance(value, list):
                     for val in value:
-                        cur.execute('INSERT INTO call_values (field,value,callId) VALUES (?,?,?)',(field,val,entryId))
+                        cur.execute('INSERT INTO call_values (field,value,callId) VALUES (?,?,?)',(field,val,callId))
                 else:
-                    cur.execute('INSERT INTO call_values (field,value,callId) VALUES (?,?,?)',(field,value,entryId))
+                    cur.execute('INSERT INTO call_values (field,value,callId) VALUES (?,?,?)',(field,value,callId))
   #      cur.execute('UPDATE calls SET updated=1 WHERE id=?',(callId,))
         self.con.commit()
         cur.close()
diff --git a/framework/subsystems/opimd/pimb_sqlite_contacts.py b/framework/subsystems/opimd/pimb_sqlite_contacts.py
index 4770cf2..6eb5f3c 100644
--- a/framework/subsystems/opimd/pimb_sqlite_contacts.py
+++ b/framework/subsystems/opimd/pimb_sqlite_contacts.py
@@ -208,12 +208,12 @@ class SQLiteContactBackend(Backend):
             if field in reqfields:
                 cur.execute('UPDATE contacts SET '+field+'=? WHERE id=?',(value,contactId))
             elif not field.startswith('_'):
-                cur.execute('DELETE FROM contact_values WHERE contactId=? AND field=?',(entryId,field))
+                cur.execute('DELETE FROM contact_values WHERE contactId=? AND field=?',(contactId,field))
                 if isinstance(value, Array) or isinstance(value, list):
                     for val in value:
-                        cur.execute('INSERT INTO contact_values (field,value,contactId) VALUES (?,?,?)',(field,val,entryId))
+                        cur.execute('INSERT INTO contact_values (field,value,contactId) VALUES (?,?,?)',(field,val,contactId))
                 else:
-                    cur.execute('INSERT INTO contact_values (field,value,contactId) VALUES (?,?,?)',(field,value,entryId))
+                    cur.execute('INSERT INTO contact_values (field,value,contactId) VALUES (?,?,?)',(field,value,contactId))
     #    cur.execute('UPDATE contacts SET updated=1 WHERE id=?',(contactId,))
         self.con.commit()
         cur.close()
diff --git a/framework/subsystems/opimd/pimb_sqlite_dates.py b/framework/subsystems/opimd/pimb_sqlite_dates.py
index b715ba6..45c6acb 100644
--- a/framework/subsystems/opimd/pimb_sqlite_dates.py
+++ b/framework/subsystems/opimd/pimb_sqlite_dates.py
@@ -162,12 +162,12 @@ class SQLiteDatesBackend(Backend):
             if field in reqfields:
                 cur.execute('UPDATE dates SET '+field+'=? WHERE id=?',(value,dateId))
             elif not field.startswith('_'):
-                cur.execute('DELETE FROM date_values WHERE dateId=? AND field=?',(entryId,field))
+                cur.execute('DELETE FROM date_values WHERE dateId=? AND field=?',(dateId,field))
                 if isinstance(value, Array) or isinstance(value, list):
                     for val in value:
-                        cur.execute('INSERT INTO date_values (field,value,dateId) VALUES (?,?,?)',(field,val,entryId))
+                        cur.execute('INSERT INTO date_values (field,value,dateId) VALUES (?,?,?)',(field,val,dateId))
                 else:
-                    cur.execute('INSERT INTO date_values (field,value,dateId) VALUES (?,?,?)',(field,value,entryId))
+                    cur.execute('INSERT INTO date_values (field,value,dateId) VALUES (?,?,?)',(field,value,dateId))
     #    cur.execute('UPDATE dates SET updated=1 WHERE id=?',(dateId,))
         self.con.commit()
         cur.close()
diff --git a/framework/subsystems/opimd/pimb_sqlite_messages.py b/framework/subsystems/opimd/pimb_sqlite_messages.py
index 1fb424f..ea21820 100644
--- a/framework/subsystems/opimd/pimb_sqlite_messages.py
+++ b/framework/subsystems/opimd/pimb_sqlite_messages.py
@@ -196,12 +196,12 @@ class SQLiteMessagesBackend(Backend):
             if field in reqfields:
                 cur.execute('UPDATE messages SET '+field+'=? WHERE id=?',(value,messageId))
             elif not field.startswith('_'):
-                cur.execute('DELETE FROM message_values WHERE messageId=? AND field=?',(entryId,field))
+                cur.execute('DELETE FROM message_values WHERE messageId=? AND field=?',(messageId,field))
                 if isinstance(value, Array) or isinstance(value, list):
                     for val in value:
-                        cur.execute('INSERT INTO message_values (field,value,messageId) VALUES (?,?,?)',(field,val,entryId))
+                        cur.execute('INSERT INTO message_values (field,value,messageId) VALUES (?,?,?)',(field,val,messageId))
                 else:
-                    cur.execute('INSERT INTO message_values (field,value,messageId) VALUES (?,?,?)',(field,value,entryId))
+                    cur.execute('INSERT INTO message_values (field,value,messageId) VALUES (?,?,?)',(field,value,messageId))
     #    cur.execute('UPDATE messages SET updated=1 WHERE id=?',(messageId,))
         self.con.commit()
         cur.close()

-- 
FSO frameworkd Debian packaging