maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

PBAP: Fix vcard parsing regexp so all vcards are parsed.

Browse source
This commit is contained in:
Jeremy Whiting 2012-08-31 18:18:01 -06:00 committed by Patrick Ohly
parent 0fe056c0f0
commit 1566e3d609
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/backends/pbap/PbapSyncSource.cpp
View file

@ -345,13 +345,13 @@ void PbapSession::pullAll(Content &dst)
pcrecpp::StringPiece content(addr, sb.st_size);
string vcarddata;
pcrecpp::StringPiece vcarddata;
int count = 0;
pcrecpp::RE re("(^BEGIN:VCARD.*?^END:VCARD)",
pcrecpp::RE re("[\\r\\n]*(^BEGIN:VCARD.*?^END:VCARD)",
pcrecpp::RE_Options().set_dotall(true).set_multiline(true));
while (re.Consume(&content, &vcarddata)) {
std::string id = StringPrintf("%d", count);
dst[id] = vcarddata;
dst[id] = vcarddata.as_string();
++count;
}