mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1587016 - Convert import code to use new address book provider. r=mkmelin

This commit is contained in:
Geoff Lankow 2019-10-12 11:26:11 +13:00
Родитель 454138b288
Коммит 78bfe8caa8
20 изменённых файлов: 315 добавлений и 391 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
mailnews/addrbook/public/nsIAbLDIFService.idl
Просмотреть файл

@ -5,7 +5,7 @@
#include "nsISupports.idl"
interface nsIFile;
interface nsIAddrDatabase;
interface nsIAbDirectory;
[scriptable, uuid(7afaa95f-0b1c-4d8a-a65f-bb5073ed6d39)]
interface nsIAbLDIFService : nsISupports {
@ -24,7 +24,7 @@ interface nsIAbLDIFService : nsISupports {
/**
* Imports a file into the specified address book.
*
* @param aDb The address book to import addresses into.
* @param aDirectory The address book to import addresses into.
*
* @param aSrc The file to import addresses from.
*
@ -36,5 +36,8 @@ interface nsIAbLDIFService : nsISupports {
* current position of reading from the file.
*
*/
void importLDIFFile(in nsIAddrDatabase aDb, in nsIFile aSrc, in boolean aStoreLocAsHome, inout unsigned long aProgress);
void importLDIFFile(in nsIAbDirectory aDirectory,
in nsIFile aSrc,
in boolean aStoreLocAsHome,
inout unsigned long aProgress);
};

300
mailnews/addrbook/src/nsAbLDIFService.cpp
Просмотреть файл

@ -2,7 +2,9 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIAddrDatabase.h"
#include "nsAbBaseCID.h"
#include "nsIAbDirectory.h"
#include "nsIAbCard.h"
#include "nsString.h"
#include "nsAbLDIFService.h"
#include "nsIFile.h"
@ -52,12 +54,12 @@ static unsigned char b642nib[0x80] = {
0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff};
NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb,
NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAbDirectory *aDirectory,
nsIFile *aSrc,
bool aStoreLocAsHome,
uint32_t *aProgress) {
NS_ENSURE_ARG_POINTER(aSrc);
NS_ENSURE_ARG_POINTER(aDb);
NS_ENSURE_ARG_POINTER(aDirectory);
mStoreLocAsHome = aStoreLocAsHome;
@ -84,7 +86,7 @@ NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb,
while (NS_SUCCEEDED(GetLdifStringRecord(buf, len, startPos))) {
if (mLdifLine.Find("groupOfNames") == -1)
AddLdifRowToDatabase(aDb, false);
AddLdifRowToDatabase(aDirectory, false);
else {
// keep file position for mailing list
listPosArray.AppendElement(savedStartPos);
@ -99,7 +101,7 @@ NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb,
}
// last row
if (!mLdifLine.IsEmpty() && mLdifLine.Find("groupOfNames") == -1)
AddLdifRowToDatabase(aDb, false);
AddLdifRowToDatabase(aDirectory, false);
// mail Lists
int32_t i, pos;
@ -125,7 +127,7 @@ NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb,
while (NS_SUCCEEDED(GetLdifStringRecord(listBuf, len, startPos))) {
if (mLdifLine.Find("groupOfNames") != -1) {
AddLdifRowToDatabase(aDb, true);
AddLdifRowToDatabase(aDirectory, true);
if (NS_SUCCEEDED(
seekableStream->Seek(nsISeekableStream::NS_SEEK_SET, 0)))
break;
@ -139,8 +141,7 @@ NS_IMETHODIMP nsAbLDIFService::ImportLDIFFile(nsIAddrDatabase *aDb,
rv = inputStream->Close();
NS_ENSURE_SUCCESS(rv, rv);
// Finally commit everything to the database and return.
return aDb->Commit(nsAddrDBCommitType::kLargeCommit);
return rv;
}
/*
@ -311,8 +312,12 @@ nsresult nsAbLDIFService::GetLdifStringRecord(char *buf, int32_t len,
return NS_ERROR_FAILURE;
}
void nsAbLDIFService::AddLdifRowToDatabase(nsIAddrDatabase *aDatabase,
void nsAbLDIFService::AddLdifRowToDatabase(nsIAbDirectory *aDirectory,
bool bIsList) {
if (!aDirectory) {
return;
}
// If no data to process then reset CR/LF counters and return.
if (mLdifLine.IsEmpty()) {
mLFCount = 0;
@ -320,16 +325,8 @@ void nsAbLDIFService::AddLdifRowToDatabase(nsIAddrDatabase *aDatabase,
return;
}
nsCOMPtr<nsIMdbRow> newRow;
if (aDatabase) {
if (bIsList)
aDatabase->GetNewListRow(getter_AddRefs(newRow));
else
aDatabase->GetNewRow(getter_AddRefs(newRow));
if (!newRow) return;
} else
return;
nsCOMPtr<nsIAbCard> newCard = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID);
nsTArray<nsCString> members;
char *cursor = ToNewCString(mLdifLine);
char *saveCursor = cursor; /* keep for deleting */
@ -339,125 +336,154 @@ void nsAbLDIFService::AddLdifRowToDatabase(nsIAddrDatabase *aDatabase,
int length = 0; // the length of an ldif attribute
while ((line = str_getline(&cursor)) != nullptr) {
if (NS_SUCCEEDED(str_parse_line(line, &typeSlot, &valueSlot, &length))) {
AddLdifColToDatabase(aDatabase, newRow, typeSlot, valueSlot, bIsList);
nsAutoCString colType(typeSlot);
nsAutoCString column(valueSlot);
// 4.x exports attributes like "givenname",
// mozilla does "givenName" to be compliant with RFC 2798
ToLowerCase(colType);
if (colType.EqualsLiteral("member") ||
colType.EqualsLiteral("uniquemember")) {
members.AppendElement(column);
} else {
AddLdifColToDatabase(aDirectory, newCard, colType, column, bIsList);
}
} else
continue; // parse error: continue with next loop iteration
}
free(saveCursor);
aDatabase->AddCardRowToDB(newRow);
if (bIsList) aDatabase->AddListDirNode(newRow);
if (bIsList) {
nsCOMPtr<nsIAbDirectory> newList =
do_CreateInstance(NS_ABDIRPROPERTY_CONTRACTID);
newList->SetIsMailList(true);
nsAutoString temp;
newCard->GetDisplayName(temp);
newList->SetDirName(temp);
temp.Truncate();
newCard->GetPropertyAsAString(kNicknameProperty, temp);
newList->SetListNickName(temp);
temp.Truncate();
newCard->GetPropertyAsAString(kNotesProperty, temp);
newList->SetDescription(temp);
nsIAbDirectory *outList;
aDirectory->AddMailList(newList, &outList);
int32_t count = members.Length();
for (int32_t i = 0; i < count; ++i) {
nsAutoCString email;
int32_t emailPos = members[i].Find("mail=");
emailPos += strlen("mail=");
email = Substring(members[i], emailPos);
nsCOMPtr<nsIAbCard> emailCard;
aDirectory->CardForEmailAddress(email, getter_AddRefs(emailCard));
if (emailCard) {
nsIAbCard *outCard;
outList->AddCard(emailCard, &outCard);
}
}
} else {
nsIAbCard *outCard;
aDirectory->AddCard(newCard, &outCard);
}
// Clear buffer for next record
ClearLdifRecordBuffer();
}
void nsAbLDIFService::AddLdifColToDatabase(nsIAddrDatabase *aDatabase,
nsIMdbRow *newRow, char *typeSlot,
char *valueSlot, bool bIsList) {
nsAutoCString colType(typeSlot);
nsAutoCString column(valueSlot);
void nsAbLDIFService::AddLdifColToDatabase(nsIAbDirectory *aDirectory,
nsIAbCard *newCard,
nsCString colType, nsCString column,
bool bIsList) {
nsString value = NS_ConvertUTF8toUTF16(column);
// 4.x exports attributes like "givenname",
// mozilla does "givenName" to be compliant with RFC 2798
ToLowerCase(colType);
mdb_u1 firstByte = (mdb_u1)(colType.get())[0];
char firstByte = colType.get()[0];
switch (firstByte) {
case 'b':
if (colType.EqualsLiteral("birthyear"))
aDatabase->AddBirthYear(newRow, column.get());
newCard->SetPropertyAsAString(kBirthYearProperty, value);
else if (colType.EqualsLiteral("birthmonth"))
aDatabase->AddBirthMonth(newRow, column.get());
newCard->SetPropertyAsAString(kBirthMonthProperty, value);
else if (colType.EqualsLiteral("birthday"))
aDatabase->AddBirthDay(newRow, column.get());
newCard->SetPropertyAsAString(kBirthDayProperty, value);
break; // 'b'
case 'c':
if (colType.EqualsLiteral("cn") || colType.EqualsLiteral("commonname")) {
if (bIsList)
aDatabase->AddListName(newRow, column.get());
else
aDatabase->AddDisplayName(newRow, column.get());
newCard->SetDisplayName(value);
} else if (colType.EqualsLiteral("c") ||
colType.EqualsLiteral("countryname")) {
if (mStoreLocAsHome)
aDatabase->AddHomeCountry(newRow, column.get());
newCard->SetPropertyAsAString(kHomeCountryProperty, value);
else
aDatabase->AddWorkCountry(newRow, column.get());
newCard->SetPropertyAsAString(kWorkCountryProperty, value);
}
else if (colType.EqualsLiteral("cellphone"))
aDatabase->AddCellularNumber(newRow, column.get());
newCard->SetPropertyAsAString(kCellularProperty, value);
else if (colType.EqualsLiteral("carphone"))
aDatabase->AddCellularNumber(newRow, column.get());
newCard->SetPropertyAsAString(kCellularProperty, value);
else if (colType.EqualsLiteral("custom1"))
aDatabase->AddCustom1(newRow, column.get());
newCard->SetPropertyAsAString(kCustom1Property, value);
else if (colType.EqualsLiteral("custom2"))
aDatabase->AddCustom2(newRow, column.get());
newCard->SetPropertyAsAString(kCustom2Property, value);
else if (colType.EqualsLiteral("custom3"))
aDatabase->AddCustom3(newRow, column.get());
newCard->SetPropertyAsAString(kCustom3Property, value);
else if (colType.EqualsLiteral("custom4"))
aDatabase->AddCustom4(newRow, column.get());
newCard->SetPropertyAsAString(kCustom4Property, value);
else if (colType.EqualsLiteral("company"))
aDatabase->AddCompany(newRow, column.get());
newCard->SetPropertyAsAString(kCompanyProperty, value);
break; // 'c'
case 'd':
if (colType.EqualsLiteral("description")) {
if (bIsList)
aDatabase->AddListDescription(newRow, column.get());
else
aDatabase->AddNotes(newRow, column.get());
}
if (colType.EqualsLiteral("description"))
newCard->SetPropertyAsAString(kNotesProperty, value);
else if (colType.EqualsLiteral("department"))
aDatabase->AddDepartment(newRow, column.get());
newCard->SetPropertyAsAString(kDepartmentProperty, value);
else if (colType.EqualsLiteral("displayname")) {
if (bIsList)
aDatabase->AddListName(newRow, column.get());
else
aDatabase->AddDisplayName(newRow, column.get());
}
else if (colType.EqualsLiteral("displayname"))
newCard->SetDisplayName(value);
break; // 'd'
case 'f':
if (colType.EqualsLiteral("fax") ||
colType.EqualsLiteral("facsimiletelephonenumber"))
aDatabase->AddFaxNumber(newRow, column.get());
newCard->SetPropertyAsAString(kFaxProperty, value);
break; // 'f'
case 'g':
if (colType.EqualsLiteral("givenname"))
aDatabase->AddFirstName(newRow, column.get());
if (colType.EqualsLiteral("givenname")) newCard->SetFirstName(value);
break; // 'g'
case 'h':
if (colType.EqualsLiteral("homephone"))
aDatabase->AddHomePhone(newRow, column.get());
newCard->SetPropertyAsAString(kHomePhoneProperty, value);
else if (colType.EqualsLiteral("homestreet"))
aDatabase->AddHomeAddress(newRow, column.get());
newCard->SetPropertyAsAString(kHomeAddressProperty, value);
else if (colType.EqualsLiteral("homeurl"))
aDatabase->AddWebPage2(newRow, column.get());
newCard->SetPropertyAsAString(kHomeWebPageProperty, value);
break; // 'h'
case 'l':
if (colType.EqualsLiteral("l") || colType.EqualsLiteral("locality")) {
if (mStoreLocAsHome)
aDatabase->AddHomeCity(newRow, column.get());
newCard->SetPropertyAsAString(kHomeCityProperty, value);
else
aDatabase->AddWorkCity(newRow, column.get());
newCard->SetPropertyAsAString(kWorkCityProperty, value);
}
// labeledURI contains a URI and, optionally, a label
// This will remove the label and place the URI as the work URL
@ -465,94 +491,89 @@ void nsAbLDIFService::AddLdifColToDatabase(nsIAddrDatabase *aDatabase,
int32_t index = column.FindChar(' ');
if (index != -1) column.SetLength(index);
aDatabase->AddWebPage1(newRow, column.get());
newCard->SetPropertyAsAString(kWorkWebPageProperty,
NS_ConvertUTF8toUTF16(column));
}
break; // 'l'
case 'm':
if (colType.EqualsLiteral("mail"))
aDatabase->AddPrimaryEmail(newRow, column.get());
else if (colType.EqualsLiteral("member") && bIsList)
aDatabase->AddLdifListMember(newRow, column.get());
newCard->SetPrimaryEmail(value);
else if (colType.EqualsLiteral("mobile"))
aDatabase->AddCellularNumber(newRow, column.get());
newCard->SetPropertyAsAString(kCellularProperty, value);
else if (colType.EqualsLiteral("mozilla_aimscreenname"))
aDatabase->AddAimScreenName(newRow, column.get());
newCard->SetPropertyAsAString(kAIMProperty, value);
else if (colType.EqualsLiteral("mozillacustom1"))
aDatabase->AddCustom1(newRow, column.get());
newCard->SetPropertyAsAString(kCustom1Property, value);
else if (colType.EqualsLiteral("mozillacustom2"))
aDatabase->AddCustom2(newRow, column.get());
newCard->SetPropertyAsAString(kCustom2Property, value);
else if (colType.EqualsLiteral("mozillacustom3"))
aDatabase->AddCustom3(newRow, column.get());
newCard->SetPropertyAsAString(kCustom3Property, value);
else if (colType.EqualsLiteral("mozillacustom4"))
aDatabase->AddCustom4(newRow, column.get());
newCard->SetPropertyAsAString(kCustom4Property, value);
else if (colType.EqualsLiteral("mozillahomecountryname"))
aDatabase->AddHomeCountry(newRow, column.get());
newCard->SetPropertyAsAString(kHomeCountryProperty, value);
else if (colType.EqualsLiteral("mozillahomelocalityname"))
aDatabase->AddHomeCity(newRow, column.get());
newCard->SetPropertyAsAString(kHomeCityProperty, value);
else if (colType.EqualsLiteral("mozillahomestate"))
aDatabase->AddHomeState(newRow, column.get());
newCard->SetPropertyAsAString(kHomeStateProperty, value);
else if (colType.EqualsLiteral("mozillahomestreet"))
aDatabase->AddHomeAddress(newRow, column.get());
newCard->SetPropertyAsAString(kHomeAddressProperty, value);
else if (colType.EqualsLiteral("mozillahomestreet2"))
aDatabase->AddHomeAddress2(newRow, column.get());
newCard->SetPropertyAsAString(kHomeAddress2Property, value);
else if (colType.EqualsLiteral("mozillahomepostalcode"))
aDatabase->AddHomeZipCode(newRow, column.get());
newCard->SetPropertyAsAString(kHomeZipCodeProperty, value);
else if (colType.EqualsLiteral("mozillahomeurl"))
aDatabase->AddWebPage2(newRow, column.get());
newCard->SetPropertyAsAString(kHomeWebPageProperty, value);
else if (colType.EqualsLiteral("mozillanickname")) {
if (bIsList)
aDatabase->AddListNickName(newRow, column.get());
else
aDatabase->AddNickName(newRow, column.get());
}
else if (colType.EqualsLiteral("mozillanickname"))
newCard->SetPropertyAsAString(kNicknameProperty, value);
else if (colType.EqualsLiteral("mozillasecondemail"))
aDatabase->Add2ndEmail(newRow, column.get());
newCard->SetPropertyAsAString(k2ndEmailProperty, value);
else if (colType.EqualsLiteral("mozillausehtmlmail")) {
ToLowerCase(column);
if (-1 != column.Find("true"))
aDatabase->AddPreferMailFormat(newRow, nsIAbPreferMailFormat::html);
newCard->SetPropertyAsUint32(kPreferMailFormatProperty,
nsIAbPreferMailFormat::html);
else if (-1 != column.Find("false"))
aDatabase->AddPreferMailFormat(newRow,
nsIAbPreferMailFormat::plaintext);
newCard->SetPropertyAsUint32(kPreferMailFormatProperty,
nsIAbPreferMailFormat::plaintext);
else
aDatabase->AddPreferMailFormat(newRow,
nsIAbPreferMailFormat::unknown);
newCard->SetPropertyAsUint32(kPreferMailFormatProperty,
nsIAbPreferMailFormat::unknown);
}
else if (colType.EqualsLiteral("mozillaworkstreet2"))
aDatabase->AddWorkAddress2(newRow, column.get());
newCard->SetPropertyAsAString(kWorkAddress2Property, value);
else if (colType.EqualsLiteral("mozillaworkurl"))
aDatabase->AddWebPage1(newRow, column.get());
newCard->SetPropertyAsAString(kWorkWebPageProperty, value);
break; // 'm'
case 'n':
if (colType.EqualsLiteral("notes"))
aDatabase->AddNotes(newRow, column.get());
newCard->SetPropertyAsAString(kNotesProperty, value);
else if (colType.EqualsLiteral("nscpaimscreenname") ||
colType.EqualsLiteral("nsaimid"))
aDatabase->AddAimScreenName(newRow, column.get());
newCard->SetPropertyAsAString(kAIMProperty, value);
break; // 'n'
@ -561,106 +582,103 @@ void nsAbLDIFService::AddLdifColToDatabase(nsIAddrDatabase *aDatabase,
break;
else if (colType.EqualsLiteral("ou") || colType.EqualsLiteral("orgunit"))
aDatabase->AddDepartment(newRow, column.get());
newCard->SetPropertyAsAString(kDepartmentProperty, value);
else if (colType.EqualsLiteral("o")) // organization
aDatabase->AddCompany(newRow, column.get());
newCard->SetPropertyAsAString(kCompanyProperty, value);
break; // 'o'
case 'p':
if (colType.EqualsLiteral("postalcode")) {
if (mStoreLocAsHome)
aDatabase->AddHomeZipCode(newRow, column.get());
newCard->SetPropertyAsAString(kHomeZipCodeProperty, value);
else
aDatabase->AddWorkZipCode(newRow, column.get());
newCard->SetPropertyAsAString(kWorkZipCodeProperty, value);
}
else if (colType.EqualsLiteral("postofficebox")) {
nsAutoCString workAddr1, workAddr2;
SplitCRLFAddressField(column, workAddr1, workAddr2);
aDatabase->AddWorkAddress(newRow, workAddr1.get());
aDatabase->AddWorkAddress2(newRow, workAddr2.get());
newCard->SetPropertyAsAString(kWorkAddressProperty,
NS_ConvertUTF8toUTF16(workAddr1));
newCard->SetPropertyAsAString(kWorkAddress2Property,
NS_ConvertUTF8toUTF16(workAddr2));
} else if (colType.EqualsLiteral("pager") ||
colType.EqualsLiteral("pagerphone"))
aDatabase->AddPagerNumber(newRow, column.get());
newCard->SetPropertyAsAString(kPagerProperty, value);
break; // 'p'
case 'r':
if (colType.EqualsLiteral("region")) {
aDatabase->AddWorkState(newRow, column.get());
newCard->SetPropertyAsAString(kWorkStateProperty, value);
}
break; // 'r'
case 's':
if (colType.EqualsLiteral("sn") || colType.EqualsLiteral("surname"))
aDatabase->AddLastName(newRow, column.get());
newCard->SetPropertyAsAString(kLastNameProperty, value);
else if (colType.EqualsLiteral("street"))
aDatabase->AddWorkAddress(newRow, column.get());
newCard->SetPropertyAsAString(kWorkAddressProperty, value);
else if (colType.EqualsLiteral("streetaddress")) {
nsAutoCString addr1, addr2;
SplitCRLFAddressField(column, addr1, addr2);
if (mStoreLocAsHome) {
aDatabase->AddHomeAddress(newRow, addr1.get());
aDatabase->AddHomeAddress2(newRow, addr2.get());
newCard->SetPropertyAsAString(kHomeAddressProperty,
NS_ConvertUTF8toUTF16(addr1));
newCard->SetPropertyAsAString(kHomeAddress2Property,
NS_ConvertUTF8toUTF16(addr2));
} else {
aDatabase->AddWorkAddress(newRow, addr1.get());
aDatabase->AddWorkAddress2(newRow, addr2.get());
newCard->SetPropertyAsAString(kWorkAddressProperty,
NS_ConvertUTF8toUTF16(addr1));
newCard->SetPropertyAsAString(kWorkAddress2Property,
NS_ConvertUTF8toUTF16(addr2));
}
} else if (colType.EqualsLiteral("st")) {
if (mStoreLocAsHome)
aDatabase->AddHomeState(newRow, column.get());
newCard->SetPropertyAsAString(kHomeStateProperty, value);
else
aDatabase->AddWorkState(newRow, column.get());
newCard->SetPropertyAsAString(kWorkStateProperty, value);
}
break; // 's'
case 't':
if (colType.EqualsLiteral("title"))
aDatabase->AddJobTitle(newRow, column.get());
newCard->SetPropertyAsAString(kJobTitleProperty, value);
else if (colType.EqualsLiteral("telephonenumber")) {
aDatabase->AddWorkPhone(newRow, column.get());
newCard->SetPropertyAsAString(kWorkPhoneProperty, value);
}
break; // 't'
case 'u':
if (colType.EqualsLiteral("uniquemember") && bIsList)
aDatabase->AddLdifListMember(newRow, column.get());
break; // 'u'
case 'w':
if (colType.EqualsLiteral("workurl"))
aDatabase->AddWebPage1(newRow, column.get());
newCard->SetPropertyAsAString(kWorkWebPageProperty, value);
break; // 'w'
case 'x':
if (colType.EqualsLiteral("xmozillanickname")) {
if (bIsList)
aDatabase->AddListNickName(newRow, column.get());
else
aDatabase->AddNickName(newRow, column.get());
newCard->SetPropertyAsAString(kNicknameProperty, value);
}
else if (colType.EqualsLiteral("xmozillausehtmlmail")) {
ToLowerCase(column);
if (-1 != column.Find("true"))
aDatabase->AddPreferMailFormat(newRow, nsIAbPreferMailFormat::html);
newCard->SetPropertyAsUint32(kPreferMailFormatProperty,
nsIAbPreferMailFormat::html);
else if (-1 != column.Find("false"))
aDatabase->AddPreferMailFormat(newRow,
nsIAbPreferMailFormat::plaintext);
newCard->SetPropertyAsUint32(kPreferMailFormatProperty,
nsIAbPreferMailFormat::plaintext);
else
aDatabase->AddPreferMailFormat(newRow,
nsIAbPreferMailFormat::unknown);
newCard->SetPropertyAsUint32(kPreferMailFormatProperty,
nsIAbPreferMailFormat::unknown);
}
break; // 'x'
@ -669,9 +687,9 @@ void nsAbLDIFService::AddLdifColToDatabase(nsIAddrDatabase *aDatabase,
if (colType.EqualsLiteral("zip")) // alias for postalcode
{
if (mStoreLocAsHome)
aDatabase->AddHomeZipCode(newRow, column.get());
newCard->SetPropertyAsAString(kHomeZipCodeProperty, value);
else
aDatabase->AddWorkZipCode(newRow, column.get());
newCard->SetPropertyAsAString(kWorkZipCodeProperty, value);
}
break; // 'z'

8
mailnews/addrbook/src/nsAbLDIFService.h
Просмотреть файл

@ -8,8 +8,6 @@
#include "nsIAbLDIFService.h"
#include "nsCOMPtr.h"
class nsIMdbRow;
class nsAbLDIFService : public nsIAbLDIFService {
public:
NS_DECL_ISUPPORTS
@ -23,9 +21,9 @@ class nsAbLDIFService : public nsIAbLDIFService {
int *vlen) const;
char *str_getline(char **next) const;
nsresult GetLdifStringRecord(char *buf, int32_t len, int32_t &stopPos);
void AddLdifRowToDatabase(nsIAddrDatabase *aDatabase, bool aIsList);
void AddLdifColToDatabase(nsIAddrDatabase *aDatabase, nsIMdbRow *newRow,
char *typeSlot, char *valueSlot, bool bIsList);
void AddLdifRowToDatabase(nsIAbDirectory *aDirectory, bool aIsList);
void AddLdifColToDatabase(nsIAbDirectory *aDirectory, nsIAbCard *newCard,
nsCString colType, nsCString column, bool bIsList);
void ClearLdifRecordBuffer();
void SplitCRLFAddressField(nsCString &inputAddress, nsCString &outputLine1,
nsCString &outputLine2) const;

2
mailnews/import/becky/src/nsBeckyAddressBooks.cpp
Просмотреть файл

@ -252,7 +252,7 @@ nsBeckyAddressBooks::InitFieldMap(nsIImportFieldMap *aFieldMap) {
NS_IMETHODIMP
nsBeckyAddressBooks::ImportAddressBook(
nsIImportABDescriptor *aSource, nsIAddrDatabase *aDestination,
nsIImportABDescriptor *aSource, nsIAbDirectory *aDestination,
nsIImportFieldMap *aFieldMap, nsISupports *aSupportService,
char16_t **aErrorLog, char16_t **aSuccessLog, bool *aFatalError) {
NS_ENSURE_ARG_POINTER(aSource);

8
mailnews/import/outlook/src/nsOutlookImport.cpp
Просмотреть файл

@ -20,7 +20,7 @@
#include "nsIImportFieldMap.h"
#include "nsXPCOM.h"
#include "nsISupportsPrimitives.h"
#include "nsIAddrDatabase.h"
#include "nsIAbDirectory.h"
#include "nsOutlookSettings.h"
#include "nsTextFormatter.h"
#include "nsOutlookStringBundle.h"
@ -108,7 +108,7 @@ class ImportOutlookAddressImpl : public nsIImportAddressBooks {
}
NS_IMETHOD ImportAddressBook(nsIImportABDescriptor *source,
nsIAddrDatabase *destination,
nsIAbDirectory *destination,
nsIImportFieldMap *fieldMap,
nsISupports *aSupportService,
char16_t **errorLog, char16_t **successLog,
@ -449,7 +449,7 @@ NS_IMETHODIMP ImportOutlookAddressImpl::FindAddressBooks(nsIFile *location,
}
NS_IMETHODIMP ImportOutlookAddressImpl::ImportAddressBook(
nsIImportABDescriptor *source, nsIAddrDatabase *destination,
nsIImportABDescriptor *source, nsIAbDirectory *destination,
nsIImportFieldMap *fieldMap, nsISupports *aSupportService,
char16_t **pErrorLog, char16_t **pSuccessLog, bool *fatalError) {
m_msgCount = 0;
@ -490,7 +490,7 @@ NS_IMETHODIMP ImportOutlookAddressImpl::ImportAddressBook(
ImportOutlookMailImpl::SetLogs(success, error, pErrorLog, pSuccessLog);
IMPORT_LOG0("*** Returning from outlook address import\n");
return destination->Commit(nsAddrDBCommitType::kLargeCommit);
return NS_OK;
}
NS_IMETHODIMP ImportOutlookAddressImpl::GetImportProgress(uint32_t *_retval) {

104
mailnews/import/outlook/src/nsOutlookMail.cpp
Просмотреть файл

@ -495,7 +495,7 @@ BOOL nsOutlookMail::WriteData(nsIOutputStream *pDest, const char *pData,
nsresult nsOutlookMail::ImportAddresses(uint32_t *pCount, uint32_t *pTotal,
const char16_t *pName, uint32_t id,
nsIAddrDatabase *pDb,
nsIAbDirectory *pDirectory,
nsString &errors) {
if (id >= (uint32_t)(m_addressList.GetSize())) {
IMPORT_LOG0("*** Bad address identifier, unable to import\n");
@ -583,14 +583,13 @@ nsresult nsOutlookMail::ImportAddresses(uint32_t *pCount, uint32_t *pTotal,
pVal = m_mapi.GetMapiProperty(lpMsg, PR_SUBJECT);
if (pVal) m_mapi.GetStringFromProp(pVal, subject);
nsIMdbRow *newRow = nullptr;
pDb->GetNewRow(&newRow);
// FIXME: Check with Candice about releasing the newRow if it
// isn't added to the database. Candice's code in nsAddressBook
// never releases it but that doesn't seem right to me!
if (newRow) {
if (BuildCard(subject.get(), pDb, newRow, lpMsg, pFieldMap)) {
pDb->AddCardRowToDB(newRow);
nsCOMPtr<nsIAbCard> newCard =
do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv);
if (newCard) {
if (BuildCard(subject.get(), pDirectory, newCard, lpMsg,
pFieldMap)) {
nsIAbCard *outCard;
pDirectory->AddCard(newCard, &outCard);
}
}
} else if (type.EqualsLiteral("IPM.DistList")) {
@ -598,7 +597,7 @@ nsresult nsOutlookMail::ImportAddresses(uint32_t *pCount, uint32_t *pTotal,
subject.Truncate();
pVal = m_mapi.GetMapiProperty(lpMsg, PR_SUBJECT);
if (pVal) m_mapi.GetStringFromProp(pVal, subject);
CreateList(subject.get(), pDb, lpMsg, pFieldMap);
CreateList(subject, pDirectory, lpMsg, pFieldMap);
}
}
@ -606,25 +605,23 @@ nsresult nsOutlookMail::ImportAddresses(uint32_t *pCount, uint32_t *pTotal,
}
}
rv = pDb->Commit(nsAddrDBCommitType::kLargeCommit);
return rv;
}
nsresult nsOutlookMail::CreateList(const char16_t *pName, nsIAddrDatabase *pDb,
nsresult nsOutlookMail::CreateList(const nsString &pName,
nsIAbDirectory *pDirectory,
LPMAPIPROP pUserList,
nsIImportFieldMap *pFieldMap) {
// If no name provided then we're done.
if (!pName || !(*pName)) return NS_OK;
if (pName.IsEmpty()) return NS_OK;
nsresult rv = NS_ERROR_FAILURE;
// Make sure we have db to work with.
if (!pDb) return rv;
if (!pDirectory) return rv;
nsCOMPtr<nsIMdbRow> newListRow;
rv = pDb->GetNewListRow(getter_AddRefs(newListRow));
nsCOMPtr<nsIAbDirectory> newList =
do_CreateInstance(NS_ABDIRPROPERTY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsAutoCString column;
LossyCopyUTF16toASCII(nsDependentString(pName), column);
rv = pDb->AddListName(newListRow, column.get());
rv = newList->SetDirName(pName);
NS_ENSURE_SUCCESS(rv, rv);
HRESULT hr;
@ -662,7 +659,7 @@ nsresult nsOutlookMail::CreateList(const char16_t *pName, nsIAddrDatabase *pDb,
cbEid = sa->lpbin[idx].cb;
if (!m_mapi.OpenEntry(cbEid, lpEid, (LPUNKNOWN *)&lpMsg)) {
IMPORT_LOG1("*** Error opening messages in mailbox: %S\n", pName);
IMPORT_LOG1("*** Error opening messages in mailbox: %S\n", pName.get());
m_mapi.MAPIFreeBuffer(value);
return NS_ERROR_FAILURE;
}
@ -671,38 +668,19 @@ nsresult nsOutlookMail::CreateList(const char16_t *pName, nsIAddrDatabase *pDb,
pVal = m_mapi.GetMapiProperty(lpMsg, PR_SUBJECT);
if (pVal) m_mapi.GetStringFromProp(pVal, subject);
nsCOMPtr<nsIMdbRow> newRow;
nsCOMPtr<nsIMdbRow> oldRow;
pDb->GetNewRow(getter_AddRefs(newRow));
if (newRow) {
if (BuildCard(subject.get(), pDb, newRow, lpMsg, pFieldMap)) {
nsCOMPtr<nsIAbCard> userCard;
nsCOMPtr<nsIAbCard> newCard;
userCard = do_CreateInstance(NS_ABMDBCARD_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
pDb->InitCardFromRow(userCard, newRow);
// add card to db
pDb->FindRowByCard(userCard, getter_AddRefs(oldRow));
if (oldRow)
newRow = oldRow;
else
pDb->AddCardRowToDB(newRow);
// add card list
pDb->AddListCardColumnsToRow(userCard, newListRow, idx + 1,
getter_AddRefs(newCard), true, nullptr,
nullptr);
nsCOMPtr<nsIAbCard> newCard =
do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv);
if (newCard) {
if (BuildCard(subject.get(), pDirectory, newCard, lpMsg, pFieldMap)) {
nsIAbCard *outCard;
newList->AddCard(newCard, &outCard);
}
}
}
m_mapi.MAPIFreeBuffer(value);
rv = pDb->AddCardRowToDB(newListRow);
NS_ENSURE_SUCCESS(rv, rv);
rv = pDb->SetListAddressTotal(newListRow, (uint32_t)total);
rv = pDb->AddListDirNode(newListRow);
nsIAbDirectory *outList;
rv = pDirectory->AddMailList(newList, &outList);
return rv;
}
@ -727,8 +705,8 @@ void nsOutlookMail::SplitString(nsString &val1, nsString &val2) {
}
}
bool nsOutlookMail::BuildCard(const char16_t *pName, nsIAddrDatabase *pDb,
nsIMdbRow *newRow, LPMAPIPROP pUser,
bool nsOutlookMail::BuildCard(const char16_t *pName, nsIAbDirectory *pDirectory,
nsIAbCard *newCard, LPMAPIPROP pUser,
nsIImportFieldMap *pFieldMap) {
nsString lastName;
nsString firstName;
@ -809,22 +787,22 @@ bool nsOutlookMail::BuildCard(const char16_t *pName, nsIAddrDatabase *pDb,
// We now have the required fields
// write them out followed by any optional fields!
if (!displayName.IsEmpty()) {
pDb->AddDisplayName(newRow, NS_ConvertUTF16toUTF8(displayName).get());
newCard->SetDisplayName(displayName);
}
if (!firstName.IsEmpty()) {
pDb->AddFirstName(newRow, NS_ConvertUTF16toUTF8(firstName).get());
newCard->SetFirstName(firstName);
}
if (!lastName.IsEmpty()) {
pDb->AddLastName(newRow, NS_ConvertUTF16toUTF8(lastName).get());
newCard->SetLastName(lastName);
}
if (!nickName.IsEmpty()) {
pDb->AddNickName(newRow, NS_ConvertUTF16toUTF8(nickName).get());
newCard->SetPropertyAsAString(kNicknameProperty, nickName);
}
if (!eMail.IsEmpty()) {
pDb->AddPrimaryEmail(newRow, NS_ConvertUTF16toUTF8(eMail).get());
newCard->SetPrimaryEmail(eMail);
}
if (!secondEMail.IsEmpty()) {
pDb->Add2ndEmail(newRow, NS_ConvertUTF16toUTF8(secondEMail).get());
newCard->SetPropertyAsAString(k2ndEmailProperty, secondEMail);
}
// Do all of the extra fields!
@ -841,20 +819,20 @@ bool nsOutlookMail::BuildCard(const char16_t *pName, nsIAddrDatabase *pDb,
if (!value.IsEmpty()) {
if (gMapiFields[i].multiLine == kNoMultiLine) {
SanitizeValue(value);
pFieldMap->SetFieldValue(pDb, newRow, gMapiFields[i].mozField,
value.get());
pFieldMap->SetFieldValue(pDirectory, newCard,
gMapiFields[i].mozField, value);
} else if (gMapiFields[i].multiLine == kIsMultiLine) {
pFieldMap->SetFieldValue(pDb, newRow, gMapiFields[i].mozField,
value.get());
pFieldMap->SetFieldValue(pDirectory, newCard,
gMapiFields[i].mozField, value);
} else {
line2.Truncate();
SplitString(value, line2);
if (!value.IsEmpty())
pFieldMap->SetFieldValue(pDb, newRow, gMapiFields[i].mozField,
value.get());
pFieldMap->SetFieldValue(pDirectory, newCard,
gMapiFields[i].mozField, value);
if (!line2.IsEmpty())
pFieldMap->SetFieldValue(pDb, newRow, gMapiFields[i].multiLine,
line2.get());
pFieldMap->SetFieldValue(pDirectory, newCard,
gMapiFields[i].multiLine, line2);
}
}
}

12
mailnews/import/outlook/src/nsOutlookMail.h
Просмотреть файл

@ -12,10 +12,9 @@
#include "nsIFile.h"
#include "MapiApi.h"
#include "MapiMessage.h"
#include "nsIAddrDatabase.h"
#include "nsIAbDirectory.h"
#include "nsThreadUtils.h"
class nsIAddrDatabase;
class nsIImportFieldMap;
class nsOutlookMail {
@ -30,7 +29,7 @@ class nsOutlookMail {
int32_t *pMsgCount);
nsresult ImportAddresses(uint32_t *pCount, uint32_t *pTotal,
const char16_t *pName, uint32_t id,
nsIAddrDatabase *pDb, nsString &errors);
nsIAbDirectory *pDirectory, nsString &errors);
void OpenMessageStore(CMapiFolder *pNextFolder);
static BOOL WriteData(nsIOutputStream *pDest, const char *pData, int32_t len);
@ -39,9 +38,10 @@ class nsOutlookMail {
void MakeAddressBookNameUnique(nsString &name, nsString &list);
void SanitizeValue(nsString &val);
void SplitString(nsString &val1, nsString &val2);
bool BuildCard(const char16_t *pName, nsIAddrDatabase *pDb, nsIMdbRow *newRow,
LPMAPIPROP pUser, nsIImportFieldMap *pFieldMap);
nsresult CreateList(const char16_t *pName, nsIAddrDatabase *pDb,
bool BuildCard(const char16_t *pName, nsIAbDirectory *pDirectory,
nsIAbCard *newCard, LPMAPIPROP pUser,
nsIImportFieldMap *pFieldMap);
nsresult CreateList(const nsString &pName, nsIAbDirectory *pDirectory,
LPMAPIPROP pUserList, nsIImportFieldMap *pFieldMap);
private:

4
mailnews/import/public/nsIImportAddressBooks.idl
Просмотреть файл

@ -35,7 +35,7 @@
interface nsIFile;
interface nsIArray;
interface nsIImportABDescriptor;
interface nsIAddrDatabase;
interface nsIAbDirectory;
interface nsIImportFieldMap;
[scriptable, uuid(6bba48be-331c-41e3-bc9f-c2ea3754d977)]
@ -108,7 +108,7 @@ interface nsIImportAddressBooks : nsISupports
* @param aFatalError True if there was a fatal error doing the import.
*/
void ImportAddressBook(in nsIImportABDescriptor aSource,
in nsIAddrDatabase aDestination,
in nsIAbDirectory aDestination,
in nsIImportFieldMap aFieldMap,
in nsISupports aSupportService,
out wstring aErrorLog,

9
mailnews/import/public/nsIImportFieldMap.idl
Просмотреть файл

@ -15,11 +15,8 @@
#include "nsISupports.idl"
interface nsIAddrDatabase;
[ptr] native nsIMdbRow (nsIMdbRow);
%{C++
class nsIMdbRow;
%}
interface nsIAbCard;
interface nsIAbDirectory;
[scriptable, uuid(deee9264-1fe3-47b1-b745-47b22de454e2)]
interface nsIImportFieldMap : nsISupports
@ -70,5 +67,5 @@ interface nsIImportFieldMap : nsISupports
/*
Set the value of the given field in the database row
*/
void SetFieldValue(in nsIAddrDatabase database, in nsIMdbRow row, in long fieldNum, in wstring value);
void SetFieldValue(in nsIAbDirectory database, in nsIAbCard row, in long fieldNum, in AString value);
};

86
mailnews/import/src/nsImportAddressBooks.cpp
Просмотреть файл

@ -15,8 +15,8 @@
#include "nsTextFormatter.h"
#include "msgCore.h"
#include "ImportDebug.h"
#include "nsIAbMDBDirectory.h"
#include "nsArrayUtils.h"
#include "nsDirPrefs.h"
nsresult NS_NewGenericAddressBooks(nsIImportGeneric **aImportGeneric) {
NS_ASSERTION(aImportGeneric != nullptr, "null ptr");
@ -320,7 +320,7 @@ void nsImportGenericAddressBooks::SetLogs(nsString &success, nsString &error,
}
}
already_AddRefed<nsIAddrDatabase> GetAddressBookFromUri(const char *pUri) {
already_AddRefed<nsIAbDirectory> GetAddressBookFromUri(const char *pUri) {
if (!pUri) return nullptr;
nsCOMPtr<nsIAbManager> abManager = do_GetService(NS_ABMANAGER_CONTRACTID);
@ -330,16 +330,10 @@ already_AddRefed<nsIAddrDatabase> GetAddressBookFromUri(const char *pUri) {
abManager->GetDirectory(nsDependentCString(pUri), getter_AddRefs(directory));
if (!directory) return nullptr;
nsCOMPtr<nsIAbMDBDirectory> mdbDirectory = do_QueryInterface(directory);
if (!mdbDirectory) return nullptr;
nsCOMPtr<nsIAddrDatabase> pDatabase;
mdbDirectory->GetDatabase(getter_AddRefs(pDatabase));
return pDatabase.forget();
return directory.forget();
}
already_AddRefed<nsIAddrDatabase> GetAddressBook(const char16_t *name,
bool makeNew) {
already_AddRefed<nsIAbDirectory> GetAddressBook(nsString name, bool makeNew) {
if (!makeNew) {
// FIXME: How do I get the list of address books and look for a
// specific name. Major bogosity!
@ -349,71 +343,19 @@ already_AddRefed<nsIAddrDatabase> GetAddressBook(const char16_t *name,
IMPORT_LOG0("In GetAddressBook\n");
nsresult rv;
nsCOMPtr<nsIAddrDatabase> pDatabase;
nsCOMPtr<nsIFile> dbPath;
nsCOMPtr<nsIAbDirectory> directory;
nsCOMPtr<nsIAbManager> abManager =
do_GetService(NS_ABMANAGER_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv)) {
/* Get the profile directory */
rv = abManager->GetUserProfileDirectory(getter_AddRefs(dbPath));
nsAutoCString dirPrefId;
rv = abManager->NewAddressBook(name, EmptyCString(), JSDirectory,
EmptyCString(), dirPrefId);
if (NS_SUCCEEDED(rv)) {
// Create a new address book file - we don't care what the file
// name is, as long as it's unique
rv = dbPath->Append(NS_LITERAL_STRING("impab.mab"));
if (NS_SUCCEEDED(rv)) {
rv = dbPath->CreateUnique(nsIFile::NORMAL_FILE_TYPE, 0600);
if (NS_SUCCEEDED(rv)) {
IMPORT_LOG0("Getting the address database factory\n");
nsCOMPtr<nsIAddrDatabase> addrDBFactory =
do_GetService(NS_ADDRDATABASE_CONTRACTID, &rv);
if (NS_FAILED(rv)) return nullptr;
IMPORT_LOG0("Opening the new address book\n");
rv = addrDBFactory->Open(dbPath, true, true,
getter_AddRefs(pDatabase));
}
}
rv = abManager->GetDirectoryFromId(dirPrefId, getter_AddRefs(directory));
}
}
if (NS_FAILED(rv)) {
IMPORT_LOG0(
"Failed to get the user profile directory from the address book "
"session\n");
}
if (pDatabase && dbPath) {
// We made a database, add it to the UI?!?!?!?!?!?!
// This is major bogosity again! Why doesn't the address book
// just handle this properly for me? Uggggg...
nsCOMPtr<nsIAbDirectory> parentDir;
abManager->GetDirectory(NS_LITERAL_CSTRING(kAllDirectoryRoot),
getter_AddRefs(parentDir));
if (parentDir) {
nsAutoCString URI("moz-abmdbdirectory://");
nsAutoCString leafName;
rv = dbPath->GetNativeLeafName(leafName);
if (NS_FAILED(rv))
IMPORT_LOG0("*** Error: Unable to get name of database file\n");
else {
URI.Append(leafName);
rv = parentDir->CreateDirectoryByURI(nsDependentString(name), URI);
if (NS_FAILED(rv))
IMPORT_LOG0("*** Error: Unable to create address book directory\n");
}
}
if (NS_SUCCEEDED(rv))
IMPORT_LOG0("Added new address book to the UI\n");
else
IMPORT_LOG0(
"*** Error: An error occurred while adding the address book to the "
"UI\n");
}
return pDatabase.forget();
return directory.forget();
}
NS_IMETHODIMP nsImportGenericAddressBooks::BeginImport(
@ -470,14 +412,14 @@ NS_IMETHODIMP nsImportGenericAddressBooks::BeginImport(
// Create/obtain any address books that we need here, so that we don't need
// to do so inside the import thread which would just proxy the create
// operations back to the main thread anyway.
nsCOMPtr<nsIAddrDatabase> db = GetAddressBookFromUri(m_pDestinationUri.get());
nsCOMPtr<nsIAbDirectory> db = GetAddressBookFromUri(m_pDestinationUri.get());
for (uint32_t i = 0; i < count; ++i) {
nsCOMPtr<nsIImportABDescriptor> book = do_QueryElementAt(m_Books, i);
if (book) {
if (!db) {
nsString name;
book->GetPreferredName(name);
db = GetAddressBook(name.get(), true);
db = GetAddressBook(name, true);
}
m_DBs.AppendObject(db);
}
@ -601,7 +543,7 @@ static void ImportAddressThread(void *stuff) {
nsString name;
book->GetPreferredName(name);
nsCOMPtr<nsIAddrDatabase> db = pData->dBs->ObjectAt(i);
nsCOMPtr<nsIAbDirectory> db = pData->dBs->ObjectAt(i);
bool fatalError = false;
pData->currentSize = size;
@ -644,8 +586,6 @@ static void ImportAddressThread(void *stuff) {
pData->currentSize = 0;
pData->currentTotal += size;
if (db) db->Close(true);
if (fatalError) {
pData->fatalError = true;
break;

6
mailnews/import/src/nsImportAddressBooks.h
Просмотреть файл

@ -9,7 +9,7 @@
#include "nsIImportFieldMap.h"
#include "nsString.h"
#include "nsIFile.h"
#include "nsIAddrDatabase.h"
#include "nsIAbDirectory.h"
#include "nsIAbLDIFService.h"
#include "nsIStringBundle.h"
#include "nsIArray.h"
@ -41,7 +41,7 @@ class nsImportGenericAddressBooks : public nsIImportGeneric {
private:
nsCOMPtr<nsIImportAddressBooks> m_pInterface;
nsCOMPtr<nsIArray> m_Books;
nsCOMArray<nsIAddrDatabase> m_DBs;
nsCOMArray<nsIAbDirectory> m_DBs;
nsCOMPtr<nsIFile> m_pLocation;
nsCOMPtr<nsIImportFieldMap> m_pFieldMap;
bool m_autoFind;
@ -67,7 +67,7 @@ class AddressThreadData {
uint32_t currentTotal;
uint32_t currentSize;
nsCOMPtr<nsIArray> books;
nsCOMArray<nsIAddrDatabase> *dBs;
nsCOMArray<nsIAbDirectory> *dBs;
nsCOMPtr<nsIAbLDIFService> ldifService;
nsCOMPtr<nsIImportAddressBooks> addressImport;
nsCOMPtr<nsIImportFieldMap> fieldMap;

91
mailnews/import/src/nsImportFieldMap.cpp
Просмотреть файл

@ -4,6 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nscore.h"
#include "nsIAbCard.h"
#include "nsIStringBundle.h"
#include "nsImportFieldMap.h"
#include "nsImportStringBundle.h"
@ -160,14 +161,9 @@ NS_IMETHODIMP nsImportFieldMap::SetFieldActive(int32_t index, bool active) {
return NS_OK;
}
NS_IMETHODIMP nsImportFieldMap::SetFieldValue(nsIAddrDatabase *database,
nsIMdbRow *row, int32_t fieldNum,
const char16_t *value) {
NS_ASSERTION(database != nullptr, "null ptr");
NS_ASSERTION(row != nullptr, "null ptr");
NS_ASSERTION(value != nullptr, "null ptr");
if (!database || !row || !value) return NS_ERROR_NULL_POINTER;
NS_IMETHODIMP nsImportFieldMap::SetFieldValue(nsIAbDirectory *database,
nsIAbCard *row, int32_t fieldNum,
const nsAString &value) {
// Allow the special value for a null field
if (fieldNum == -1) return NS_OK;
@ -176,120 +172,117 @@ NS_IMETHODIMP nsImportFieldMap::SetFieldValue(nsIAddrDatabase *database,
// UGGG!!!!! lot's of typing here!
nsresult rv;
nsString str(value);
char *pVal = ToNewUTF8String(str);
switch (fieldNum) {
case 0:
rv = database->AddFirstName(row, pVal);
rv = row->SetFirstName(value);
break;
case 1:
rv = database->AddLastName(row, pVal);
rv = row->SetLastName(value);
break;
case 2:
rv = database->AddDisplayName(row, pVal);
rv = row->SetDisplayName(value);
break;
case 3:
rv = database->AddNickName(row, pVal);
rv = row->SetPropertyAsAString(kNicknameProperty, value);
break;
case 4:
rv = database->AddPrimaryEmail(row, pVal);
rv = row->SetPrimaryEmail(value);
break;
case 5:
rv = database->Add2ndEmail(row, pVal);
rv = row->SetPropertyAsAString(k2ndEmailProperty, value);
break;
case 6:
rv = database->AddWorkPhone(row, pVal);
rv = row->SetPropertyAsAString(kWorkPhoneProperty, value);
break;
case 7:
rv = database->AddHomePhone(row, pVal);
rv = row->SetPropertyAsAString(kHomePhoneProperty, value);
break;
case 8:
rv = database->AddFaxNumber(row, pVal);
rv = row->SetPropertyAsAString(kFaxProperty, value);
break;
case 9:
rv = database->AddPagerNumber(row, pVal);
rv = row->SetPropertyAsAString(kPagerProperty, value);
break;
case 10:
rv = database->AddCellularNumber(row, pVal);
rv = row->SetPropertyAsAString(kCellularProperty, value);
break;
case 11:
rv = database->AddHomeAddress(row, pVal);
rv = row->SetPropertyAsAString(kHomeAddressProperty, value);
break;
case 12:
rv = database->AddHomeAddress2(row, pVal);
rv = row->SetPropertyAsAString(kHomeAddress2Property, value);
break;
case 13:
rv = database->AddHomeCity(row, pVal);
rv = row->SetPropertyAsAString(kHomeCityProperty, value);
break;
case 14:
rv = database->AddHomeState(row, pVal);
rv = row->SetPropertyAsAString(kHomeStateProperty, value);
break;
case 15:
rv = database->AddHomeZipCode(row, pVal);
rv = row->SetPropertyAsAString(kHomeZipCodeProperty, value);
break;
case 16:
rv = database->AddHomeCountry(row, pVal);
rv = row->SetPropertyAsAString(kHomeCountryProperty, value);
break;
case 17:
rv = database->AddWorkAddress(row, pVal);
rv = row->SetPropertyAsAString(kWorkAddressProperty, value);
break;
case 18:
rv = database->AddWorkAddress2(row, pVal);
rv = row->SetPropertyAsAString(kWorkAddress2Property, value);
break;
case 19:
rv = database->AddWorkCity(row, pVal);
rv = row->SetPropertyAsAString(kWorkCityProperty, value);
break;
case 20:
rv = database->AddWorkState(row, pVal);
rv = row->SetPropertyAsAString(kWorkStateProperty, value);
break;
case 21:
rv = database->AddWorkZipCode(row, pVal);
rv = row->SetPropertyAsAString(kWorkZipCodeProperty, value);
break;
case 22:
rv = database->AddWorkCountry(row, pVal);
rv = row->SetPropertyAsAString(kWorkCountryProperty, value);
break;
case 23:
rv = database->AddJobTitle(row, pVal);
rv = row->SetPropertyAsAString(kJobTitleProperty, value);
break;
case 24:
rv = database->AddDepartment(row, pVal);
rv = row->SetPropertyAsAString(kDepartmentProperty, value);
break;
case 25:
rv = database->AddCompany(row, pVal);
rv = row->SetPropertyAsAString(kCompanyProperty, value);
break;
case 26:
rv = database->AddWebPage1(row, pVal);
rv = row->SetPropertyAsAString(kWorkWebPageProperty, value);
break;
case 27:
rv = database->AddWebPage2(row, pVal);
rv = row->SetPropertyAsAString(kHomeWebPageProperty, value);
break;
case 28:
rv = database->AddBirthYear(row, pVal);
rv = row->SetPropertyAsAString(kBirthYearProperty, value);
break;
case 29:
rv = database->AddBirthMonth(row, pVal);
rv = row->SetPropertyAsAString(kBirthMonthProperty, value);
break;
case 30:
rv = database->AddBirthDay(row, pVal);
rv = row->SetPropertyAsAString(kBirthDayProperty, value);
break;
case 31:
rv = database->AddCustom1(row, pVal);
rv = row->SetPropertyAsAString(kCustom1Property, value);
break;
case 32:
rv = database->AddCustom2(row, pVal);
rv = row->SetPropertyAsAString(kCustom2Property, value);
break;
case 33:
rv = database->AddCustom3(row, pVal);
rv = row->SetPropertyAsAString(kCustom3Property, value);
break;
case 34:
rv = database->AddCustom4(row, pVal);
rv = row->SetPropertyAsAString(kCustom4Property, value);
break;
case 35:
rv = database->AddNotes(row, pVal);
rv = row->SetPropertyAsAString(kNotesProperty, value);
break;
case 36:
rv = database->AddAimScreenName(row, pVal);
rv = row->SetPropertyAsAString(kAIMProperty, value);
break;
default:
/* Get the field description, and add it as an anonymous attr? */
@ -297,8 +290,6 @@ NS_IMETHODIMP nsImportFieldMap::SetFieldValue(nsIAddrDatabase *database,
{ rv = NS_ERROR_FAILURE; }
}
free(pVal);
return rv;
}

1
mailnews/import/src/nsImportFieldMap.h
Просмотреть файл

@ -8,7 +8,6 @@
#include "nscore.h"
#include "nsIImportFieldMap.h"
#include "nsIAddrDatabase.h" // For SetFieldValue() arguments
#include "nsTArray.h"
#include "nsString.h"
#include "nsIStringBundle.h"

1
mailnews/import/test/unit/xpcshell.ini
Просмотреть файл

@ -13,7 +13,6 @@ run-if = os == 'win'
[test_csv_import.js]
[test_csv_import_quote.js]
[test_ldif_import.js]
run-if = os == 'win'
[test_outlook_settings.js]
run-if = os == 'win'
[test_shiftjis_csv.js]

32
mailnews/import/text/src/nsTextAddress.cpp
Просмотреть файл

@ -4,15 +4,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsAbBaseCID.h"
#include "nsTextAddress.h"
#include "nsIAddrDatabase.h"
#include "nsIAbDirectory.h"
#include "nsNativeCharsetUtils.h"
#include "nsIFile.h"
#include "nsIInputStream.h"
#include "nsNetUtil.h"
#include "nsMsgI18N.h"
#include "nsMsgUtils.h"
#include "mdb.h"
#include "nsIConverterInputStream.h"
#include "nsIUnicharLineInputStream.h"
#include "nsMsgUtils.h"
@ -51,11 +51,12 @@ nsresult nsTextAddress::GetUnicharLineStreamForFile(
}
nsresult nsTextAddress::ImportAddresses(bool *pAbort, const char16_t *pName,
nsIFile *pSrc, nsIAddrDatabase *pDb,
nsIFile *pSrc,
nsIAbDirectory *pDirectory,
nsIImportFieldMap *fieldMap,
nsString &errors, uint32_t *pProgress) {
// Open the source file for reading, read each line and process it!
m_database = pDb;
m_directory = pDirectory;
m_fieldMap = fieldMap;
nsCOMPtr<nsIInputStream> inputStream;
@ -128,7 +129,7 @@ nsresult nsTextAddress::ImportAddresses(bool *pAbort, const char16_t *pName,
return NS_ERROR_FAILURE;
}
return pDb->Commit(nsAddrDBCommitType::kLargeCommit);
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult nsTextAddress::ReadRecord(nsIUnicharLineInputStream *aLineStream,
@ -390,7 +391,7 @@ nsresult nsTextAddress::ProcessLine(const nsAString &aLine, nsString &errors) {
// Wait until we get our first non-empty field, then create a new row,
// fill in the data, then add the row to the database.
nsCOMPtr<nsIMdbRow> newRow;
nsCOMPtr<nsIAbCard> newCard;
nsAutoString fieldVal;
int32_t fieldNum;
int32_t numFields = 0;
@ -403,25 +404,24 @@ nsresult nsTextAddress::ProcessLine(const nsAString &aLine, nsString &errors) {
if (NS_SUCCEEDED(rv) && active) {
if (GetField(aLine, i, fieldVal, m_delim)) {
if (!fieldVal.IsEmpty()) {
if (!newRow) {
rv = m_database->GetNewRow(getter_AddRefs(newRow));
if (NS_FAILED(rv)) {
IMPORT_LOG0("*** Error getting new address database row\n");
}
if (!newCard) {
newCard = do_CreateInstance(NS_ABCARDPROPERTY_CONTRACTID, &rv);
}
if (newRow) {
rv = m_fieldMap->SetFieldValue(m_database, newRow, fieldNum,
fieldVal.get());
if (newCard) {
rv = m_fieldMap->SetFieldValue(m_directory, newCard, fieldNum,
fieldVal);
}
}
} else
} else {
break;
}
} else if (active) {
IMPORT_LOG1("*** Error getting field map for index %ld\n", (long)i);
}
}
if (NS_SUCCEEDED(rv) && newRow) rv = m_database->AddCardRowToDB(newRow);
nsIAbCard *outCard;
rv = m_directory->AddCard(newCard, &outCard);
return rv;
}

9
mailnews/import/text/src/nsTextAddress.h
Просмотреть файл

@ -12,7 +12,7 @@
#include "nsIImportFieldMap.h"
#include "nsIImportService.h"
class nsIAddrDatabase;
class nsIAbDirectory;
class nsIFile;
class nsIInputStream;
class nsIUnicharLineInputStream;
@ -27,8 +27,9 @@ class nsTextAddress {
virtual ~nsTextAddress();
nsresult ImportAddresses(bool *pAbort, const char16_t *pName, nsIFile *pSrc,
nsIAddrDatabase *pDb, nsIImportFieldMap *fieldMap,
nsString &errors, uint32_t *pProgress);
nsIAbDirectory *pDirectory,
nsIImportFieldMap *fieldMap, nsString &errors,
uint32_t *pProgress);
nsresult DetermineDelim(nsIFile *pSrc);
char16_t GetDelim(void) { return m_delim; }
@ -51,7 +52,7 @@ class nsTextAddress {
char16_t m_delim;
int32_t m_LFCount;
int32_t m_CRCount;
nsCOMPtr<nsIAddrDatabase> m_database;
nsCOMPtr<nsIAbDirectory> m_directory;
nsCOMPtr<nsIImportFieldMap> m_fieldMap;
nsCOMPtr<nsIImportService> m_pService;
};

5
mailnews/import/text/src/nsTextImport.cpp
Просмотреть файл

@ -18,7 +18,6 @@
#include "nsIImportAddressBooks.h"
#include "nsIImportABDescriptor.h"
#include "nsIImportFieldMap.h"
#include "nsIAddrDatabase.h"
#include "nsIAbLDIFService.h"
#include "nsAbBaseCID.h"
#include "nsTextFormatter.h"
@ -68,7 +67,7 @@ class ImportAddressImpl final : public nsIImportAddressBooks {
NS_IMETHOD InitFieldMap(nsIImportFieldMap *fieldMap) override;
NS_IMETHOD ImportAddressBook(nsIImportABDescriptor *source,
nsIAddrDatabase *destination,
nsIAbDirectory *destination,
nsIImportFieldMap *fieldMap,
nsISupports *aSupportService,
char16_t **errorLog, char16_t **successLog,
@ -333,7 +332,7 @@ void ImportAddressImpl::SetLogs(nsString &success, nsString &error,
NS_IMETHODIMP
ImportAddressImpl::ImportAddressBook(nsIImportABDescriptor *pSource,
nsIAddrDatabase *pDestination,
nsIAbDirectory *pDestination,
nsIImportFieldMap *fieldMap,
nsISupports *aSupportService,
char16_t **pErrorLog,

10
mailnews/import/vcard/src/nsVCardAddress.cpp
Просмотреть файл

@ -9,7 +9,7 @@
#include "nsIAbCard.h"
#include "nsIAbManager.h"
#include "nsIAddrDatabase.h"
#include "nsIAbDirectory.h"
#include "nsIFile.h"
#include "nsIInputStream.h"
#include "nsILineInputStream.h"
@ -23,7 +23,8 @@ nsVCardAddress::nsVCardAddress() {}
nsVCardAddress::~nsVCardAddress() {}
nsresult nsVCardAddress::ImportAddresses(bool *pAbort, const char16_t *pName,
nsIFile *pSrc, nsIAddrDatabase *pDb,
nsIFile *pSrc,
nsIAbDirectory *pDirectory,
nsString &errors,
uint32_t *pProgress) {
// Open the source file for reading, read each line and process it!
@ -64,7 +65,8 @@ nsresult nsVCardAddress::ImportAddresses(bool *pAbort, const char16_t *pName,
ab->EscapedVCardToAbCard(record.get(), getter_AddRefs(cardFromVCard));
NS_ENSURE_SUCCESS(rv, rv);
rv = pDb->CreateNewCardAndAddToDB(cardFromVCard, false, nullptr);
nsIAbCard *outCard;
rv = pDirectory->AddCard(cardFromVCard, &outCard);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
@ -87,7 +89,7 @@ nsresult nsVCardAddress::ImportAddresses(bool *pAbort, const char16_t *pName,
return NS_ERROR_FAILURE;
}
return pDb->Commit(nsAddrDBCommitType::kLargeCommit);
return NS_OK;
}
nsresult nsVCardAddress::ReadRecord(nsILineInputStream *aLineStream,

4
mailnews/import/vcard/src/nsVCardAddress.h
Просмотреть файл

@ -7,7 +7,7 @@
#include "ImportDebug.h"
class nsIAddrDatabase;
class nsIAbDirectory;
class nsIFile;
class nsILineInputStream;
@ -17,7 +17,7 @@ class nsVCardAddress {
virtual ~nsVCardAddress();
nsresult ImportAddresses(bool *pAbort, const char16_t *pName, nsIFile *pSrc,
nsIAddrDatabase *pDb, nsString &errors,
nsIAbDirectory *pDirectory, nsString &errors,
uint32_t *pProgress);
private:

5
mailnews/import/vcard/src/nsVCardImport.cpp
Просмотреть файл

@ -6,7 +6,6 @@
VCard import addressbook interfaces
*/
#include "nscore.h"
#include "nsIAddrDatabase.h"
#include "nsIFile.h"
#include "nsIImportABDescriptor.h"
#include "nsIImportAddressBooks.h"
@ -60,7 +59,7 @@ class ImportVCardAddressImpl : public nsIImportAddressBooks {
}
NS_IMETHOD ImportAddressBook(nsIImportABDescriptor *source,
nsIAddrDatabase *destination,
nsIAbDirectory *destination,
nsIImportFieldMap *fieldMap,
nsISupports *aSupportService,
char16_t **errorLog, char16_t **successLog,
@ -301,7 +300,7 @@ void ImportVCardAddressImpl::SetLogs(nsString &success, nsString &error,
}
NS_IMETHODIMP ImportVCardAddressImpl::ImportAddressBook(
nsIImportABDescriptor *pSource, nsIAddrDatabase *pDestination,
nsIImportABDescriptor *pSource, nsIAbDirectory *pDestination,
nsIImportFieldMap *fieldMap, nsISupports *aSupportService,
char16_t **pErrorLog, char16_t **pSuccessLog, bool *fatalError) {
NS_ENSURE_ARG_POINTER(pSource);