? coder_fixes.patch
? spatial_import/.spatial_import.tw.inc.swp
Index: spatial_import/spatial_import.feeds.ShapefileParser.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spatial/spatial_import/spatial_import.feeds.ShapefileParser.inc,v
retrieving revision 1.2
diff -u -p -r1.2 spatial_import.feeds.ShapefileParser.inc
--- spatial_import/spatial_import.feeds.ShapefileParser.inc	9 Feb 2010 00:48:53 -0000	1.2
+++ spatial_import/spatial_import.feeds.ShapefileParser.inc	4 May 2010 20:36:07 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * Parses a given file as a zipped shapefile.
@@ -109,7 +110,7 @@ class SpatialImportShapefileParser exten
       '#description' => t('Integer represeting the SRID of the uploaded shapefile. If you are unsure, use \'4326\' (lat/lon).')
     );
     
-    $form['storage'] = array (
+    $form['storage'] = array(
       '#type' => 'hidden',
       '#title' => t('Database Storage'),
       '#value' => 'wkt',
@@ -118,5 +119,3 @@ class SpatialImportShapefileParser exten
     return $form;
   }
 }
-
-?>
\ No newline at end of file
Index: spatial_import/spatial_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spatial/spatial_import/spatial_import.module,v
retrieving revision 1.2
diff -u -p -r1.2 spatial_import.module
--- spatial_import/spatial_import.module	9 Feb 2010 00:48:53 -0000	1.2
+++ spatial_import/spatial_import.module	4 May 2010 20:36:08 -0000
@@ -2,10 +2,10 @@
 // $Id: spatial_import.module,v 1.2 2010/02/09 00:48:53 phayes Exp $
 
 // Include Feed hooks and functionality
-require_once(drupal_get_path('module','spatial_import').'/spatial_import.feeds.inc');
+require_once(drupal_get_path('module', 'spatial_import') .'/spatial_import.feeds.inc');
 
 // Include Table Wizard hooks and functionality
-require_once(drupal_get_path('module','spatial_import').'/spatial_import.tw.inc');
+require_once(drupal_get_path('module', 'spatial_import') .'/spatial_import.tw.inc');
 
 /**
  * Process Shapefile
@@ -50,7 +50,7 @@ function spatial_import_process_shapefil
     
     // Apply 'direct to database' filters.
     // These are only used by TW Import
-    $headers['field_filters'][$spatial_field] = '_spatial_import_shp_data_'.$field_type;
+    $headers['field_filters'][$spatial_field] = '_spatial_import_shp_data_' . $field_type;
     
     // Get column names
     $columns = array_keys($headers['field_lengths']);
@@ -60,7 +60,7 @@ function spatial_import_process_shapefil
     
     // Add spatial_field to schema
     if ($field_type == 'geometry') {
-      $schema['fields'][$spatial_field] = array (
+      $schema['fields'][$spatial_field] = array(
         'type' => 'geometry',
         'mysql_type' => 'geometry',
         'pgsql_type' => 'GEOMETRY',
@@ -69,7 +69,7 @@ function spatial_import_process_shapefil
     }
     
     if ($field_type == 'wkt') {
-      $schema['fields'][$spatial_field] = array (
+      $schema['fields'][$spatial_field] = array(
         'type' => 'text',
         'size' => 'big',
       );
@@ -82,7 +82,7 @@ function spatial_import_process_shapefil
       $values = array();
       $dbf_data = zip_entry_read($files['dbf'], $headers['record_size']);
       $dbf_data = substr($dbf_data, 1); // Remove "record deleted" flag.
-      foreach($headers['field_lengths'] as $name => $length) {
+      foreach ($headers['field_lengths'] as $name => $length) {
         $value = substr($dbf_data, 0, $length);
         $dbf_data = substr($dbf_data, $length);
   
@@ -129,7 +129,7 @@ function _spatial_import_file_name($file
   }
 }
 
-function _spatial_import_shp_geo_types($key = null) {
+function _spatial_import_shp_geo_types($key = NULL) {
   $geo_types = array(
     0 => 'none',
     1 => 'point',
@@ -356,7 +356,7 @@ function _spatial_import_shp_get_polygon
   return $data;
 }
 
-function _spatial_import_shp_data_fetch($type, &$fp, $offset = null) {
+function _spatial_import_shp_data_fetch($type, &$fp, $offset = NULL) {
   if (in_array($type, array('i', 'N'))) {
     $length = 4;
   }
Index: spatial_import/spatial_import.tw.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spatial/spatial_import/spatial_import.tw.inc,v
retrieving revision 1.1
diff -u -p -r1.1 spatial_import.tw.inc
--- spatial_import/spatial_import.tw.inc	26 Jan 2010 19:52:42 -0000	1.1
+++ spatial_import/spatial_import.tw.inc	4 May 2010 20:36:08 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * Implementation of hook_tw_form().
@@ -124,7 +125,7 @@ function spatial_import_tw_form_submit_s
         db_create_table($ret, $tablename, $shapefile_data['schema']);
       }
       else {
-         drupal_set_message('If you wish to replace an existing table, you must specify the table name explicitly','error');
+         drupal_set_message('If you wish to replace an existing table, you must specify the table name explicitly', 'error');
          return;
       }
     }
@@ -165,7 +166,7 @@ function spatial_import_tw_form_submit_s
     // Load the results into our list of spatial tables
     $spatial_import_tables = variable_get("spatial_import_tables", array());
     
-    $spatial_import_tables[$tablename] = array (
+    $spatial_import_tables[$tablename] = array(
       'table' => $tablename,
       'field' => $options['spatial_field_name'],
       'type' => $options['storage'],
@@ -181,4 +182,4 @@ function spatial_import_tw_form_submit_s
   else {
     drupal_set_message(t('Failed to upload spatial file'));
   }
-}
\ No newline at end of file
+}