Make sure generated KML is correctly UTF-8 encoded

[dns.git] / bin / mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index 7f80e98018a9fc44e104b52eee9844ab6be2efd3..6e96c421988400bde6b5806ab39bdf9a20a1ae52 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -15,7 +15,9 @@ my $servers = YAML::LoadFile("src/${source}");
 
 my %countries = ();
 
-my $countries = XML::TreeBuilder->new->parsefile("lib/countries.xml");
+my $countries = XML::TreeBuilder->new;
+
+$countries->parsefile("lib/countries.xml");
 
 foreach my $country ($countries->look_down("_tag" => "country"))
 {
@@ -56,9 +58,9 @@ $countries->delete;
 
 my $zonefile = IO::File->new("> data/${zone}") || die "$!";
 my $kmlfile = IO::File->new("> kml/${zone}.kml") || die "$!";
-my $kmlwriter = XML::Writer->new(OUTPUT => $kmlfile);
+my $kmlwriter = XML::Writer->new(OUTPUT => $kmlfile, ENCODING => 'utf-8');
 
-$kmlwriter->xmlDecl("UTF-8");
+$kmlwriter->xmlDecl();
 $kmlwriter->startTag("kml", "xmlns" => "http://www.opengis.net/kml/2.2");
 $kmlwriter->startTag("Document");