Changeset 2caea5

Timestamp:

Sep 14, 2018, 7:54:12 PM (4 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

cdc025

Parents:

12751c

Message:

import fix, relevant for 0.10-upgrade

File:

• modules/vI_rdfDatasource.js (modified) (10 diffs)

modules/vI_rdfDatasource.js

@@ -431 +431 @@
 
     for (var id in relevantIDs) {
+//       Log.debug(" search relevant id: '" + id + "'");
       var found = false;
       var accounts = getAccountsArray();
@@ -439 +440 @@
         for (let i = 0; i < identities.length; i++) {
           identity = identities[i];
+//           Log.debug(" compare id: '" + id + "' with '" + identity.key + "'");
           if (id == identity.key) {
+//             Log.debug(" found!");
             found = true;
             break;
@@ -446 +449 @@
         if (found) break;
       }
+      
       var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + id);
       var rdfIdentityName = this._getRDFValue(resource, "identityName");
@@ -451 +455 @@
       var rdfFullName = this._getRDFValue(resource, "fullName")
 
-      if (!found || rdfIdentityName != identity.identityName && rdfEmail != identity.email)
+      if (!found || rdfIdentityName != identity.identityName && rdfEmail != identity.email) {
+//         Log.debug(" found mismatch on id: '" + id + "' label: " + rdfIdentityName);
         mismatchIDs.push({
           oldkey: id,
@@ -460 +465 @@
           key: ""
         })
+      }
     }
     if (mismatchIDs.length > 0) {
@@ -599 +605 @@
           this._setRDFValue(resource, "smtp", identity.smtpServerKey);
         else
-          this._setRDFValue(resource, "smtp", virtualIdentityExtension.DEFAULT_SMTP_TAG);
+          this._setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
+        
+//         Log.debug("id:'" + identity.key +"', identityName='" + identity.identityName + "',
+//              fullName='" + identity.fullName + "', email='" + identity.email);
 
         var position = this._identityContainer.IndexOf(resource); // check for index in new recType
@@ -1171 +1180 @@
     else servers = smtpService.smtpServers;
 
+//     Log.debug("searching for label='" + label + "' hostname='" + hostname + "' username='" + username + "'");
     while (servers && servers.hasMoreElements()) {
       var server = servers.getNext();
-      if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType)
-        if (label == (server.description ? server.description : server.hostname) || (hostname == server.hostname && username == server.username))
+      if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) {
+//         Log.debug("comparing with for description='" + server.description + "' hostname='" +
+//               server.hostname + "' username='" + server.username + "'");
+        if (label == (server.description ? server.description : server.hostname) && (hostname == server.hostname && username == server.username))
           return server.key;
+      }
     }
     return null;
@@ -1298 +1311 @@
       var id_smtp = AccountManager.getIdentity(id).smtpServerKey;
       if (!id_smtp)
-        id_smtp = MailServices.smtp.defaultServer.key
+        id_smtp = DEFAULT_SMTP_TAG;
       
       if (smtp == id_smtp)
@@ -1384 +1397 @@
 
     Log.debug("import: preparation:");
-
     var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"]
       .createInstance(Components.interfaces.nsIFile);
@@ -1444 +1456 @@
 
     Log.debug("import: cleaning ID storages:");
-
+    
     this._storeMappedIDs(relevantIDs);
     this._rdfDataSource.searchIdentityMismatch();