Fix detached label support for kaguyasp2ascii #5607
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Recently detached label for kaguyasp2ascii was supported by #5568, however, kaguyasp2ascii recognizes detached label as attached label. This PR will fix the support to detached label.
Description
Whether input file is attached label or detached label can be discriminate input filename given to kaguyasp2ascii and value of FILE_NAME in the label. If value of FILE_NAME is same as the input filename which can be derived by the input file path, the input file is attached label.
Current code compares
baseName()
s of input file and value of FILE_NAME which doesn't include extensions of the filenames although it should include the extensions.As already written as the comment in the code, value of FILE_NAME usually doesn't have path information, so one needs to calculate path of data file for detached label case. Current code doesn't calculate path of data file for detached label case, so assuming data file is placed at the same directory with the label, data file path is derived from the label file path.
Without the fix in this PR, detached label will output an error as follows:
Related Issue
#5568
How Has This Been Validated?
Tested for detached label at the same directory with the current directory.
kaguyasp2ascii from=SP_2C_03_00295_N148_E2403.lbl to=SP_2C_03_00295_N148_E2403.txt
Tested for detached label at outside of the current directory.
kaguyasp2ascii from=kaguya/SP_2C_03_00295_N148_E2403.lbl to=SP_2C_03_00295_N148_E2403.txt
Tested for attached label at the same directory with the current directory.
kaguyasp2ascii from=SP_2C_02_02509_S336_E1946.spc to=SP_2C_02_02509_S336_E1946.txt
Tested for attached label at outside of the current directory.
kaguyasp2ascii from=isistestdata/isis/src/kaguya/apps/kaguyasp2ascii/tsts/jan2015Format/input/SP_2C_02_02509_S336_E1946.spc to=SP_2C_02_02509_S336_E1946.txt
Note that SP_2C_03_00295_N148_E2403.lbl and SP_2C_03_00295_N148_E2403.spc are available at
https://data.darts.isas.jaxa.jp/pub/pds3/sln-l-sp-4-level2c-v3.0/20071102/data/SP_2C_03_00295_N148_E2403.lbl
and https://data.darts.isas.jaxa.jp/pub/pds3/sln-l-sp-4-level2c-v3.0/20071102/data/SP_2C_03_00295_N148_E2403.spc, respectively.
Types of changes
Checklist:
Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words: