convert the vcard to a string and print it out as well. also fix the

2003-11-11 Chris Toshok <toshok@ximian.com> * tests/vcard/dump-vcard.c (main): convert the vcard to a string and print it out as well. also fix the evcard leak. * tests/vcard/README: add blurb about 10.vcf. * tests/vcard/Makefile.am (EXTRA_DIST): add 10.vcf * tests/vcard/10.vcf: new quotted attribute parameter value test. * tests/vcard/[1-9].vcf: add these back in.
author: Chris Toshok <toshok@ximian.com> 2003-11-11 21:29:40 +0000
committer: Chris Toshok <toshok@src.gnome.org> 2003-11-11 21:29:40 +0000
commit: 0fd92c8f086b550ec39121dc6d2bee5cdfd1d17a (patch)
tree: be20e2062661b7cd4dad7cab3eb686bff3d725ef /addressbook
parent: 5e14258a9d30c6d7b88013a0066e208b7ea42291 (diff)
download: evolution-data-server-0fd92c8f086b550ec39121dc6d2bee5cdfd1d17a.tar.gz
14 files changed, 156 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8a2d5ba7d..113cfa77e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,16 @@
+2003-11-11  Chris Toshok  <toshok@ximian.com>
+
+	* tests/vcard/dump-vcard.c (main): convert the vcard to a string
+	and print it out as well.  also fix the evcard leak.
+
+	* tests/vcard/README: add blurb about 10.vcf.
+
+	* tests/vcard/Makefile.am (EXTRA_DIST): add 10.vcf
+
+	* tests/vcard/10.vcf: new quotted attribute parameter value test.
+
+	* tests/vcard/[1-9].vcf: add these back in.
+
 2003-11-10  JP Rosevear <jpr@ximian.com>
 
 	* libebook/e-book-listener.c: remove construct method, it did
