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.

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

issue 129: add .lblx #137

Merged
merged 1 commit into from
Oct 24, 2023
Merged

issue 129: add .lblx #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/gov/nasa/pds/harvest/crawler/BundleProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private static class BundleMatcher implements BiPredicate<Path, BasicFileAttribu
public boolean test(Path path, BasicFileAttributes attrs)
{
String fileName = path.getFileName().toString().toLowerCase();
return (fileName.endsWith(".xml") && fileName.contains("bundle"));
return ((fileName.endsWith(".xml") || fileName.endsWith(".lbxl"))&& fileName.contains("bundle"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@al-niessner sorry for the confusion. This is incorrect. This should be .lblx not .lblxl

}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gov/nasa/pds/harvest/crawler/CollectionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static class CollectionMatcher implements BiPredicate<Path, BasicFileAtt
public boolean test(Path path, BasicFileAttributes attrs)
{
String fileName = path.getFileName().toString().toLowerCase();
return (fileName.endsWith(".xml") && fileName.contains("collection"));
return ((fileName.endsWith(".xml") || fileName.endsWith(".lbxl")) && fileName.contains("collection"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gov/nasa/pds/harvest/crawler/FilesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private static class FileMatcher implements BiPredicate<Path, BasicFileAttribute
public boolean test(Path path, BasicFileAttributes attrs)
{
String fileName = path.getFileName().toString().toLowerCase();
return (fileName.endsWith(".xml"));
return (fileName.endsWith(".xml") || fileName.endsWith(".lblx"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gov/nasa/pds/harvest/crawler/ProductProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public FileMatcher(BundleCfg bCfg)
public boolean test(Path path, BasicFileAttributes attrs)
{
String fileName = path.getFileName().toString().toLowerCase();
if(!fileName.endsWith(".xml")) return false;
if(!(fileName.endsWith(".xml") || fileName.endsWith(".lblx"))) return false;

if(includeDirs == null) return true;
String fileDir = path.getParent().toUri().toString().toLowerCase();
Expand Down