Changeset: 11ddea8314ad for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11ddea8314ad
Modified Files:
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/LSST/lsst.mal
sql/backends/monet5/LSST/lsst.sql
Branch: Apr2011
Log Message:
Fixing naming issues
diffs (92 lines):
diff --git a/sql/backends/monet5/LSST/Makefile.ag
b/sql/backends/monet5/LSST/Makefile.ag
--- a/sql/backends/monet5/LSST/Makefile.ag
+++ b/sql/backends/monet5/LSST/Makefile.ag
@@ -41,7 +41,7 @@
../../../../gdk/libbat $(curl_LIBS)
}
-headers_mal = {
+headers_lsstmal = {
HEADERS = mal
DIR = libdir/monetdb5
SOURCES = lsst.mal
@@ -53,7 +53,7 @@
SOURCES = lsst.sql
}
-headers_autoload = {
+headers_lsstautoload = {
HEADERS = mal
DIR = libdir/monetdb5/autoload
SOURCES = 80_lsst.mal
diff --git a/sql/backends/monet5/LSST/lsst.mal
b/sql/backends/monet5/LSST/lsst.mal
--- a/sql/backends/monet5/LSST/lsst.mal
+++ b/sql/backends/monet5/LSST/lsst.mal
@@ -16,23 +16,25 @@
#Copyright August 2008-2011 MonetDB B.V.
#All Rights Reserved.
-command mal.qserv_angSep(ra1:dbl, dec1:dbl, ra2:dbl, dec2:dbl)(ra3:dbl,
dec3:dbl)
-address qserv_angSep
+module lsst;
+
+command lsst.angsep(ra1:dbl, dec1:dbl, ra2:dbl, dec2:dbl)(ra3:dbl, dec3:dbl)
+address angSep
comment "Returns the angular separation in degrees between two spherical
coordinate pairs (ra1,dec1) and (ra2,dec2)";
-command mal.qserv_ptInSphBox(ra:dbl, dec:dbl, ra_min:dbl, dec_min:dbl,
ra_max:dbl, dec_max:dbl) :int
-address qserv_ptInSphBox
+command lsst.ptinsphbox(ra:dbl, dec:dbl, ra_min:dbl, dec_min:dbl, ra_max:dbl,
dec_max:dbl) :int
+address ptinsphBox
comment "Returns 1 if the given spherical longitude/latitude box contains the
given position";
-command mal.qserv_ptInSphCircle(ra:dbl, dec:dbl, ra_min:dbl, dec_min:dbl,
ra_max:dbl, dec_max:dbl) :int
-address qserv_ptInSphCircle
+command lsst.ptinsphcircle(ra:dbl, dec:dbl, ra_cen:dbl, dec_cen:dbl,
radius:dbl) :int
+address ptinsphCircle
comment "Returns 1 if the given spherical longitude/latitude circle contains
the given position";
-command mal.qserv_ptInSphEllipse(ra:dbl, dec:dbl, ra_min:dbl, dec_min:dbl,
ra_max:dbl, dec_max:dbl) :int
-address qserv_ptInSphEllipse
+command lsst.ptinsphellipse(ra:dbl, dec:dbl, ra_cen:dbl, dec_cen:dbl,
smaa:dbl, smia:dbl, ang:dbl) :int
+address ptinsphEllipse
comment "Returns 1 if the given spherical longitude/latitude ellipse contains
the given position";
-pattern mal.qserv_ptInSphPoly(ra:dbl, dec:dbl, list:dbl...) :int
-address qserv_ptInSphPoly
+pattern lsst.ptinsphpoly(ra:dbl, dec:dbl, list:dbl...) :int
+address ptinsphPoly
comment "Returns 1 if the given spherical longitude/latitude polyline contains
the given position";
diff --git a/sql/backends/monet5/LSST/lsst.sql
b/sql/backends/monet5/LSST/lsst.sql
--- a/sql/backends/monet5/LSST/lsst.sql
+++ b/sql/backends/monet5/LSST/lsst.sql
@@ -17,18 +17,17 @@
All Rights Reserved.
*/
-create function qserv_angSep(ra1 dbl, dec1 dbl, ra2 dbl, dec2 dbl)
-returns dbl external name 'mal.qserv_angSep';
+create function angSep(ra1 double, dec1 double, ra2 double, dec2 double)
+returns double external name lsst.angsep;
+create function ptInSphBox(ra1 double, dec1 double, ra_min double, dec_min
double, ra_max double, dec_max double)
+returns int external name lsst.ptinsphbox;
-create function qserv_ptInSphBox(ra, dbl dec dbl, ra_ dblmin, dec dbl_min, ra_
dblmax, dec dbl_max)
-returns int external name 'mal.qserv_InSphBox;
+create function ptInSphEllipse(ra1 double, dec1 double , ra_cen double,
dec_cen double, smaa double, smia double, ang double)
+returns int external name lsst.ptinsphellipse;
-create function qserv_ptInSphEllipse(ra, dbl dec dbl, ra_ dblcen, dec dbl_cen,
sma dbla, smi dbla, ang dbl)
-returns int external name 'mal.qserv_InSphEllipse;
+create function ptInSphCircle(ra1 double, dec1 double, ra_cen double, dec_cen
double, radius double)
+returns int external name lsst.ptinsphcircle;
-create function qserv_ptInSphCircle(ra, dbl dec dbl, ra_ dblcen, dec dbl_cen,
rad dblius)
-returns int external name 'mal.qserv_InSphZ;
-
-create function qserv_ptInSphPoly(ra dbl, dec dbl, list dbl)
-returns int external name 'mal.qserv_InSphPoly;
+create function ptInSphPoly(ra1 double, dec1 double, list double)
+returns int external name lsst.ptinsphpoly;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
