If generating overviews and -F is set, overview tables will have "filename" column.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8568 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/raster/loader/raster2pgsql.c b/raster/loader/raster2pgsql.c
index 35c35e263cb4685882c4710272ef992280965bea..024688d811ae253f3bee95f37735445a09481f02 100644 (file)
--- a/raster/loader/raster2pgsql.c
+++ b/raster/loader/raster2pgsql.c
@@ -1170,7 +1170,7 @@ build_overview(int idx, RTLOADERCFG *config, RASTERINFO *info, int factor, STRIN
        /* create VRT dataset */
        hdsOv = VRTCreate(dimOv[0], dimOv[1]);
        /*
-   GDALSetDescription(hdsOv, "/tmp/ov.vrt");
+       GDALSetDescription(hdsOv, "/tmp/ov.vrt");
        */
        GDALSetProjection(hdsOv, info->srs);
 
@@ -1229,7 +1229,7 @@ build_overview(int idx, RTLOADERCFG *config, RASTERINFO *info, int factor, STRIN
                for (xtile = 0; xtile < ntiles[0]; xtile++) {
                        /*
                        char fn[100];
-                       sprintf(fn, "/tmp/tile%d.vrt", (ytile * ntiles[0]) + xtile);
+                       sprintf(fn, "/tmp/ovtile%d.vrt", (ytile * ntiles[0]) + xtile);
                        */
 
                        /* compute tile's upper-left corner */
@@ -1288,7 +1288,7 @@ build_overview(int idx, RTLOADERCFG *config, RASTERINFO *info, int factor, STRIN
                        if (tileset->length > 10) {
                                if (!insert_records(
                                        config->schema, config->table, config->raster_column,
-                                       NULL, config->copy_statements,
+                                       (config->file_column ? config->rt_filename[idx] : NULL), config->copy_statements,
                                        tileset, buffer
                                )) {
                                        fprintf(stderr, _("Cannot convert raster tiles into INSERT or COPY statements\n"));
@@ -1676,7 +1676,7 @@ process_rasters(RTLOADERCFG *config, STRINGBUFFER *buffer) {
                        for (i = 0; i < config->overview_count; i++) {
                                if (!create_table(
                                        config->schema, config->overview_table[i], config->raster_column,
-                                       0,
+                                       config->file_column,
                                        config->tablespace, config->idx_tablespace,
                                        buffer
                                )) {
@@ -1755,7 +1755,7 @@ process_rasters(RTLOADERCFG *config, STRINGBUFFER *buffer) {
 
                                        if (config->copy_statements && !copy_from(
                                                        config->schema, config->overview_table[j], config->raster_column,
-                                                       NULL,
+                                                       (config->file_column ? config->rt_filename[i] : NULL),
                                                        buffer
                                        )) {
                                                fprintf(stderr, _("Cannot add COPY statement to string buffer\n"));
@@ -1773,7 +1773,7 @@ process_rasters(RTLOADERCFG *config, STRINGBUFFER *buffer) {
 
                                        if (tileset.length && !insert_records(
                                                config->schema, config->overview_table[j], config->raster_column,
-                                               NULL, config->copy_statements,
+                                               (config->file_column ? config->rt_filename[i] : NULL), config->copy_statements,
                                                &tileset, buffer
                                        )) {
                                                fprintf(stderr, _("Cannot convert overview tiles into INSERT or COPY statements\n"));