ttools: adjust ADQL for tap upload match

Starlink · Nov 27, 2014 · 05ca3f3 · 05ca3f3
1 parent 04bd517
commit 05ca3f3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/ttools/src/main/uk/ac/starlink/ttools/cone/TapUploadMatcher.java b/ttools/src/main/uk/ac/starlink/ttools/cone/TapUploadMatcher.java
@@ -43,6 +43,7 @@ public class TapUploadMatcher implements UploadMatcher {
 
     private static final String TABLE_ID = "up";
     private static final String ID_NAME = "tapupload_id";
+    private static final String ID_ALIAS = "tapupload_id_a";
     private static final String RA_NAME = "lon";
     private static final String DEC_NAME = "lat";
 
@@ -182,7 +183,7 @@ public String getAdql( long maxrec ) {
         sbuf.append( "u." )
             .append( ID_NAME )
             .append( " AS " )
-            .append( ID_NAME )
+            .append( ID_ALIAS )
             .append( "," );
         sbuf.append( nl );
         if ( isBestScore ) {
@@ -201,7 +202,7 @@ public String getAdql( long maxrec ) {
         if ( isBestScore ) {
             sbuf.append( ")" );
         }
-        sbuf.append( "*3600." )
+        sbuf.append( "*3600.0" )
             .append( " AS SEP_ARCSEC" )
             .append( nl )
             .append( "FROM " )
@@ -224,13 +225,13 @@ public String getAdql( long maxrec ) {
             .append( "))" );
         if ( isBestScore ) {
             sbuf.append( nl )
-                .append( "GROUP BY u." )
-                .append( ID_NAME );
+                .append( "GROUP BY " )
+                .append( ID_ALIAS );
         }
         else if ( isBest ) {
             sbuf.append( nl )
                 .append( "ORDER BY " )
-                .append( ID_NAME )
+                .append( ID_ALIAS )
                 .append( " ASC" );
         }
         return sbuf.toString();