diff --git a/addressbook/tests/vcard/1.vcf b/addressbook/tests/vcard/1.vcf
new file mode 100644
index 000000000..308144c5f
--- /dev/null
+++ b/addressbook/tests/vcard/1.vcf
@@ -0,0 +1,12 @@
+BEGIN:vCard
+VERSION:3.0
+FN:Frank Dawson
+ORG:Lotus Development Corporation
+ADR;TYPE=WORK,POSTAL,PARCEL:;;6544 Battleford Drive
+ ;Raleigh;NC;27613-3502;U.S.A.
+TEL;TYPE=VOICE,MSG,WORK:+1-919-676-9515
+TEL;TYPE=FAX,WORK:+1-919-676-9564
+EMAIL;TYPE=INTERNET,PREF:Frank_Dawson@Lotus.com
+EMAIL;TYPE=INTERNET:fdawson@earthlink.net
+URL:http://home.earthlink.net/~fdawson
+END:vCard
diff --git a/addressbook/tests/vcard/10.vcf b/addressbook/tests/vcard/10.vcf
new file mode 100644
index 000000000..665835190
--- /dev/null
+++ b/addressbook/tests/vcard/10.vcf
@@ -0,0 +1,9 @@
+BEGIN:vCard
+VERSION:3.0
+FN:Frank Dawson
+ORG:Lotus Development Corporation
+ADR;TYPE="Both work and home",POSTAL,PARCEL:;;6544 Battleford Drive
+ ;Raleigh;NC;27613-3502;U.S.A.
+TEL;TYPE=VOICE,MSG,WORK:+1-919-676-9515
+TEL;TYPE=FAX,WORK:+1-919-676-9564
+END:vCard
diff --git a/addressbook/tests/vcard/2.vcf b/addressbook/tests/vcard/2.vcf
new file mode 100644
index 000000000..bdf14ea1b
--- /dev/null
+++ b/addressbook/tests/vcard/2.vcf
@@ -0,0 +1,10 @@
+BEGIN:vCard
+VERSION:3.0
+FN:Tim Howes
+ORG:Netscape Communications Corp.
+ADR;TYPE=WORK:;;501 E. Middlefield Rd.;Mountain View;
+ CA; 94043;U.S.A.
+TEL;TYPE=VOICE,MSG,WORK:+1-415-937-3419
+TEL;TYPE=FAX,WORK:+1-415-528-4164
+EMAIL;TYPE=INTERNET:howes@netscape.com
+END:vCard
diff --git a/addressbook/tests/vcard/3.vcf b/addressbook/tests/vcard/3.vcf
new file mode 100644
index 000000000..0428d6a72
--- /dev/null
+++ b/addressbook/tests/vcard/3.vcf
@@ -0,0 +1,13 @@
+BEGIN:VCARD
+VERSION:2.1
+X-EVOLUTION-FILE-AS:Friedman, Nat
+FN:Nat
+N:Friedman;Nat;D;Mr.
+ADR;POSTAL;WORK:P.O. Box 101;;;Any Town;CA;91921-1234
+TEL;WORK:617 679 1984
+TEL;CELL:123 456 7890
+EMAIL;INTERNET:nat@nat.org
+EMAIL;INTERNET:nat@ximian.com
+BDAY:1977-08-06
+UID:pas-id-3E65886900000002
+END:VCARD
diff --git a/addressbook/tests/vcard/4.vcf b/addressbook/tests/vcard/4.vcf
new file mode 100644
index 000000000..305088a91
--- /dev/null
+++ b/addressbook/tests/vcard/4.vcf
@@ -0,0 +1,11 @@
+BEGIN:VCARD
+VERSION:2.1
+X-EVOLUTION-FILE-AS:address, canada
+FN:canada address
+N:address;canada
+ADR;WORK:;;92 Main St. N.;Newmarket;ON;L3Y 4A1;Canada
+ADR;HOME;PREF:;;92 Main St. N.;Newmarket;ON;L3Y 4A1;Canada
+LABEL;QUOTED-PRINTABLE;WORK:92 Main St. N.=0ANewmarket, ON L3Y 4A1=0ACanada
+LABEL;QUOTED-PRINTABLE;HOME;PREF:92 Main St. N.=0ANewmarket, ON L3Y 4A1=0ACanada
+UID:pas-id-3E84C16E00000001
+END:VCARD
diff --git a/addressbook/tests/vcard/5.vcf b/addressbook/tests/vcard/5.vcf
new file mode 100644
index 000000000..f42433061
--- /dev/null
+++ b/addressbook/tests/vcard/5.vcf
@@ -0,0 +1,32 @@
+BEGIN:VCARD
+VERSION:2.1
+X-EVOLUTION-FILE-AS;CHARSET=UTF-8;QUOTED-PRINTABLE:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+FN;CHARSET=UTF-8;QUOTED-PRINTABLE:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+N;CHARSET=UTF-8:;十城目管理大型知座
+ADR;WORK;PREF;QUOTED-PRINTABLE;CHARSET=UTF-8:;=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7=0A=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=
+=9F=A5=E5=BA=A7=0A=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=
+=9E=8B=E7=9F=A5=E5=BA=A7;=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+LABEL;CHARSET=UTF-8;QUOTED-PRINTABLE;WORK;PREF:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7=0A=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=
+=9F=A5=E5=BA=A7=0A=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=
+=9E=8B=E7=9F=A5=E5=BA=A7=0A=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=
+=A4=A7=E5=9E=8B=E7=9F=A5=E5=BA=A7
+TEL;CHARSET=UTF-8;QUOTED-PRINTABLE;WORK;VOICE:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+TEL;CHARSET=UTF-8;QUOTED-PRINTABLE;WORK;FAX:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+TEL;CHARSET=UTF-8;QUOTED-PRINTABLE;HOME:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+TEL;CHARSET=UTF-8;QUOTED-PRINTABLE;CELL:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+EMAIL;INTERNET:weird@weird.com
+ORG;CHARSET=UTF-8:十城目管理大型知座
+TITLE;CHARSET=UTF-8;QUOTED-PRINTABLE:=E5=8D=81=E5=9F=8E=E7=9B=AE=E7=AE=A1=E7=90=86=E5=A4=A7=E5=9E=8B=E7=9F=A5=E5=
+=BA=A7
+UID:pas-id-3E52FE2E00000000
+END:VCARD
+
diff --git a/addressbook/tests/vcard/6.vcf b/addressbook/tests/vcard/6.vcf
new file mode 100644
index 000000000..e5e8310eb
--- /dev/null
+++ b/addressbook/tests/vcard/6.vcf
@@ -0,0 +1,12 @@
+BEGIN:vCard
+VERSION:3.0
+FN:Frank Dawson
+ORG:Lotus Development Corporation
+ADR;TYPE=WORK,:;;6544 Battleford Drive
+ ;Raleigh;NC;27613-3502;U.S.A.
+TEL;TYPE=VOICE;MSG,WORK:+1-919-676-9515
+TEL;FAX,WORK:+1-919-676-9564
+EMAIL;TYPE=INTERNET,PREF:Frank_Dawson@Lotus.com
+EMAIL;TYPE=INTERNET:fdawson@earthlink.net
+URL:http://home.earthlink.net/~fdawson
+END:vCard
diff --git a/addressbook/tests/vcard/7.vcf b/addressbook/tests/vcard/7.vcf
new file mode 100644
index 000000000..fb8817303
--- /dev/null
+++ b/addressbook/tests/vcard/7.vcf
@@ -0,0 +1,11 @@
+VERSION:3.0
+FN:Frank Dawson
+ORG:Lotus Development Corporation
+ADR;TYPE=WORK,POSTAL,PARCEL:;;6544 Battleford Drive
+ ;Raleigh;NC;27613-3502;U.S.A.
+TEL;TYPE=VOICE,MSG,WORK:+1-919-676-9515
+TEL;TYPE=FAX,WORK:+1-919-676-9564
+EMAIL;TYPE=INTERNET,PREF:Frank_Dawson@Lotus.com
+EMAIL;TYPE=INTERNET:fdawson@earthlink.net
+URL:http://home.earthlink.net/~fdawson
+END:vCard
diff --git a/addressbook/tests/vcard/8.vcf b/addressbook/tests/vcard/8.vcf
new file mode 100644
index 000000000..172d1d2c6
--- /dev/null
+++ b/addressbook/tests/vcard/8.vcf
@@ -0,0 +1,11 @@
+BEGIN:vCard
+VERSION:3.0
+FN:Frank Dawson
+ORG:Lotus Development Corporation
+ADR;TYPE=WORK,POSTAL,PARCEL:;;6544 Battleford Drive
+ ;Raleigh;NC;27613-3502;U.S.A.
+TEL;TYPE=VOICE,MSG,WORK:+1-919-676-9515
+TEL;TYPE=FAX,WORK:+1-919-676-9564
+EMAIL;TYPE=INTERNET,PREF:Frank_Dawson@Lotus.com
+EMAIL;TYPE=INTERNET:fdawson@earthlink.net
+URL:http://home.earthlink.net/~fdawson
diff --git a/addressbook/tests/vcard/9.vcf b/addressbook/tests/vcard/9.vcf
new file mode 100644
index 000000000..7043ab8c1
--- /dev/null
+++ b/addressbook/tests/vcard/9.vcf
@@ -0,0 +1,9 @@
+BEGIN:vCard
+VERSION:3.0
+FN:Frank Dawson
+ORG:Lotus Development Corporation
+ADR;TYPE=WORK,POSTAL,PARCEL:;;6544 Battleford Drive
+ ;Raleigh;NC;27613-3502;U.S.A.
+TEL;TYPE=VOICE,MSG,WORK:+1-919-676-9515
+TEL;TYPE=FAX,WORK:+1-919-676-9564
+E
diff --git a/addressbook/tests/vcard/Makefile.am b/addressbook/tests/vcard/Makefile.am
index cf614cb75..0ef458e83 100644
--- a/addressbook/tests/vcard/Makefile.am
+++ b/addressbook/tests/vcard/Makefile.am
@@ -7,3 +7,5 @@ noinst_PROGRAMS = dump-vcard
 dump_vcard_LDADD = 						\
 	$(top_builddir)/addressbook/libebook/libebook.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
