Changeset: e40792db6aac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e40792db6aac
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
Branch: geo
Log Message:
minor changes (e.g. comments)
diffs (45 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2332,17 +2332,16 @@ str wkbNumRings(int* out, wkb** geom, in
/* it handles functions that take as input a single geometry and return
boolean */
static int wkbBasicBoolean(wkb **geom, char (*func)(const GEOSGeometry*)) {
- int res = -1;
+ int ret = -1;
GEOSGeom geosGeometry = wkb2geos(*geom);
if (!geosGeometry)
return 3;
- res = (*func)(geosGeometry);
-
+ ret = (*func)(geosGeometry); //it is supposed to return char but
treating it as such gives wrong results
GEOSGeom_destroy(geosGeometry);
- return res;
+ return ret;
}
/* the function checks whether the geometry is closed. GEOS works only with
@@ -2432,7 +2431,7 @@ str wkbIsSimple(bit *out, wkb **geomWKB)
return MAL_SUCCEED;
}
-/*geom prints a message sayig the reasom why the geometry is not valid but
+/*geom prints a message saying the reasom why the geometry is not valid but
* since there is also isValidReason I skip this here */
str wkbIsValid(bit *out, wkb **geomWKB) {
int res = wkbBasicBoolean(geomWKB, GEOSisValid);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -529,7 +529,7 @@ comment "Called when inserting values to
command batcalc.wkb(geo:bat[:oid,:wkb], columnType:int, columnSRID:int)
:bat[:oid,:wkb] address geom_2_geom_bat
comment "Called when inserting values to a table in order to check if the
inserted geometries are of the same type and srid required by the column
definition";
-#Is it needed ???
+#Is it needed ??? --> yes for bulk loading without extra functions
#command wkb(v:bat[:oid,:wkb]) :bat[:oid,:wkb] address wkbFromWKB_bat;
#comment "It is called when adding a new geometry column to an existing table";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
