Case folding of property names

This commit is contained in:
Andrew McMillan 2013-10-15 23:47:47 +13:00
parent 74e690103b
commit 9fe1bc73b2
6 changed files with 1212 additions and 809 deletions

View File

@ -1,3 +1,6 @@
SQL executed successfully.
DELETE FROM caldav_data WHERE caldav_data.dav_name ~ '/user1/addressbook/donald_kelly.vcf'
HTTP/1.1 201 Created HTTP/1.1 201 Created
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
@ -6,6 +9,24 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
caldav_data: >BEGIN:VCARD
FN:Donald Kelly
N:Kelly;Donald;;;
ORG:Esposo Designs Ltd
ADR:;;25 Rintoul St;Newtown;Wellington;;New Zealand
EMAIL;TYPE=internet:donald@example.co.nz
TITLE:Proprietor
TEL;TYPE=work:+64 4 347 4747
TEL;TYPE=cell:+64 2 1234-4321
X-MOZILLA-HTML:TRUE
URL:www.example.co.nz
VERSION:2.1
UID:09e62b3e-656d-c4c4-a5f9-b73422a2f8eb
REV:20130927T145926Z
END:VCARD
<
dav_id: >1636<
caladruri: >NULL< caladruri: >NULL<
caluri: >NULL< caluri: >NULL<
dav_name: >/user1/addressbook/donald_kelly.vcf< dav_name: >/user1/addressbook/donald_kelly.vcf<
@ -24,7 +45,7 @@ Content-Type: text/plain; charset="utf-8"
country: >New Zealand< country: >New Zealand<
locality: >Newtown< locality: >Newtown<
postcode: >< postcode: ><
property: >adr:;;25 Rintoul St;Newtown;Wellington;;New Zealand< property: >ADR:;;25 Rintoul St;Newtown;Wellington;;New Zealand<
region: >Wellington< region: >Wellington<
street_address: >25 Rintoul St< street_address: >25 Rintoul St<
type: >NULL< type: >NULL<

View File

@ -59,17 +59,17 @@ END:VCARD
<prop> <prop>
<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag> <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
<VC:address-data>BEGIN:VCARD <VC:address-data>BEGIN:VCARD
fn:Donald Kelly FN:Donald Kelly
n:Kelly;Donald;;; N:Kelly;Donald;;;
org:Esposo Designs Ltd ORG:Esposo Designs Ltd
adr:;;25 Rintoul St;Newtown;Wellington;;New Zealand ADR:;;25 Rintoul St;Newtown;Wellington;;New Zealand
email;type=internet:donald@example.co.nz EMAIL;TYPE=internet:donald@example.co.nz
title:Proprietor TITLE:Proprietor
tel;type=work:+64 4 347 4747 TEL;TYPE=work:+64 4 347 4747
tel;type=cell:+64 2 1234-4321 TEL;TYPE=cell:+64 2 1234-4321
x-mozilla-html:TRUE X-MOZILLA-HTML:TRUE
url:www.example.co.nz URL:www.example.co.nz
version:2.1 VERSION:2.1
UID:excellent-looking-uid-string UID:excellent-looking-uid-string
REV:YYYYMMDDTHHMMSSZ REV:YYYYMMDDTHHMMSSZ
END:VCARD END:VCARD

View File

@ -4,14 +4,13 @@ HTTP/1.1 204 No Content
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
ETag: "0ea4d7759e103090c6494505b5da0f11"
Content-Length: 0 Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
caladruri: >NULL< caladruri: >NULL<
caluri: >NULL< caluri: >NULL<
dav_etag: >0ea4d7759e103090c6494505b5da0f11< dav_etag: >1a8abbb93e4ed5f770986687343de804<
dav_name: >/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf< dav_name: >/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf<
fburl: >NULL< fburl: >NULL<
fn: >Morphoss Ltd< fn: >Morphoss Ltd<

View File

@ -24,7 +24,7 @@ Content-Type: text/plain; charset="utf-8"
country: >NULL< country: >NULL<
locality: >Irgendwo< locality: >Irgendwo<
postcode: >34332< postcode: >34332<
property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisenstraße 13\r;Irgendwo;;34332< property: >ADR;TYPE=HOME;CHARSET=utf-8:;;Weisenstraße 13\\r;Irgendwo;;34332<
region: >< region: ><
street_address: >Weisenstraße 13\r< street_address: >Weisenstraße 13\r<
type: >HOME< type: >HOME<
@ -62,6 +62,21 @@ Content-Type: text/plain; charset="utf-8"
type: >X-OTHER< type: >X-OTHER<
unit_no: >< unit_no: ><
tel: >+49 7363 6363<
type: >voice<
tel: >+49 8383 73 723<
type: >voice<
tel: >+49 3377 37 373<
type: >voice<
tel: >+49 8378 33<
type: >voice<
tel: >13355<
type: >voice<
tel: >+49 8292 38 383< tel: >+49 8292 38 383<
type: >CAR,VOICE< type: >CAR,VOICE<
@ -128,24 +143,11 @@ Content-Type: text/plain; charset="utf-8"
tel: >+49 7722 88 28 282< tel: >+49 7722 88 28 282<
type: >X-EVOLUTION-TELEX< type: >X-EVOLUTION-TELEX<
tel: >+49 7363 6363<
type: >voice<
tel: >+49 8383 73 723<
type: >voice<
tel: >+49 3377 37 373<
type: >voice<
tel: >+49 8378 33<
type: >voice<
tel: >13355<
type: >voice<
email: >andresen@andresen.de< email: >andresen@andresen.de<
property: >EMAIL;TYPE=INTERNET:andresen@andresen.de<
type: >INTERNET< type: >INTERNET<
email: >sven@andresen.de< email: >sven@andresen.de<
property: >EMAIL;TYPE=INTERNET:sven@andresen.de<
type: >INTERNET< type: >INTERNET<

View File

@ -437,7 +437,7 @@ ENDQUERY
QUERY QUERY
SELECT SELECT
addressbook_address_email.type, addressbook_address_email.email addressbook_address_email.type, addressbook_address_email.email, addressbook_address_email.property
FROM caldav_data FROM caldav_data
LEFT JOIN addressbook_address_email USING(dav_id) LEFT JOIN addressbook_address_email USING(dav_id)
WHERE caldav_data.dav_name ~ '/user1/addressbook/andresenesq.vcf' WHERE caldav_data.dav_name ~ '/user1/addressbook/andresenesq.vcf'

File diff suppressed because it is too large Load Diff