MonetDB: mbedded - start of removing functions

[Niels Nes]

Changeset: 80b79f6e42e7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80b79f6e42e7
Modified Files:
        geom/monetdb5/geom.c
        geom/monetdb5/geom.h
        geom/monetdb5/geom.mal
Branch: mbedded
Log Message:

start of removing functions


diffs (43 lines):

diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2580,6 +2580,12 @@ wkbAsText(char **txt, wkb **geomWKB, int
 }
 
 str
+wkbAsText0(char **txt, wkb **geomWKB)
+{
+       return wkbAsText(txt, geomWKB, NULL);
+}
+
+str
 wkbMLineStringToPolygon(wkb **geomWKB, str *geomWKT, int *srid, int *flag)
 {
        int itemsNum = 0, i, type = wkbMultiLineString_mdb;
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -117,6 +117,7 @@ geom_export str wkbGeometryType_bat(bat 
 geom_export str wkbGetSRID(int*, wkb**);
 //Envelope
 geom_export str wkbAsText(char **outTXT, wkb **inWKB, int *withSRID);
+geom_export str wkbAsText0(char **txt, wkb **geomWKB);
 geom_export str wkbAsText_bat(bat *inBAT_id, bat *outBAT_id, int *withSRID);
 
 geom_export str wkbAsBinary(char**, wkb**);
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -72,10 +72,8 @@ comment "Creates a wkb using the HEX rep
 #comment "Returns the text representation of the geometry including the srid";
 
 command ToText(w:wkb, withSRID:int) :str address wkbAsText;
-function AsText(w:wkb) :str;
-       x := ToText(w,0);
-       return x;
-end AsText;
+command AsText(w:wkb) :str address wkbAsText0;
+
 function AsEWKT(w:wkb) :str;
        x := ToText(w,1);
        return x;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list