Fixed SQL Statement errors.

Functions working now.


git-svn-id: svn://svn.siningsoft.de/Sailfish_Contacts_Restore@9 9ea9dde1-eeb2-4aae-9f27-8a0df3aa35ee

ContactRescue.py

@@ -35,7 +35,7 @@ try:
             
             
             SQLADRCur = SQLconn.cursor()
-            for ADRrow in SQLADRCur.execute('SELECT * FROM Addresses JOIN Details on Details.detailId = Addresses.detailId where contactId = ' + str(contactID)):
+            for ADRrow in SQLADRCur.execute('SELECT * FROM Addresses JOIN Details on Details.detailId = Addresses.detailId where Addresses.contactId = ' + str(contactID)):
                 adr = vcf.add('ADR').value = vobject.vcard.Address(street=ADRrow[2], city=ADRrow[5], region=ADRrow[4], code=ADRrow[6],country=ADRrow[7])
             
             ## Abfragen Organisation
@@ -47,7 +47,7 @@ try:
                     title = vcf.add('TITLE').value = str(ORGrow[4])
                 
                 if ORGrow[3] is not None:
-                    role = vcf.add('ROLE').str = value(ORGrow[3])
+                    role = vcf.add('ROLE').value = str(ORGrow[3])
                 
                 # Also parameters are possible. Could be read out
                 # | columnID | column        |

SQL/Abfragen.sql

@@ -1,4 +1,4 @@
 SELECT * FROM Contacts;
 SELECT * FROM Contacts JOIN EmailAddresses ON Contacts.contactId = EmailAddresses.contactId;
 SELECT * from PhoneNumbers JOIN Details on Details.detailId = PhoneNumbers.detailId;
-SELECT * FROM Addresses JOIN Details on Details.detailId = Addresses.detailId;
+SELECT * FROM Addresses JOIN Details on Details.detailId = Addresses.detailId where contactId = 3;