Skip to content

Commit 5279ffd

Browse files
committed
bug fix: obscore packager was adding an extra extension
- also- release notes update
1 parent b4983aa commit 5279ffd

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

docs/release-notes.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99

1010
## Version 2023.3
11-
- 2023.3.2 - (Feb 7, 2023), _docker tag_: `latest`, `2023.3`, `2023.3.2`
11+
- 2023.3.3 - (Feb 8, 2023), _docker tag_: `latest`, `2023.3`, `2023.3.3`
12+
- 2023.3.2 - (Feb 7, 2023), _docker tag_: `2023.3.2`
1213
- 2023.3.1 - (Dec 13, 2023), _docker tag_: `2023.3.1`
1314
- 2023.3.0 - (Dec 12, 2023), _docker tag_: `2023.3.0`
1415

@@ -38,12 +39,13 @@
3839
- Fixed: ADQL text-entry field swallowing "(Command)-(backquote)" on macOS: [Firefly-1072](https://github.com/Caltech-IPAC/firefly/pull/1436)
3940

4041
### _Patches 2023.3_
42+
- 2023.3.3
43+
- Bug fix: Obscore Packaging: a double extension was added
4144
- 2023.3.2
4245
- Obscore Packaging: Improved config with option for file names from server. [IRSA-5700](https://github.com/Caltech-IPAC/firefly/pull/1495)
4346
- FITS: more even zooming levels. [Firefly-1289](https://github.com/Caltech-IPAC/firefly/pull/1495)
4447
- TAP config: can specify a HiPS for a TAP server. [Firefly-1375](https://github.com/Caltech-IPAC/firefly/pull/1495)
4548
- API: added all export functions and constants from Table. [Firefly-1375](https://github.com/Caltech-IPAC/firefly/pull/1489)
46-
4749
- 2023.3.1
4850
- Fixed: TAP visual query builder ("`select_info` is undefined")
4951

@@ -74,7 +76,7 @@
7476

7577
#### Other changes
7678
- Read FITS tables directly with `nom.tam.fits` (removed star table): [Firefly-1232](https://github.com/Caltech-IPAC/firefly/pull/1390)
77-
- improved DCE: [Firefly-1286](https://github.com/Caltech-IPAC/firefly/pull/1408), [Firefly-1250](https://github.com/Caltech-IPAC/firefly/pull/1391)
79+
- Improved DCE: [Firefly-1286](https://github.com/Caltech-IPAC/firefly/pull/1408), [Firefly-1250](https://github.com/Caltech-IPAC/firefly/pull/1391)
7880
- Firefly now uses React 18: [Firefly-1127](https://github.com/Caltech-IPAC/firefly/pull/1396)
7981
- Firefly now uses Mavin central: [Firefly-1258](https://github.com/Caltech-IPAC/firefly/pull/1397)
8082

src/firefly/java/edu/caltech/ipac/firefly/server/query/ObsCorePackager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private List<FileGroup> computeFileGroup(DownloadRequest request) throws DataAcc
7676
fileInfos.addAll(tmpFileInfos);
7777
}
7878
else { //non datalink entry - such as fits,jpg etc.
79-
if (!useSourceUrlFileName || !FileUtil.getExtension(ext_file_name).isEmpty()) {
79+
if (!useSourceUrlFileName || FileUtil.getExtension(ext_file_name).isEmpty()) {
8080
extension = access_format.replaceAll(".*/", "");
8181
ext_file_name += "." + extension;
8282
}
@@ -85,7 +85,7 @@ private List<FileGroup> computeFileGroup(DownloadRequest request) throws DataAcc
8585
}
8686
}
8787
else { //access_format is null, so try and get it from the url's Content_Type
88-
if (!useSourceUrlFileName || !FileUtil.getExtension(ext_file_name).isEmpty()) {
88+
if (!useSourceUrlFileName || FileUtil.getExtension(ext_file_name).isEmpty()) {
8989
extension = getExtFromURL(contentType);
9090
ext_file_name += "." + extension;
9191
}

0 commit comments

Comments
 (0)