Changeset 5102

Timestamp:

01/05/10 11:18:26 (2 years ago)

Author:

jorgearevalo

Message:

Out-db raster support added. Ticket #227 solved.

Location:

spike/wktraster

Files:

• rt_pg/rtpostgis.sql.in.c (modified) (1 diff)
• scripts/gdal2wktraster.py (modified) (7 diffs)

spike/wktraster/rt_pg/rtpostgis.sql.in.c

@@ -539 +539 @@
     -- Verify out_db
     -- TODO: Waiting for out-db rasters
-    IF ( p_out_db = true ) THEN
-            RAISE EXCEPTION 'TODO: Outside database rasters not implemented yet';
-            RETURN 'fail';
-    END IF;
+    --IF ( p_out_db = true ) THEN
+    --        RAISE EXCEPTION 'TODO: Outside database rasters not implemented yet';
+    --        RETURN 'fail';
+    --END IF;
 
 

spike/wktraster/scripts/gdal2wktraster.py

@@ -96 +96 @@
                      help="register the raster as a filesystem (out-db) raster")
     grp_r.add_option("-l", "--overview-level", dest="overview_level", action="store", type="int", default=1,
-                     help='Create overview tables named as ov_<RASTER TABLE>_<LEVEL> and '
+                     help='Create overview tables named as o_<LEVEL>_<RASTER_TABLE> and '
                      'populate with GDAL-provided overviews (regular blocking only)')
     prs.add_option_group(grp_r);
@@ -125 +125 @@
                      help="control endianness of generated binary output of raster; "
                      "specify 0 for XDR and 1 for NDR (default); "
-                     "only XDR output is supported now")
+                     "only NDR output is supported now")
     grp_u.add_option("-w", "--wktraster-version", dest="version",
                      action="store", type="int", default=g_rt_version, 
@@ -739 +739 @@
     return hexwkb
 
-def wkblify_band(options, band, level, xoff, yoff, read_block_size, block_size):
+def wkblify_band(options, band, level, xoff, yoff, read_block_size, block_size, infile, bandidx):
     """Writes band of given GDAL dataset into HEX-encoded WKB for WKT Raster output."""
     assert band is not None, "Error: Missing GDAL raster band"
@@ -748 +748 @@
         # Off-db raster
         # TODO: Do we want to handle options.overview_level? --mloskot
+        # ANSWER: 
         # TODO: Where bandidx and ds come from? --mloskot
+        # ANSWER: Provided by caller method --jorgearevalo
         hexwkb += wkblify('B', bandidx - 1)
-        filepath = os.path.abspath((ds.GetFileList()[0]).replace('\\', '\\\\'))
+        filepath = os.path.abspath(infile.replace('\\', '\\\\'))
+        logit('MSG: Out-db raster path=%s\n' % filepath)
         hexwkb += wkblify(str(len(filepath)) + 's', filepath)
         hexwkb += wkblify('B', 0)
@@ -820 +823 @@
     return hexwkb
 
-def wkblify_raster_level(options, ds, level, band_range):
+def wkblify_raster_level(options, ds, level, band_range, infile):
     assert ds is not None
     assert level >= 1
@@ -900 +903 @@
 
                 hexwkb += wkblify_band_header(options, band)
-                hexwkb += wkblify_band(options, band, level, xoff, yoff, read_block_size, block_size)
+                hexwkb += wkblify_band(options, band, level, xoff, yoff, read_block_size, block_size, infile, b)
 
             # INSERT INTO
@@ -933 +936 @@
 
     # Generate requested overview level (base raster if level = 1)
-    summary = wkblify_raster_level(options, ds, options.overview_level, band_range)
+    summary = wkblify_raster_level(options, ds, options.overview_level, band_range, infile)
     SUMMARY.append( summary )