Skip to content

isisimport case-insensitive data file check #6024

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.

Sign up for GitHub

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

Open
jrcain-usgs wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

isisimport case-insensitive data file check #6024

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e2361b
isisimport case-insensitive data file check
jrcain-usgs Apr 23, 2026
1e94b27
re-added tif check, functionized code
jrcain-usgs Apr 24, 2026
08a7b67
rm extra methods
jrcain-usgs Apr 24, 2026
3cee1f5
move include back to cpp
jrcain-usgs Apr 24, 2026
70cc1a2
rm extra setExtension
jrcain-usgs Apr 24, 2026
451583a
rm extra file found check bool
jrcain-usgs Apr 24, 2026
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
1 change: 1 addition & 0 deletions changes/5971.fix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed case-sensitivity in isisimport on linux, now can succeed whether data file is upper or lowercase.
38 changes: 23 additions & 15 deletions isis/src/base/apps/isisimport/isisimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,22 +347,30 @@ namespace Isis {


ProcessImport importer;
if (inputFileName.removeExtension().addExtension("dat").fileExists()){
importer.SetInputFile(inputFileName.removeExtension().addExtension("dat").expanded());
}
else if (inputFileName.removeExtension().addExtension("img").fileExists()) {
importer.SetInputFile(inputFileName.removeExtension().addExtension("img").expanded());
}
else if (inputFileName.removeExtension().addExtension("QUB").fileExists()) {
importer.SetInputFile(inputFileName.removeExtension().addExtension("QUB").expanded());
}
else if (inputFileName.removeExtension().addExtension("tif").fileExists()) {
QString msg = "GeoTIFFs may contain ancillary data that isisimport cannot process. "
"Please convert the .TIF to a cube using another tool, such as gdal_translate.";
throw IException(IException::User, msg, _FILEINFO_);
Comment thread
jrcain-usgs marked this conversation as resolved.
importer.SetInputFile(inputFileName.expanded());

// Check for files that match the from= file, except with these file extensions.
// If found, replace the data filename to import. Check upper and lower cases for linux compatibility.
QString fileExtensions[] = {"dat", "img", "qub"};
bool foundDataFile = false;

for (const QString& ext : fileExtensions) {
if(inputFileName.setExtension(ext).fileExists()){
importer.SetInputFile(inputFileName.expanded());
break;
}
else if(inputFileName.setExtension(ext.toUpper()).fileExists()){
importer.SetInputFile(inputFileName.expanded());
break;
}
}
else {
importer.SetInputFile(inputFileName.expanded());

if (!foundDataFile) {
if (inputFileName.setExtension("tif").fileExists() || inputFileName.setExtension("TIF").fileExists()) {
QString msg = "GeoTIFFs may contain ancillary data that isisimport cannot process. "
"Please convert the .TIF to a cube using another tool, such as gdal_translate.";
throw IException(IException::User, msg, _FILEINFO_);
}
Comment thread
jrcain-usgs marked this conversation as resolved.
Outdated
}

// Use inja to get number of lines, samples, and bands from the input label
Expand Down
Loading