re-ordered, adding debugging and better error correction

GMOD · Jun 27, 2019 · 535f96e · 535f96e
1 parent 4758b4b
commit 535f96e
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/grails-app/controllers/org/bbop/apollo/VcfController.groovy b/grails-app/controllers/org/bbop/apollo/VcfController.groovy
@@ -40,13 +40,6 @@ class VcfController {
         JSONArray featuresArray = new JSONArray()
         Organism organism = preferenceService.getOrganismForToken(organismString)
         JSONObject trackListObject = trackService.getTrackList(organism.directory)
-        String trackUrlTemplate
-        for(JSONObject track : trackListObject.getJSONArray(FeatureStringEnum.TRACKS.value)) {
-            if(track.getString(FeatureStringEnum.LABEL.value) == trackName) {
-                trackUrlTemplate = track.urlTemplate
-                break
-            }
-        }
 
         Boolean ignoreCache = params.ignoreCache != null ? Boolean.valueOf(params.ignoreCache) : false
         if (!ignoreCache) {
@@ -57,6 +50,19 @@ class VcfController {
             }
         }
 
+        String trackUrlTemplate = null
+        for(JSONObject track : trackListObject.getJSONArray(FeatureStringEnum.TRACKS.value)) {
+            log.debug "comparing ${track.label} to ${trackName}"
+            if(track.getString(FeatureStringEnum.LABEL.value) == trackName) {
+                log.debug "found ${track} -> ${track.urlTemplate}"
+                trackUrlTemplate = track.urlTemplate
+                break
+            }
+        }
+        if(!trackUrlTemplate){
+            throw new RuntimeException("Track url template not found for '${trackName}'")
+        }
+
         File file = new File(organism.directory + File.separator + trackUrlTemplate)
         try {
             VCFFileReader vcfFileReader = new VCFFileReader(file)