[postgis-commits] svn - r3832 - spike/wktraster/scripts

[postgis-commits at postgis.refractions.net]

Author: mloskot
Date: 2009-03-10 09:35:00 -0700 (Tue, 10 Mar 2009)
New Revision: 3832

Modified:
   spike/wktraster/scripts/gdal2wktraster.py
Log:
gdal2wktraster.py: Use lower-case script parameters (renamed -I to -i). Added log message about using GiST index for raster.

Modified: spike/wktraster/scripts/gdal2wktraster.py
===================================================================
--- spike/wktraster/scripts/gdal2wktraster.py	2009-03-10 16:26:09 UTC (rev 3831)
+++ spike/wktraster/scripts/gdal2wktraster.py	2009-03-10 16:35:00 UTC (rev 3832)
@@ -62,7 +62,7 @@
                       help="drop table, create new one and populate with raster(s)")
     optprs.add_option("-f", "--field", dest="column", action="store", default=g_rt_column, 
                       help="specify name of raster data column, default is 'rast'")
-    optprs.add_option("-I", "--index", dest="index", action="store_true", default=False, 
+    optprs.add_option("-i", "--index", dest="index", action="store_true", default=False, 
                       help="Create a GiST index on the raster column")
     optprs.add_option("-o", "--output", dest="output", action="store", default=sys.stdout,
                       help="specify file for conversion output, otherwise send to stdout")
@@ -329,15 +329,15 @@
             fout.write(sql)
 
             i += 1
-
     
     if opts.index:
-		# CREATE INDEX "table_column_gist" ON "public"."table" using gist (rt_raster_envelope(rast));
-		sql = "CREATE INDEX \"%s_%s_gist\" ON %s using gist (rt_raster_envelope(%s));\n" % (make_sql_table_name(opts.table), opts.column, make_sql_full_table_name(opts.table),opts.column)
+        gist_table = make_sql_table_name(opts.table)
+        target_table = make_sql_full_table_name(opts.table)
+        logit("MSG: Using GiST spatial index on %s\n" % gist_table)
+        sql = "CREATE INDEX \"%s_%s_gist\" ON %s USING GIST (rt_raster_envelope(%s));\n" % \
+                (gist_table, opts.column, target_table, opts.column)
+        fout.write(sql)
 
-		fout.write(sql)
-    	
-    
     # Cleanup
     sys.stdout = saved_out