Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.google.common.collect.Maps
import groovy.transform.CompileStatic
import org.transmartproject.core.dataquery.DataRow
import org.transmartproject.core.dataquery.highdim.AssayColumn
import org.transmartproject.core.dataquery.highdim.BioMarkerDataRow

/**
* Exposes a {@link org.transmartproject.core.dataquery.DataRow} as a
Expand Down Expand Up @@ -39,7 +40,14 @@ class HighDimensionalDataRowMapAdapter extends ForwardingMap<String, Map<String,
if (value == null) {
return null
}
ImmutableMap.of(contextPrepend + row.label, value)
def bioMarker = (row as BioMarkerDataRow).bioMarker;
if (bioMarker != "" && bioMarker != "null") {
bioMarker = "_" + bioMarker
}
else {
bioMarker = "";
}
ImmutableMap.of(contextPrepend + row.label + bioMarker, value)
} as Function

// drop nulls
Expand Down