Index: includes/shp2sql.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/geo/includes/shp2sql.inc,v
retrieving revision 1.6
diff -u -p -r1.6 shp2sql.inc
--- includes/shp2sql.inc	27 Apr 2010 02:18:22 -0000	1.6
+++ includes/shp2sql.inc	23 Apr 2011 20:22:17 -0000
@@ -11,7 +11,7 @@
  * I also borrowed heavily from existing code by Juan Carlos Gonzalez Ulloa:
  *   http://sourceforge.net/projects/shp2mysql-php
  */
-function geo_shp2sql($filename, $table_name = '', $create_table = TRUE, $srid = GEO_SRID_DEFAULT) {
+function geo_shp2sql($filename, $table_name = '', $create_table = TRUE, $srid = GEO_SRID_DEFAULT, $string_encoding='ascii') {
   if (!$table_name) {
     $parts = pathinfo($filename);
     $table_name = $parts['filename'];
@@ -82,7 +82,7 @@ function geo_shp2sql($filename, $table_n
 
       // Use a predefined function to filter and process each value.
       $process = $headers['field_filters'][$name];
-      $values[$name] = $process($value);
+      $values[$name] = $process($value, $string_encoding);
     }
 
     // TODO NOT EFFICIENT
@@ -198,8 +198,8 @@ function _dbf_headers(&$fp, &$schema) {
   return $headers;
 }
 
-function _shp_data_text($value) {
-  return trim(drupal_convert_to_utf8($value, 'ascii'));
+function _shp_data_text($value, $input_encoding) {
+  return trim(drupal_convert_to_utf8($value, $input_encoding));
 }
 
 function _shp_data_bool($value) {