Skip to content

Commit 901660a

Browse files
committed
Wrap reading of annotation names in exception handling
1 parent 8842988 commit 901660a

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

src/main/java/io/AnnDataIO.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,22 @@ protected <T extends NativeType<T> & RealType<T>> void readAndSetTransformation(
141141

142142
@Override
143143
protected List<String> detectAnnotations(N5Reader reader, String annotationPath) {
144-
return new ArrayList<>(AnnDataUtils.getDataFrameDatasetNames(reader, annotationPath));
144+
return readColumnOrder(reader, annotationPath);
145145
}
146146

147147
@Override
148148
protected List<String> detectGeneAnnotations(N5Reader reader, String geneAnnotationPath) {
149-
return new ArrayList<>(AnnDataUtils.getDataFrameDatasetNames(reader, geneAnnotationPath));
149+
return readColumnOrder(reader, geneAnnotationPath);
150+
}
151+
152+
private static List<String> readColumnOrder(N5Reader reader, String annotationPath) {
153+
List<String> annotations = new ArrayList<>();
154+
try {
155+
annotations = new ArrayList<>(AnnDataUtils.getDataFrameDatasetNames(reader, annotationPath));
156+
} catch (Exception e) {
157+
logger.warn("Could not read column names from {}", annotationPath);
158+
}
159+
return annotations;
150160
}
151161

152162
protected <T extends NativeType<T> & RealType<T>> RandomAccessibleInterval<T> readAnnotations(N5Reader reader, String annotationPath, String label) {

0 commit comments

Comments
 (0)