Changeset: c15fd5da54a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c15fd5da54a9
Modified Files:
sql/backends/monet5/vaults/gdal/gdal.c
sql/backends/monet5/vaults/gdal/gdal.mal
sql/backends/monet5/vaults/gdal/gdal_vault.h
sql/backends/monet5/vaults/geotiff/geotiff.c
sql/backends/monet5/vaults/geotiff/geotiff.h
sql/backends/monet5/vaults/geotiff/geotiff.mal
Branch: SciQL-2
Log Message:
GDALattach anf GEOTIFF attach did not compile so I removed them completely
diffs (196 lines):
diff --git a/sql/backends/monet5/vaults/gdal/gdal.c
b/sql/backends/monet5/vaults/gdal/gdal.c
--- a/sql/backends/monet5/vaults/gdal/gdal.c
+++ b/sql/backends/monet5/vaults/gdal/gdal.c
@@ -61,7 +61,9 @@ GDALtest(int *wid, int *len, str *fname)
return msg;
}
-/* attach a single gdal file given its name, fill in gdal catalog tables */
+//FOT: It does not compile so I removed it
+#if 0
+/* attach a single gdal file given its name, fill in gdal catalog tables*/
str
GDALattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
@@ -72,12 +74,12 @@ GDALattach(Client cntxt, MalBlkPtr mb, M
str msg = MAL_SUCCEED;
str fname = *(str*)getArgReference(stk, pci, 1);
GDALDatasetH hDataset;
-//FOT: GDALRasterBandH hBand;
-//FOT: char buf[BUFSIZ], *s= buf;
-//FOT: int wid = 0, len = 0;
-//FOT: oid fid, imid
+ GDALRasterBandH hBand;
+ char buf[BUFSIZ], *s= buf;
+ int wid = 0, len = 0;
+ oid fid, imid
oid rid = oid_nil;
-//FOT: sht bps;
+ sht bps;
msg = getSQLContext(cntxt, mb, &m, NULL);
if (msg)
@@ -107,22 +109,22 @@ GDALattach(Client cntxt, MalBlkPtr mb, M
/* add row in the rs.files catalog table */
col = mvc_bind_column(m, fls, "fileid");
-//FOT: fid = store_funcs.count_col(col, 1) + 1;
+ fid = store_funcs.count_col(col, 1) + 1;
-//FOT: snprintf(buf, BUFSIZ, INSFILE, (int)fid, fname, 0);
-//FOT: if ( ( msg = SQLstatementIntern(cntxt,&s,"gdal.attach",TRUE,FALSE)) !=
MAL_SUCCEED)
+ snprintf(buf, BUFSIZ, INSFILE, (int)fid, fname, 0);
+ if ( ( msg = SQLstatementIntern(cntxt,&s,"gdal.attach",TRUE,FALSE)) !=
MAL_SUCCEED)
goto finish;
/* add row in the rs.catalog catalog table */
col = mvc_bind_column(m, cat, "imageid");
-//FOT: imid = store_funcs.count_col(col, 1) + 1;
-//FOT: len = GDALGetRasterYSize(hDataset);
-//FOT: wid = GDALGetRasterXSize(hDataset);
-//FOT: hBand = GDALGetRasterBand(hDataset, 1);
-//FOT: bps = GDALGetDataTypeSize(GDALGetRasterDataType(hBand));
+ imid = store_funcs.count_col(col, 1) + 1;
+ len = GDALGetRasterYSize(hDataset);
+ wid = GDALGetRasterXSize(hDataset);
+ hBand = GDALGetRasterBand(hDataset, 1);
+ bps = GDALGetDataTypeSize(GDALGetRasterDataType(hBand));
-//FOT: snprintf(buf, BUFSIZ, INSCAT, (int)imid, (int)fid, wid, len, bps);
-//FOT: msg = SQLstatementIntern(cntxt,&s,"gdal.attach",TRUE,FALSE);
+ snprintf(buf, BUFSIZ, INSCAT, (int)imid, (int)fid, wid, len, bps);
+ msg = SQLstatementIntern(cntxt,&s,"gdal.attach",TRUE,FALSE);
finish:
/* if (msg != MAL_SUCCEED){
@@ -132,6 +134,7 @@ finish:
GDALClose(hDataset);
return msg;
}
+#endif
static str
ARRAYseries(bat *bid, bte start, bte step, int stop, int group, int series)
diff --git a/sql/backends/monet5/vaults/gdal/gdal.mal
b/sql/backends/monet5/vaults/gdal/gdal.mal
--- a/sql/backends/monet5/vaults/gdal/gdal.mal
+++ b/sql/backends/monet5/vaults/gdal/gdal.mal
@@ -21,9 +21,9 @@ command test(filename:str) (:int, :int)
address GDALtest
comment "Returns width and length of a GDAL supported image";
-pattern attach(filename:str) :void
-address GDALattach
-comment "Register a GDAL supported image file in the vault catalog";
+#pattern attach(filename:str) :void
+#address GDALattach
+#comment "Register a GDAL supported image file in the vault catalog";
command load(filename:str) :bat[:oid, :sht]
address GDALloadImage
diff --git a/sql/backends/monet5/vaults/gdal/gdal_vault.h
b/sql/backends/monet5/vaults/gdal/gdal_vault.h
--- a/sql/backends/monet5/vaults/gdal/gdal_vault.h
+++ b/sql/backends/monet5/vaults/gdal/gdal_vault.h
@@ -33,7 +33,7 @@
#endif
gdal_export str GDALtest(int *wid, int *len, str *fname);
-gdal_export str GDALattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+//gdal_export str GDALattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
gdal_export str GDALloadGreyscaleImage(bat *x, bat *y, bat *intensity, str
*fname);
gdal_export str GDALimportImage(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
#endif
diff --git a/sql/backends/monet5/vaults/geotiff/geotiff.c
b/sql/backends/monet5/vaults/geotiff/geotiff.c
--- a/sql/backends/monet5/vaults/geotiff/geotiff.c
+++ b/sql/backends/monet5/vaults/geotiff/geotiff.c
@@ -59,6 +59,8 @@ GTIFFtest(int *wid, int *len, str *fname
return msg;
}
+//It does not compile so I removed it
+#if 0
/* attach a single geotiff file given its name, fill in geotiff catalog tables
*/
str
GTIFFattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
@@ -70,10 +72,10 @@ GTIFFattach(Client cntxt, MalBlkPtr mb,
str msg = MAL_SUCCEED;
str fname = *(str*)getArgReference(stk, pci, 1);
TIFF *tif = (TIFF*)0; /* TIFF-level descriptor */
-//FOT: char buf[BUFSIZ];
-//FOT: char *s= buf;
+ char buf[BUFSIZ];
+ char *s= buf;
int wid = 0, len = 0;
-//FOT: oid fid, imid;
+ oid fid, imid;
oid rid = oid_nil;
sht bps;
@@ -104,23 +106,23 @@ GTIFFattach(Client cntxt, MalBlkPtr mb,
/* add row in the rs.files catalog table */
col = mvc_bind_column(m, fls, "fileid");
-//FOT: fid = store_funcs.count_col(col, 1) + 1;
+ fid = store_funcs.count_col(col, 1) + 1;
-//FOT: snprintf(buf, BUFSIZ, INSFILE, (int)fid, fname, 0);
-//FOT: if ( ( msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE))
!= MAL_SUCCEED)
-//FOT: goto finish;
+ snprintf(buf, BUFSIZ, INSFILE, (int)fid, fname, 0);
+ if ( ( msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE))
!= MAL_SUCCEED)
+ goto finish;
/* add row in the rs.catalog catalog table */
col = mvc_bind_column(m, cat, "imageid");
-//FOT: imid = store_funcs.count_col(col, 1) + 1;
+ imid = store_funcs.count_col(col, 1) + 1;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &wid);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &len);
TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bps);
-//FOT: snprintf(buf, BUFSIZ, INSCAT, (int)imid, (int)fid, wid, len, bps);
-//FOT: msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE);
+ snprintf(buf, BUFSIZ, INSCAT, (int)imid, (int)fid, wid, len, bps);
+ msg = SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE);
-//FOT: finish:
+ finish:
/* if (msg != MAL_SUCCEED){
snprintf(buf, BUFSIZ,"ROLLBACK;");
SQLstatementIntern(cntxt,&s,"geotiff.attach",TRUE,FALSE));
@@ -128,7 +130,7 @@ GTIFFattach(Client cntxt, MalBlkPtr mb,
XTIFFClose(tif);
return msg;
}
-
+#endif
#define MALLOC_CHECK(tpe, sz) \
{ \
diff --git a/sql/backends/monet5/vaults/geotiff/geotiff.h
b/sql/backends/monet5/vaults/geotiff/geotiff.h
--- a/sql/backends/monet5/vaults/geotiff/geotiff.h
+++ b/sql/backends/monet5/vaults/geotiff/geotiff.h
@@ -33,7 +33,7 @@
#endif
geotiff_export str GTIFFtest(int *wid, int *len, str *fname);
-geotiff_export str GTIFFattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+//geotiff_export str GTIFFattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
geotiff_export str GTIFFloadGreyscaleImage(bat *x, bat *y, bat *intensity, str
*fname);
geotiff_export str GTIFFimportImage(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
#endif
diff --git a/sql/backends/monet5/vaults/geotiff/geotiff.mal
b/sql/backends/monet5/vaults/geotiff/geotiff.mal
--- a/sql/backends/monet5/vaults/geotiff/geotiff.mal
+++ b/sql/backends/monet5/vaults/geotiff/geotiff.mal
@@ -21,9 +21,9 @@ command test(filename:str) (:int, :int)
address GTIFFtest
comment "Returns width and length of GeoTIFF image";
-pattern attach(filename:str) :void
-address GTIFFattach
-comment "Register a GeoTIFF image file in the vault catalog";
+#pattern attach(filename:str) :void
+#address GTIFFattach
+#comment "Register a GeoTIFF image file in the vault catalog";
command load(filename:str) :bat[:oid, :sht]
address GTIFFloadImage
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
