Merge pull request #15 from davidmsibley/reachDetailFix

setting up searchable station as both short name and nwis site no
davidmsibley · Apr 24, 2015 · ad36fbb · ad36fbb
2 parents e53db9b + 37499f1
commit ad36fbb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...-services/src/main/resources/gov/usgs/cida/gcmrcservices/mb/mappers/ReachDetailMapper.xml b/...-services/src/main/resources/gov/usgs/cida/gcmrcservices/mb/mappers/ReachDetailMapper.xml
@@ -28,7 +28,11 @@
 		<include refid="columns"/>
 		FROM
 			(SELECT DISTINCT
-			(SELECT NWIS_SITE_NO FROM SITE_STAR WHERE SITE_STAR.SITE_ID = SITE_ID_UP) UPSTREAM_STATION,
+			(SELECT (CASE
+						WHEN NWIS_SITE_NO IS NOT NULL
+						THEN NWIS_SITE_NO
+						ELSE SHORT_NAME
+					END) FROM SITE_STAR WHERE SITE_STAR.SITE_ID = SITE_ID_UP) UPSTREAM_STATION,
 			(SELECT NAME FROM GROUP_NAME WHERE GROUP_NAME.GROUP_ID = RTD.REACH_GROUP) REACH_GROUP,
 			(SELECT NAME FROM GROUP_NAME WHERE GROUP_NAME.GROUP_ID = RTD.MAJOR_GROUP) MAJOR_GROUP,
 			(SELECT (