From 8be9fd8d02c5ffbb66ab41f3d6d0f3261dd7bfff Mon Sep 17 00:00:00 2001 From: deoyani Date: Fri, 20 Feb 2015 12:48:06 -0500 Subject: [PATCH] Updated queries to remove photozRF references. --- en/tools/explore/DisplayResults.aspx.cs | 4 ++-- en/tools/explore/ExploreHelpers/ExplorerQueries.cs | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/en/tools/explore/DisplayResults.aspx.cs b/en/tools/explore/DisplayResults.aspx.cs index c384962..49565c4 100644 --- a/en/tools/explore/DisplayResults.aspx.cs +++ b/en/tools/explore/DisplayResults.aspx.cs @@ -69,8 +69,8 @@ private void getQuery() { cmd = ExplorerQueries.PhotoTagQuery.Replace("@objId", objId); break; case "photoZ": cmd = ExplorerQueries.PhotoZ.Replace("@objId", objId); break; - case "photozRF": - cmd = ExplorerQueries.PhotozRF.Replace("@objId", objId); break; + //case "photozRF": + // cmd = ExplorerQueries.PhotozRF.Replace("@objId", objId); break; case "Field": cmd = ExplorerQueries.FieldQuery.Replace("@fieldId", fieldId); break; diff --git a/en/tools/explore/ExploreHelpers/ExplorerQueries.cs b/en/tools/explore/ExploreHelpers/ExplorerQueries.cs index c338d3a..4eb24ae 100644 --- a/en/tools/explore/ExploreHelpers/ExplorerQueries.cs +++ b/en/tools/explore/ExploreHelpers/ExplorerQueries.cs @@ -101,7 +101,7 @@ public class ExplorerQueries //string c1 = "select * from Photoz2 where objid=" + objid; //PhotzRF - public static string PhotozRF= "select * from PhotozRF where objid=@objId"; + //public static string PhotozRF= "select * from PhotozRF where objid=@objId"; //string c2 = "select * from Photoz2 where objid=" + objid; #region plate @@ -282,13 +282,14 @@ public class ExplorerQueries dbo.fPhotoModeN(po.mode) as mode,po.mjd as 'mjdNum', (po.nDetect-1) as 'Other observations', po.parentID, po.nChild, str(po.extinction_r,7,2) as extinction_r, str(po.petroRad_r,9,2)+' ± '+str(po.petroRadErr_r,10,3) as 'petrorad_r', --- photz,photozRF,zoospec - (str(phz.z,7,3)+' ± '+str(phz.zerr,8,4))as 'photoZ_KD', (str(phzrf.z,7,3)+' ± '+str(phzrf.zerr,8,4)) as 'photoZ_RF', + (str(phz.z,7,3)+' ± '+str(phz.zerr,8,4))as 'photoZ_KD', + ---(str(phzrf.z,7,3)+' ± '+str(phzrf.zerr,8,4)) as 'photoZ_RF', case (1*zz.spiral+10*zz.elliptical+100*zz.uncertain) when 1 then 'Spiral' when 10 then 'Elliptical' when 100 then 'Uncertain' else '-' end as 'GalaxyZoo_Morph' --all joins from PhotoTag pt left outer join PhotoObj po on po.objid = pt.objid left outer join Photoz phz on pt.objid=phz.objid - left outer join PhotozRF phzrf on pt.objid=phzrf.objid + ---left outer join PhotozRF phzrf on pt.objid=phzrf.objid left outer join zooSpec zz on pt.objid=zz.objid left outer join field f on f.fieldID=pt.fieldID left outer join photoobjall pa with (nolock)on pa.objid = pt.objid