CVS update: AxKit-XSP-ESQL

[jwalt]

Date:   Wednesday June 18, 2003 @ 13:19
Author: jwalt

Update of /home/cvs/AxKit-XSP-ESQL
In directory localhost:/tmp/cvs-serv25684

Modified Files:
        ESQL.pm 
Log Message:
- make SQL data UTF8-aware (via AxExternalEncoding)
- change override behaviour of AxESQLPool


Index: ESQL.pm
===================================================================
RCS file: /home/cvs/AxKit-XSP-ESQL/ESQL.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -r1.22 -r1.23
--- ESQL.pm     2002/09/13 11:19:02     1.22
+++ ESQL.pm     2003/06/18 12:19:59     1.23
@@ -1,4 +1,4 @@
-# $Id: ESQL.pm,v 1.22 2002/09/13 11:19:02 jwalt Exp $
+# $Id: ESQL.pm,v 1.23 2003/06/18 12:19:59 jwalt Exp $
 
 package AxKit::XSP::ESQL;
 use strict;
@@ -84,7 +84,7 @@
         return $RESULTS[$ancestor]{ $NAMES[$ancestor][$column - 1] };
     }
     else {
-        return $RESULTS[$ancestor]{$column};
+        return AxKit::ToUTF8($RESULTS[$ancestor]{$column});
     }
 }
 
@@ -178,7 +178,7 @@
   die "invalid pool spec: ".join(',',@esql_pools) if @esql_pools % 6 != 0;
   my %esql_pools;
   while (@esql_pools && (my @esql_pool = splice(@esql_pools,-6))) {
-               $esql_pools{$esql_pool[0]} ||= [ @esql_pool ];
+               $esql_pools{$esql_pool[0]} = [ @esql_pool ];
   }
   my $esql_pool_name = ""
 EOC