+
+EXTRA_DIST=1.vcf 2.vcf 3.vcf 4.vcf 5.vcf 6.vcf 7.vcf 8.vcf 9.vcf 10.vcf
diff --git a/addressbook/tests/vcard/README b/addressbook/tests/vcard/README
index 06ae719c5..c33de4dde 100644
--- a/addressbook/tests/vcard/README
+++ b/addressbook/tests/vcard/README
@@ -36,6 +36,7 @@ Test   : Description
 9.vcf  : A vCard that ends (\0) in the middle of an attribute
          name/group.
 
-10.vcf : A vCard with an attribute with more than 1 group specified.
+10.vcf : A vCard with an attribute with more than 1 group specified.  Also
+         has an attributed with a quoted parameter value.
 
 ----------------------
diff --git a/addressbook/tests/vcard/dump-vcard.c b/addressbook/tests/vcard/dump-vcard.c
index e4b9efd6f..5b57f0d43 100644
--- a/addressbook/tests/vcard/dump-vcard.c
+++ b/addressbook/tests/vcard/dump-vcard.c
@@ -10,6 +10,7 @@ main(int argc, char **argv)
 {
 	EVCard *vcard;
 	GString *str = g_string_new ("");
+	char *parsed_vcard;
 
 	if (argc < 2)
 	  return 0;
@@ -28,5 +29,13 @@ main(int argc, char **argv)
 
 	e_vcard_dump_structure (vcard);
 
+	parsed_vcard = e_vcard_to_string (vcard, EVC_FORMAT_VCARD_30);
+
+	printf ("\nvcard: %s\n", parsed_vcard);
+
+	g_object_unref (vcard);
+
+	g_free (parsed_vcard);
+
 	return 0;
 }
author	Chris Toshok <toshok@ximian.com>	2003-11-11 21:29:40 +0000
committer	Chris Toshok <toshok@src.gnome.org>	2003-11-11 21:29:40 +0000
commit	0fd92c8f086b550ec39121dc6d2bee5cdfd1d17a (patch)
tree	be20e2062661b7cd4dad7cab3eb686bff3d725ef /addressbook
parent	5e14258a9d30c6d7b88013a0066e208b7ea42291 (diff)
download	evolution-data-server-0fd92c8f086b550ec39121dc6d2bee5cdfd1d17a.tar.gz