Telefonnummernextraktion erfolgreich

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

SQL/Abfragen.sql

@@ -1,3 +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;
 

Testdata/system/privileged/Contacts/calendar.stamp

@@ -1 +0,0 @@
-1

Testdata/system/privileged/Keys/storedkeys.ini

@@ -1,9 +0,0 @@
-[encoding]
-jolla/jolla-store/scheme=xor
-jolla/jolla-store/key=xor_key
-
-[encodedkeys]
-jolla/jolla-store/application_name=SVwXbVNcHE5CEz5fVFRMXkBnRl1BTF5fPAoGGhsMSmdbXUEe
-jolla/jolla-store/client_id=PSEEEjwfDk0bSygAUz4JX0pqEwc9FxdKbTE1CCsXFzYlPRIOBygFUw==
-jolla/jolla-store/client_secret=MiMmGgguDBwaBy8TNz8OX0ILXCAOHwoLEj0UNgFXJAkMJAotCR9qOBJJNzoBBwQXHDMtHRAKLhUZKBwQBxwcKgI5PBsRFDsgJCsOC0AfKhMzEwcISDsAOTMECTkJATsOKQ8sJkYzGjwrLT1GNBNdNR89EDQeEBQRFjE+BjBLMj8=
-

Testdata/system/privileged/Secrets/lockcodecheck/202adee0-eab6-477e-9858-28b6e9983c3c/file0

@@ -1,3 +0,0 @@
-org.sailfishos.secrets.plugin.encryptedstorage.sqlcipher
-¶dº™áØ„y©„yaׯÈ\ʼn<Óbâ
-ICI÷	›ÕÖÁo?‡Ä³‡™R

Testdata/system/privileged/Secrets/lockcodecheck/202adee0-eab6-477e-9858-28b6e9983c3c/file1

@@ -1,3 +0,0 @@
-org.sailfishos.secrets.plugin.encryptedstorage.sqlcipher
-¶dº™áØ„y©„yaׯÈ\ʼn<Óbâ
-ICI÷	›ÕÖÁo?‡Ä³‡™R

Testdata/system/privileged/Secrets/lockcodecheck/202adee0-eab6-477e-9858-28b6e9983c3c/file2

@@ -1,3 +0,0 @@
-org.sailfishos.secrets.plugin.encryptedstorage.sqlcipher
-¶dº™áØ„y©„yaׯÈ\ʼn<Óbâ
-ICI÷	›ÕÖÁo?‡Ä³‡™R

test/vcfExport_2_children.py

@@ -11,7 +11,7 @@ import sqlite3
 import vobject
 import uuid
 
-SQLconn = sqlite3.connect('../Testdata/system/Contacts/qtcontacts-sqlite/contacts.db')
+SQLconn = sqlite3.connect('../Testdata/contacts_with-Mail.db')
 
 
 try:

test/vcfExport_PhoneNumbers.py

@@ -5,19 +5,20 @@
 # Links
 #  FileFormatdescription: https://docs.fileformat.com/email/vcf/#vcf-30-example
 #  Pytho vobject: http://eventable.github.io/vobject/
+
 # ChangeLog
+#  2021-08-03 - multiple E-Mails with different types are working correctly
 
 import sqlite3
 import vobject
 import uuid
 
-SQLconn = sqlite3.connect('../Testdata/system/Contacts/qtcontacts-sqlite/contacts.db')
+SQLconn = sqlite3.connect('../Testdata/contacts_with-Phone-Mobile-Fax-Pager-Assistent.db')
 
 
 try:
     SQLContCur = SQLconn.cursor()
     for row in SQLContCur.execute('SELECT * FROM Contacts'):
-            print(row[4] + ' ' + row[6])
         
             # contactID abfragen
             contactID=row[0]
@@ -30,13 +31,16 @@ try:
             vcf.add('n').value = vobject.vcard.Name( family=row[6], given=row[4] )
             vcf.add('fn').value =row[1]
             
+            print("debug: Contact " + row[1])
+            
+            
             SQLEmailCur = SQLconn.cursor()
             
             ## Abfragen E-Mail-Adressen
             for Emailrow in SQLEmailCur.execute('SELECT * from EmailAddresses JOIN Details on Details.detailId= EmailAddresses.detailId where EmailAddresses.contactId = ' + str(contactID)):
                 
                 # debug ausgabe
-                print("debug: " + str(Emailrow[2]) + " at " + str(Emailrow[9]))
+                print("...debug: " + str(Emailrow[2]) + " at " + str(Emailrow[9]))
                 
                 email = vcf.add('email')
                 email.value = str(Emailrow[2])
@@ -46,7 +50,51 @@ try:
                     email.type_param = str(Emailrow[9])
 
 
+            SQLPhoneCur = SQLconn.cursor()
             
+            ## Abfragen Telefonnummer, Fax, SMS - Nummern kommen aus der gleichen Tabelle
+            for Phonerow in SQLPhoneCur.execute('SELECT * from PhoneNumbers JOIN Details on Details.detailId = PhoneNumbers.detailId where PhoneNumbers.contactId = ' + str(contactID)):
+                
+                # wir müssen die SubTypen unterscheiden
+                #Null	voice
+                #1	cell
+                #2	fax
+                #3	pager
+                #6	video
+                #10	Assistent
+                
+                
+                # debug ausgabe
+                print("...debug: " + str(Phonerow[2]) + " at " + str(Phonerow[10]) + " subtype=" + str(Phonerow[3]))
+                
+                # None is a normal phone Number
+
+
+                if Phonerow[3] == "1":
+                    phcat='cell'
+                elif Phonerow[3] == "2":
+                    phcat='fax'
+                elif Phonerow[3] == "3":
+                    phcat='pager'
+                elif Phonerow[3] == "6":
+                    phcat='video'
+                elif Phonerow[3] == "10":
+                    phcat='assistent'
+                elif Phonerow[3] is None:
+                    phcat='voice'
+                
+                print("...debug: " + phcat)
+
+                phone = vcf.add(phcat).value = str(Phonerow[2])
+                
+                # nur den Typ einpflegen, wenn das hier nicht none ist
+                if Phonerow[10] != None:
+                    try:
+                        phone.type_param = str(Phonerow[10])
+                    except AttributeError:
+                        continue
+
+            # Ausgabe
             print(vcf.serialize())
 
 # hier brauchen wir einige eception handles -> wie bekommen wir die einzelnen exceptions heruas ?