27af370ac2
The WebDAV backends contained a hack where the UID inside the data was forced to be identical to the resource name. This is wrong for items created by us via POST (because the server may choose a resource name != UID) or by some other entity (where we have no idea how the resource name got chosen). This commit removes the hack. Testing must be updated to pass correct data with the same UID as on the server when updating an item, because the backend will no longer ensure that and changing the UID of a resource gets rejected by some servers. The hack was introduced for peers which do not store the UID (for example, a vCard or iCalendar 1.0 based SyncML client). A better solution must be found, probably involving the Synthesis engine and its read/update/write cycle.
82 lines
3.1 KiB
Diff
82 lines
3.1 KiB
Diff
@@ -36,7 +36,7 @@
|
|
VERSION:3.0
|
|
UID:unique-id-user12
|
|
NICKNAME:user12
|
|
-NOTE:ampersand entity &\; less-than entity <\;
|
|
+NOTE:ampersand entity xxx less-than entity yyy - HTML entities replaced by corresponding characters by Memotoo
|
|
FN:xml entities
|
|
N:xml;entities;;;
|
|
X-EVOLUTION-FILE-AS:xml\, entities
|
|
@@ -110,7 +110,7 @@
|
|
FBURL:
|
|
X-EVOLUTION-VIDEO-URL:
|
|
X-MOZILLA-HTML:FALSE
|
|
-ADR;TYPE=HOME:test 5;Line 2;Umlaut Ä in Line 1;test 1;test 3;test 2;test 4
|
|
+ADR;TYPE=HOME:test 5;Line 2;Umlaut Ä in Line 1;test 1;test 3;test 2
|
|
LABEL;TYPE=HOME:Umlaut Ä in Line 1\nLine 2\n\ntest 1\, test 3\ntest 2\ntest 5\ntest 4
|
|
END:VCARD
|
|
|
|
@@ -146,7 +146,7 @@
|
|
NICKNAME:user7
|
|
X-EVOLUTION-SPOUSE:
|
|
NOTE:This test case uses line breaks. This is line 1.\nLine 2.\n\nLine brea
|
|
- ks in vcard 2.1 are encoded as =0D=0A.\nThat means the = has to be encod
|
|
+ ks in vcard 2.1 are encoded as.\nThat means the = has to be encod
|
|
ed itself...
|
|
FN:line breaks
|
|
N:breaks;line;;;
|
|
@@ -162,9 +162,9 @@
|
|
|
|
BEGIN:VCARD
|
|
VERSION:3.0
|
|
-URL:http://john.doe.com
|
|
+URL;TYPE=HOME:http://john.doe.com
|
|
TITLE:Senior Tester
|
|
-ORG:Test Inc.;Testing;test#1
|
|
+ORG:Test Inc.;Testing
|
|
ROLE:professional test case
|
|
X-EVOLUTION-MANAGER:John Doe Senior
|
|
X-EVOLUTION-ASSISTANT:John Doe Junior
|
|
@@ -186,21 +186,13 @@
|
|
FBURL:free/busy
|
|
X-EVOLUTION-VIDEO-URL:chat
|
|
X-MOZILLA-HTML:TRUE
|
|
-ADR;TYPE=WORK:Test Box #2;;Test Drive 2;Test Town;Upper Test County;12346;O
|
|
- ld Testovia
|
|
-LABEL;TYPE=WORK:Test Drive 2\nTest Town\, Upper Test County\n12346\nTest Bo
|
|
- x #2\nOld Testovia
|
|
+ADR;TYPE=WORK:Test Box #2;;Test Drive 2;Test Town;Upper Test County;12346;Germany
|
|
ADR;TYPE=HOME:Test Box #1;;Test Drive 1;Test Village;Lower Test County;1234
|
|
- 5;Testovia
|
|
-LABEL;TYPE=HOME:Test Drive 1\nTest Village\, Lower Test County\n12345\nTest
|
|
- Box #1\nTestovia
|
|
-ADR:Test Box #3;;Test Drive 3;Test Megacity;Test County;12347;New Testonia
|
|
-LABEL;TYPE=OTHER:Test Drive 3\nTest Megacity\, Test County\n12347\nTest Box
|
|
- #3\nNew Testonia
|
|
+ 5;France
|
|
+ADR:Test Box #3;;Test Drive 3;Test Megacity;Test County;12347;Estonia
|
|
EMAIL;TYPE=WORK;X-EVOLUTION-UI-SLOT=1:john.doe@work.com
|
|
EMAIL;TYPE=HOME;X-EVOLUTION-UI-SLOT=2:john.doe@home.priv
|
|
EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=3:john.doe@other.world
|
|
-EMAIL;TYPE=OTHER;X-EVOLUTION-UI-SLOT=4:john.doe@yet.another.world
|
|
TEL;TYPE=work;TYPE=Voice;X-EVOLUTION-UI-SLOT=1:business 1
|
|
TEL;TYPE=homE;TYPE=VOICE;X-EVOLUTION-UI-SLOT=2:home 2
|
|
TEL;TYPE=CELL;X-EVOLUTION-UI-SLOT=3:mobile 3
|
|
@@ -208,7 +200,6 @@
|
|
TEL;TYPE=HOME;TYPE=FAX;X-EVOLUTION-UI-SLOT=5:homefax 5
|
|
TEL;TYPE=PAGER;X-EVOLUTION-UI-SLOT=6:pager 6
|
|
TEL;TYPE=CAR;X-EVOLUTION-UI-SLOT=7:car 7
|
|
-TEL;TYPE=PREF;X-EVOLUTION-UI-SLOT=8:primary 8
|
|
X-AIM;X-EVOLUTION-UI-SLOT=1:AIM JOHN
|
|
X-YAHOO;X-EVOLUTION-UI-SLOT=2:YAHOO JDOE
|
|
X-ICQ;X-EVOLUTION-UI-SLOT=3:ICQ JD
|
|
@@ -299,7 +290,7 @@
|
|
X-EVOLUTION-SPOUSE:
|
|
NOTE:The first name is "First \; special \;".
|
|
FN:Mr. First \; special \; middle Last
|
|
-N:Last;First \; special \;;middle;Mr.;
|
|
+N:Last;First special;middle;Mr.;
|
|
X-EVOLUTION-FILE-AS:Last\, First \; special \;
|
|
X-EVOLUTION-BLOG-URL:
|
|
CALURI:
|