Changeset 3943 for spike/wktraster/scripts/gdal2wktraster.py

Timestamp:

03/30/09 04:33:12 (3 years ago)

Author:

mloskot

Message:

[wktraster] Fixed SQL quoting functions. Added make_sql_drop_raster_table function. Use SELECT DropRasterColum? instead of DROP TABLE if -d option specified.

Files:

• spike/wktraster/scripts/gdal2wktraster.py (modified) (7 diffs)

spike/wktraster/scripts/gdal2wktraster.py

@@ -531 +531 @@
     if value[0] != "'" and value[:-1] != "'":
         sql = "'" + str(value) + "'"
+    else:
+        sql = value
     return sql
 
@@ -538 +540 @@
     if name[0] != "\"" and name[:-1] != "\"":
         sql = "\"" + str(name) + "\""
+    else:
+        sql = name
     return sql
 
@@ -551 +555 @@
     return sql
 
-def make_sql_table_schema(schema_table):
+def make_sql_schema_table_names(schema_table):
     st = schema_table.split('.')
     if len(st) == 1:
@@ -560 +564 @@
 
 def make_sql_full_table_name(schema_table):
-    st = make_sql_table_schema(schema_table)
+    st = make_sql_schema_table_names(schema_table)
     table = "\"%s\".\"%s\"" % (st[0], st[1])
     return table
@@ -577 +581 @@
     return sql
 
+def make_sql_drop_raster_table(table):
+    st = make_sql_schema_table_names(table)
+    
+    if len(st[0]) == 0:
+        target = "'', '%s'" % st[1]
+    else:
+        target = "'%s', '%s'" % (st[0], st[1])
+    sql = "SELECT DropRasterTable(%s);\n" % target
+    logit("SQL: %s" % sql)
+    return sql
+
+
 def make_sql_create_table(table, insert_filename):
     if insert_filename:
@@ -599 +615 @@
 def make_sql_addrastercolumn(options, pixeltypes, nodata, pixelsize, blocksize, extent):
     assert len(pixeltypes) > 0, "No pixel types given"
-    ts = make_sql_table_schema(options.table)
+    ts = make_sql_schema_table_names(options.table)
     pt = make_sql_value_array(pixeltypes)
 
@@ -667 +683 @@
     # DROP TABLE 
     if opts.drop_table:
-        sql = make_sql_drop_table(opts.table)
+        sql = make_sql_drop_raster_table(opts.table)
         opts.output.write(sql)