Changeset 2caea5


Ignore:
Timestamp:
Sep 14, 2018, 7:54:12 PM (13 months ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
cdc025
Parents:
12751c
Message:

import fix, relevant for 0.10-upgrade

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/vI_rdfDatasource.js

    r12751c r2caea5  
    431431
    432432    for (var id in relevantIDs) {
     433//       Log.debug(" search relevant id: '" + id + "'");
    433434      var found = false;
    434435      var accounts = getAccountsArray();
     
    439440        for (let i = 0; i < identities.length; i++) {
    440441          identity = identities[i];
     442//           Log.debug(" compare id: '" + id + "' with '" + identity.key + "'");
    441443          if (id == identity.key) {
     444//             Log.debug(" found!");
    442445            found = true;
    443446            break;
     
    446449        if (found) break;
    447450      }
     451     
    448452      var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + id);
    449453      var rdfIdentityName = this._getRDFValue(resource, "identityName");
     
    451455      var rdfFullName = this._getRDFValue(resource, "fullName")
    452456
    453       if (!found || rdfIdentityName != identity.identityName && rdfEmail != identity.email)
     457      if (!found || rdfIdentityName != identity.identityName && rdfEmail != identity.email) {
     458//         Log.debug(" found mismatch on id: '" + id + "' label: " + rdfIdentityName);
    454459        mismatchIDs.push({
    455460          oldkey: id,
     
    460465          key: ""
    461466        })
     467      }
    462468    }
    463469    if (mismatchIDs.length > 0) {
     
    599605          this._setRDFValue(resource, "smtp", identity.smtpServerKey);
    600606        else
    601           this._setRDFValue(resource, "smtp", virtualIdentityExtension.DEFAULT_SMTP_TAG);
     607          this._setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
     608       
     609//         Log.debug("id:'" + identity.key +"', identityName='" + identity.identityName + "',
     610//              fullName='" + identity.fullName + "', email='" + identity.email);
    602611
    603612        var position = this._identityContainer.IndexOf(resource); // check for index in new recType
     
    11711180    else servers = smtpService.smtpServers;
    11721181
     1182//     Log.debug("searching for label='" + label + "' hostname='" + hostname + "' username='" + username + "'");
    11731183    while (servers && servers.hasMoreElements()) {
    11741184      var server = servers.getNext();
    1175       if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType)
    1176         if (label == (server.description ? server.description : server.hostname) || (hostname == server.hostname && username == server.username))
     1185      if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) {
     1186//         Log.debug("comparing with for description='" + server.description + "' hostname='" +
     1187//               server.hostname + "' username='" + server.username + "'");
     1188        if (label == (server.description ? server.description : server.hostname) && (hostname == server.hostname && username == server.username))
    11771189          return server.key;
     1190      }
    11781191    }
    11791192    return null;
     
    12981311      var id_smtp = AccountManager.getIdentity(id).smtpServerKey;
    12991312      if (!id_smtp)
    1300         id_smtp = MailServices.smtp.defaultServer.key
     1313        id_smtp = DEFAULT_SMTP_TAG;
    13011314     
    13021315      if (smtp == id_smtp)
     
    13841397
    13851398    Log.debug("import: preparation:");
    1386 
    13871399    var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"]
    13881400      .createInstance(Components.interfaces.nsIFile);
     
    14441456
    14451457    Log.debug("import: cleaning ID storages:");
    1446 
     1458   
    14471459    this._storeMappedIDs(relevantIDs);
    14481460    this._rdfDataSource.searchIdentityMismatch();
Note: See TracChangeset for help on using the changeset viewer.