Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix detached label support for kaguyasp2ascii #5607

Merged
merged 3 commits into from
Aug 30, 2024

Conversation

murashinln
Copy link
Contributor

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:

$ kaguyasp2ascii from=SP_2C_03_00295_N148_E2403.lbl to=SP_2C_02_02509_S336_E1946.txt
ERROR Failed to convert string [SP_2C_03_00295_N148_E2403.spc] to an integer.

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

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Infrastructure change (changes to things like CI or the build system that do not impact users)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • I have added myself to the .zenodo.json document.
  • I have added my user impacting change to the CHANGELOG.md document.

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:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

- Fixed condition to check whether input file is attached label or detached label.
- Fixed input file specification outside current directory for detached label case
Copy link

The build and test suite have started for your pull request.

To view your build log, please reference the build with source version: "PR_5607".

Additionally, check the latest "dev" source version to identify existing test failures. Please note that you are not responsible for the test failures that exist on both your PR and the dev branch.

@AustinSanders AustinSanders merged commit 3ecfce3 into DOI-USGS:dev Aug 30, 2024
2 checks passed
@github-actions github-actions bot added the bug Something isn't working label Aug 30, 2024
acpaquette pushed a commit to acpaquette/ISIS3 that referenced this pull request Sep 11, 2024
* Fixed kaguyasp2ascii with detached label data input

- Fixed condition to check whether input file is attached label or detached label.
- Fixed input file specification outside current directory for detached label case

* Updated changelog

* Updated creaters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants