Skip to content

Commit dd0bf99

Browse files
acpaquetteamystamile-usgs
acpaquette
and
amystamile-usgs
authored
Testing Valueless PVL Keyword Issues (#5573)
* update Auto in .trn files * update Optional in .trn files * updated mission specific .trn files with Auto * updated Debug in .trn files * Account for valueless PVL keywords that are not reserved keywords * Added dummy values for MappingGroupKeywords.pft * Update all files that are weren't PVL compliant * Fixed missing 'Debug' flag * Missed a couple of test updates * Addressed PR feeback * Reverted if logic since keywordNameUpper is also const * Added break when searching for reserved keyword * reverted gtest * Added changelog entries for PVL updates --------- Co-authored-by: Amy Stamile <[email protected]>
1 parent 14c8162 commit dd0bf99

File tree

311 files changed

+5665
-5656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

311 files changed

+5665
-5656
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ release.
4444
### Changed
4545
- Refactored the pixel2map app
4646
- Updated pixel2map documentation
47+
- Changed PVL parsing to no longer allow valueless keywords [#5573](https://github.com/DOI-USGS/ISIS3/pull/5573)
48+
- Changed all `.trn` files with an `Auto`, `Debug` or `Optional` keyword with no value to have a value of `1` [#5573](https://github.com/DOI-USGS/ISIS3/pull/5573)
4749

4850
### Fixed
4951
- Fixed noseam bug where a debugging output statement was inadvertently left in noseam.cpp.

‎isis/appdata/serialnumbers/Apollo15MetricSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Group = Keyword1
2-
Auto
2+
Auto = 1
33
InputKey = SpacecraftName
44
InputGroup = "IsisCube,Instrument"
55
InputPosition = (IsisCube, Instrument)
@@ -9,7 +9,7 @@ Group = Keyword1
99
End_Group
1010

1111
Group = Keyword2
12-
Auto
12+
Auto = 1
1313
InputKey = InstrumentId
1414
InputGroup = "IsisCube,Instrument"
1515
InputPosition = (IsisCube, Instrument)
@@ -19,7 +19,7 @@ Group = Keyword2
1919
End_Group
2020

2121
Group = Keyword3
22-
Auto
22+
Auto = 1
2323
InputKey = StartTime
2424
InputGroup = "IsisCube,Instrument"
2525
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/Apollo15PanoramicSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ObservationKeys = 3
22

33
Group = Keyword1
4-
Auto
4+
Auto = 1
55
InputKey = SpacecraftName
66
InputGroup = "IsisCube,Instrument"
77
InputPosition = (IsisCube, Instrument)
@@ -11,7 +11,7 @@ Group = Keyword1
1111
End_Group
1212

1313
Group = Keyword2
14-
Auto
14+
Auto = 1
1515
InputKey = InstrumentId
1616
InputGroup = "IsisCube,Instrument"
1717
InputPosition = (IsisCube, Instrument)
@@ -21,7 +21,7 @@ Group = Keyword2
2121
End_Group
2222

2323
Group = Keyword3
24-
Auto
24+
Auto = 1
2525
InputKey = StartTime
2626
InputGroup = "IsisCube,Instrument"
2727
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/Apollo15SerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Group = Keyword1
2-
Auto
2+
Auto = 1
33
InputKey = SpacecraftName
44
InputGroup = "IsisCube,Instrument"
55
InputPosition = (IsisCube, Instrument)
@@ -9,7 +9,7 @@ Group = Keyword1
99
End_Group
1010

1111
Group = Keyword2
12-
Auto
12+
Auto = 1
1313
InputKey = InstrumentId
1414
InputGroup = "IsisCube,Instrument"
1515
InputPosition = (IsisCube, Instrument)
@@ -19,7 +19,7 @@ Group = Keyword2
1919
End_Group
2020

2121
Group = Keyword3
22-
Auto
22+
Auto = 1
2323
InputKey = SpacecraftClockCount
2424
InputGroup = "IsisCube,Instrument"
2525
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/Apollo16MetricSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Group = Keyword1
2-
Auto
2+
Auto = 1
33
InputKey = SpacecraftName
44
InputGroup = "IsisCube,Instrument"
55
InputPosition = (IsisCube, Instrument)
@@ -9,7 +9,7 @@ Group = Keyword1
99
End_Group
1010

1111
Group = Keyword2
12-
Auto
12+
Auto = 1
1313
InputKey = InstrumentId
1414
InputGroup = "IsisCube,Instrument"
1515
InputPosition = (IsisCube, Instrument)
@@ -19,7 +19,7 @@ Group = Keyword2
1919
End_Group
2020

2121
Group = Keyword3
22-
Auto
22+
Auto = 1
2323
InputKey = StartTime
2424
InputGroup = "IsisCube,Instrument"
2525
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/Apollo16PanoramicSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ObservationKeys = 3
22

33
Group = Keyword1
4-
Auto
4+
Auto = 1
55
InputKey = SpacecraftName
66
InputGroup = "IsisCube,Instrument"
77
InputPosition = (IsisCube, Instrument)
@@ -11,7 +11,7 @@ Group = Keyword1
1111
End_Group
1212

1313
Group = Keyword2
14-
Auto
14+
Auto = 1
1515
InputKey = InstrumentId
1616
InputGroup = "IsisCube,Instrument"
1717
InputPosition = (IsisCube, Instrument)
@@ -21,7 +21,7 @@ Group = Keyword2
2121
End_Group
2222

2323
Group = Keyword3
24-
Auto
24+
Auto = 1
2525
InputKey = StartTime
2626
InputGroup = "IsisCube,Instrument"
2727
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/Apollo17MetricSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Group = Keyword1
2-
Auto
2+
Auto = 1
33
InputKey = SpacecraftName
44
InputGroup = "IsisCube,Instrument"
55
InputPosition = (IsisCube, Instrument)
@@ -9,7 +9,7 @@ Group = Keyword1
99
End_Group
1010

1111
Group = Keyword2
12-
Auto
12+
Auto = 1
1313
InputKey = InstrumentId
1414
InputGroup = "IsisCube,Instrument"
1515
InputPosition = (IsisCube, Instrument)
@@ -19,7 +19,7 @@ Group = Keyword2
1919
End_Group
2020

2121
Group = Keyword3
22-
Auto
22+
Auto = 1
2323
InputKey = StartTime
2424
InputGroup = "IsisCube,Instrument"
2525
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/Apollo17PanoramicSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ObservationKeys = 3
22

33
Group = Keyword1
4-
Auto
4+
Auto = 1
55
InputKey = SpacecraftName
66
InputGroup = "IsisCube,Instrument"
77
InputPosition = (IsisCube, Instrument)
@@ -11,7 +11,7 @@ Group = Keyword1
1111
End_Group
1212

1313
Group = Keyword2
14-
Auto
14+
Auto = 1
1515
InputKey = InstrumentId
1616
InputGroup = "IsisCube,Instrument"
1717
InputPosition = (IsisCube, Instrument)
@@ -21,7 +21,7 @@ Group = Keyword2
2121
End_Group
2222

2323
Group = Keyword3
24-
Auto
24+
Auto = 1
2525
InputKey = StartTime
2626
InputGroup = "IsisCube,Instrument"
2727
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/CassiniIssSerialNumber.trn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Group = Keyword1
2-
Auto
2+
Auto = 1
33
InputKey = SpacecraftName
44
InputGroup = "IsisCube,Instrument"
55
InputPosition = (IsisCube, Instrument)
@@ -10,7 +10,7 @@ Group = Keyword1
1010
End_Group
1111

1212
Group = Keyword2
13-
Auto
13+
Auto = 1
1414
InputKey = InstrumentId
1515
InputGroup = "IsisCube,Instrument"
1616
InputPosition = (IsisCube, Instrument)
@@ -20,7 +20,7 @@ Group = Keyword2
2020
End_Group
2121

2222
Group = Keyword3
23-
Auto
23+
Auto = 1
2424
InputKey = SpacecraftClockCount
2525
InputGroup = "IsisCube,Instrument"
2626
InputPosition = (IsisCube, Instrument)

‎isis/appdata/serialnumbers/CassiniVimsSerialNumber.trn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Group = Keyword1
2-
Auto
2+
Auto = 1
33
InputKey = SpacecraftName
44
InputGroup = "IsisCube,Instrument"
55
InputPosition = (IsisCube, Instrument)
@@ -10,7 +10,7 @@ Group = Keyword1
1010
End_Group
1111

1212
Group = Keyword2
13-
Auto
13+
Auto = 1
1414
InputKey = InstrumentId
1515
InputGroup = "IsisCube,Instrument"
1616
InputPosition = (IsisCube, Instrument)
@@ -20,7 +20,7 @@ Group = Keyword2
2020
End_Group
2121

2222
Group = Keyword3
23-
Auto
23+
Auto = 1
2424
InputKey = Channel
2525
InputGroup = "IsisCube,Instrument"
2626
InputPosition = (IsisCube, Instrument)
@@ -30,7 +30,7 @@ Group = Keyword3
3030
End_Group
3131

3232
Group = Keyword4
33-
Auto
33+
Auto = 1
3434
InputKey = SpacecraftClockStartCount
3535
InputGroup = "IsisCube,Instrument"
3636
InputPosition = (IsisCube, Instrument)

0 commit comments

Comments
 (0)