Update of /cvsroot/monetdb/sql/src/test/Skyserver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30876
Modified Files:
Tag: SQL_2-24
Skyserver_functions_v6.sql
Log Message:
Fix functions....
varchar() does not accept and variable to define the string length...
Remove some commented lines to make the function working again..
U Skyserver_functions_v6.sql
Index: Skyserver_functions_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_functions_v6.sql,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- Skyserver_functions_v6.sql 10 Jun 2008 20:14:46 -0000 1.1.2.11
+++ Skyserver_functions_v6.sql 22 Jun 2008 21:42:04 -0000 1.1.2.12
@@ -711,7 +711,12 @@
-- seconds
SET d = MS_ROUND( 60.0 * (d-nd),precision,truncat );
-- SET d = 60.0 * (d-nd);
- SET q = LTRIM(STR(d,precision));
+ IF (precision < 1)
+ THEN SET q = LTRIM(cast( round(d, precision) as varchar(7)));
+ END IF;
+ IF (precision > 10)
+ THEN SET q = LTRIM(cast( round(d, precision) as varchar(16)));
+ END IF;
SET t = MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
--
RETURN(s||t);
@@ -1993,7 +1998,7 @@
f float ,
node float ,
incl float ,
- distance float -- distance in arc minutes
+ distance float -- distance in arc minutes
)
BEGIN
--
@@ -2010,11 +2015,9 @@
INSERT into cover
SELECT htmidStart, htmidEnd
FROM fHtmCoverCircleXyz(nx,ny,nz,radius);
- RETURN TABLE (
- SELECT fieldID,a,b,c,d,e,f,node,incl,
-
(2*DEGREES(ASIN(sqrt(power(nx-cx,2)+power(ny-cy,2)+power(nz-cz,2))/2))*60) as
val
- FROM cover H inner join Frame F
- ON (F.HtmID BETWEEN H.htmidStart AND H.htmidEnd )
+ RETURN TABLE(SELECT fieldID,a,b,c,d,e,f,node,incl,
+
(2*DEGREES(ASIN(sqrt(power(nx-cx,2)+power(ny-cy,2)+power(nz-cz,2))/2))*60) as
val
+ FROM cover H inner join Frame F ON (F.HtmID BETWEEN H.htmidStart
AND H.htmidEnd )
WHERE zoom = zoo
AND
(2*DEGREES(ASIN(sqrt(power(nx-cx,2)+power(ny-cy,2)+power(nz-cz,2))/2))*60) <
radius ORDER BY val ASC);
END;
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
