Changeset: 163be76dc2ba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=163be76dc2ba
Modified Files:
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/lidar/lidar.h
Branch: data-vaults
Log Message:
[LiDAR]: Fix header data type bug
The attributes "major version", "minor version" and "data format id"
should be integer data types instead of char/string.
diffs (35 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -429,8 +429,8 @@ str LIDARexportTable(Client cntxt, MalBl
LASHeader_SetSoftwareId(header, "MonetDB B.V.");
/* LASHeader_SetSRS */
LASHeader_SetSystemId(header, "MonetDB B.V.");
- LASHeader_SetVersionMajor(header, '1');
- LASHeader_SetVersionMinor(header, '2');
+ LASHeader_SetVersionMajor(header, 1);
+ LASHeader_SetVersionMinor(header, 2);
/* Create the writer*/
MT_lock_set(&mt_lidar_lock);
@@ -824,7 +824,7 @@ str LIDARattach(Client cntxt, MalBlkPtr
store_funcs.append_col(m->session->tr,
mvc_bind_column(m,
lidar_tbl, "VersionMinor"), &header->hi->versionMinor, TYPE_int);
store_funcs.append_col(m->session->tr,
- mvc_bind_column(m,
lidar_tbl, "DataFormatId"), &header->hi->dataFormatId, TYPE_str);
+ mvc_bind_column(m,
lidar_tbl, "DataFormatId"), &header->hi->dataFormatId, TYPE_int);
store_funcs.append_col(m->session->tr,
mvc_bind_column(m,
lidar_tbl, "CreationDOY"), &header->hi->creationDOY, TYPE_int);
store_funcs.append_col(m->session->tr,
diff --git a/sql/backends/monet5/vaults/lidar/lidar.h
b/sql/backends/monet5/vaults/lidar/lidar.h
--- a/sql/backends/monet5/vaults/lidar/lidar.h
+++ b/sql/backends/monet5/vaults/lidar/lidar.h
@@ -46,7 +46,7 @@ typedef struct lidar_header_info {
int fileSourceId;
int versionMajor;
int versionMinor;
- char dataFormatId;
+ int dataFormatId;
str WKT;
str WKT_CompoundOK;
str proj4;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
