Skip to content

Commit 3726953

Browse files
committed
Bug fixes: datalink
- handle datalink for obscore tables that claim to be all images but are not - datalink text/plain files not processed correctly
1 parent f2fffb1 commit 3726953

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/firefly/js/metaConvert/vo/DataLinkProcessor.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,21 @@ export function processDatalinkTable({sourceTable, row, datalinkTable, activateP
5353
const preferCutout= getPreferCutout(options.dataProductsComponentKey,sourceTable?.tbl_id);
5454
const isRelatedImageGrid= options.hasRelatedBands && dataLinkData.filter( (dl) => dl.dlAnalysis.isImage && dl.dlAnalysis.isGrid).length>1;
5555
const isMultiTableSpectrum= dataLinkData.filter( (dl) => dl.dlAnalysis.isThis && dl.dlAnalysis.isGrid && dl.dlAnalysis.isSpectrum).length>1;
56+
const originalParsingAlgorithm= parsingAlgorithm;
5657
if (parsingAlgorithm===USE_ALL) {
5758
if (isMultiTableSpectrum) parsingAlgorithm= SPECTRUM;
5859
else if (obsCoreTableHasOnlyImages(sourceTable)) parsingAlgorithm= IMAGE;
5960
}
6061

61-
const menu= dataLinkData.length &&
62+
let menu= dataLinkData.length &&
6263
createDataLinkMenuRet({dlTableUrl,dataLinkData,sourceTable, sourceRow:row, activateParams, baseTitle,
6364
additionalServiceDescMenuList, doFileAnalysis, parsingAlgorithm, options, preferCutout});
6465

66+
if (!menu.length && dataLinkData.length && originalParsingAlgorithm===USE_ALL && parsingAlgorithm!==USE_ALL) {
67+
menu= createDataLinkMenuRet({dlTableUrl,dataLinkData,sourceTable, sourceRow:row, activateParams, baseTitle,
68+
additionalServiceDescMenuList, doFileAnalysis, USE_ALL, options, preferCutout});
69+
}
70+
6571
const canShow= menu.length>0 && menu.some( (m) => m.displayType!==DPtypes.DOWNLOAD && (!m.size || m.size<MAX_SIZE));
6672
const activeMenuLookupKey= dlTableUrl;
6773

@@ -431,7 +437,7 @@ export function hasError(dlData) {
431437
}
432438

433439

434-
const analysisTypes= ['fits', 'cube', 'table', 'spectrum', 'auxiliary'];
440+
const analysisTypes= ['fits', 'cube', 'table', 'spectrum', 'auxiliary', 'text'];
435441

436442

437443
function makeName(dlData, url, auxTot, autCnt, primeCnt=0, baseTitle) {

0 commit comments

Comments
 (0)