From: rbt <rbt>
Date: Tue, 16 May 2006 19:01:27 +0000 (+0000)
Subject: Assume the strings are in UTF8 instead of in ASCII. This expands on the number of... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e17435152dc36ce1f92c86726000d68ea99d3ecd;p=postgresql-autodoc

Assume the strings are in UTF8 instead of in ASCII. This expands on the number of characters that we can work with. While not perfect, it is an improvement.

Submitted by:	Dirk Jagdmann
---

diff --git a/html.tmpl b/html.tmpl
index b9312cc..4830b15 100644
--- a/html.tmpl
+++ b/html.tmpl
@@ -1,15 +1,16 @@
-<!-- $Header: /cvsroot/autodoc/autodoc/html.tmpl,v 1.3 2006/02/13 01:15:55 rbt Exp $ -->
+<!-- $Header: /cvsroot/autodoc/autodoc/html.tmpl,v 1.4 2006/05/16 19:01:27 rbt Exp $ -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
    "http://www.w3.org/TR/html4/strict.dtd">
 
 <html>
   <head>
     <title>Index for <!-- TMPL_VAR ESCAPE="HTML" name="database" --></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <style type="text/css">
 	BODY {
-		color:	#000000; 
+		color:	#000000;
 		background-color: #FFFFFF;
-		font-family: Helvetica, sans-serif; 
+		font-family: Helvetica, sans-serif;
 	}
 
 	P {
@@ -237,7 +238,7 @@
 		<!-- TMPL_IF name="fk_schemas" -->
 			<p>Tables referencing this one via Foreign Key Constraints:</p>
 		<!-- TMPL_LOOP name="fk_schemas" -->
-			<ul>	
+			<ul>
 				<li><a href="#<!-- TMPL_VAR ESCAPE="URL" name="fk_sgmlid" -->"><!-- TMPL_IF name="number_of_schemas" --><!-- TMPL_VAR ESCAPE="HTML" name="fk_schema" -->.<!-- /TMPL_IF name="number_of_schemas" --><!-- TMPL_VAR ESCAPE="HTML" name="fk_table" --></a></li>
 			</ul>
 		<!-- /TMPL_LOOP name="fk_schemas" -->
@@ -292,7 +293,7 @@
 	<!-- We've gone through the table structure, now lets take a look at user functions -->
 	<!-- TMPL_LOOP name="functions" -->
 		<hr>
-		<h2>Function: 
+		<h2>Function:
 			<a href="#<!-- TMPL_VAR ESCAPE="HTML" name="schema_sgmlid" -->"><!-- TMPL_IF name="number_of_schemas" --><!-- TMPL_VAR ESCAPE="HTML" name="schema" --></a>.<!-- /TMPL_IF name="number_of_schemas" --><a name="<!-- TMPL_VAR ESCAPE="URL" name="function_sgmlid" -->"><!-- TMPL_VAR ESCAPE="HTML" name="function" --></a>
 		</h2>
 <h3>Returns: <!-- TMPL_VAR ESCAPE="HTML" name="function_returns" --></h3>
diff --git a/postgresql_autodoc.pl b/postgresql_autodoc.pl
index 4f3529d..c4dc25a 100755
--- a/postgresql_autodoc.pl
+++ b/postgresql_autodoc.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # -- # -*- Perl -*-w
-# $Header: /cvsroot/autodoc/autodoc/postgresql_autodoc.pl,v 1.13 2006/03/17 22:32:30 rbt Exp $
+# $Header: /cvsroot/autodoc/autodoc/postgresql_autodoc.pl,v 1.14 2006/05/16 19:01:27 rbt Exp $
 #  Imported 1.22 2002/02/08 17:09:48 into sourceforge
 
 # Postgres Auto-Doc Version 1.30
@@ -211,6 +211,9 @@ sub info_collect($$$$$)
     my $dbh = DBI->connect( @{$dbConnect} )
       or triggerError("Unable to connect due to: $DBI::errstr");
 
+    $dbh->do("set client_encoding to 'UTF-8'")
+      or triggerError("could not set client_encoding to UTF-8: $DBI::errstr");
+
     my %struct;
     $db->{$database}{'STRUCT'} = \%struct;
     my $struct = $db->{$database}{'STRUCT'};
diff --git a/xml.tmpl b/xml.tmpl
index 13d0188..d589930 100644
--- a/xml.tmpl
+++ b/xml.tmpl
@@ -1,4 +1,5 @@
-<!-- $Header: /cvsroot/autodoc/autodoc/xml.tmpl,v 1.1 2004/05/12 16:00:37 rbt Exp $ -->
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- $Header: /cvsroot/autodoc/autodoc/xml.tmpl,v 1.2 2006/05/16 19:01:27 rbt Exp $ -->
 
 <book id="database.<!-- TMPL_VAR name="database_sgmlid" -->" xreflabel="<!-- TMPL_VAR name="database_dbk" --> database schema"><title><!-- TMPL_VAR name="database_dbk" --> Model</title>
 
