Skip to content

Commit f54a8e8

Browse files
committed
Skip GTF tracks until officially supported by JB2
1 parent e4eaa28 commit f54a8e8

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

jbrowse/src/org/labkey/jbrowse/model/JsonFile.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,25 +294,28 @@ else if (TRACK_TYPES.gff.getFileType().isType(targetFile.getFile()))
294294
}
295295
else if (TRACK_TYPES.gtf.getFileType().isType(targetFile.getFile()))
296296
{
297-
ret = getGxfTrack(log, targetFile, rg);
297+
// NOTE: restore this once JB2 officially supports GtfTabixAdapter
298+
log.info("Unsupported track type: " + targetFile.getFile().getName());
299+
return null;
300+
//ret = getGxfTrack(log, targetFile, rg);
298301
}
299302
else if (TRACK_TYPES.bed.getFileType().isType(targetFile.getFile()))
300303
{
301304
ret = getBedTrack(log, targetFile, rg);
302305
}
303306
else
304307
{
305-
log.error("Unsupported track type: " + targetFile.getFile().getName());
308+
log.info("Unsupported track type: " + targetFile.getFile().getName());
306309
return null;
307310
}
308311

309312
ret = possiblyAddSearchConfig(ret, rg);
310313

311-
//TODO: validate/document additional properties. Note: unknown properties can break client-side parsing
314+
//TODO: validate/document additional properties.
312315
if (getTrackJson() != null)
313316
{
314-
//JSONObject json = getExtraTrackConfig();
315-
//ret.putAll(json);
317+
JSONObject json = getExtraTrackConfig();
318+
ret.putAll(json);
316319
}
317320

318321
return ret;

0 commit comments

Comments
 (0)