Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vlkb-siav2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ViaLactea
vlkb-siav2
Commits
a54f190b
Commit
a54f190b
authored
1 year ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
output: separates one vlkb-extended ObsCore row creation from Dataset & Subsurvey
parent
3d15d844
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
data-discovery/src/main/java/vlkb/output/XmlSerializer.java
+56
-52
56 additions, 52 deletions
data-discovery/src/main/java/vlkb/output/XmlSerializer.java
with
56 additions
and
52 deletions
data-discovery/src/main/java/vlkb/output/XmlSerializer.java
+
56
−
52
View file @
a54f190b
...
@@ -119,17 +119,9 @@ public final class XmlSerializer
...
@@ -119,17 +119,9 @@ public final class XmlSerializer
new
ColumnInfo
(
"description"
,
String
.
class
,
"Descritpion"
)
new
ColumnInfo
(
"description"
,
String
.
class
,
"Descritpion"
)
};
};
private
static
StarTable
makeSearchResultsTable
(
Subsurvey
[]
ssurv
)
private
static
Object
[]
obscoreRow
(
Dataset
dataset
,
Subsurvey
subsurvey
)
{
RowListStarTable
astro
=
new
RowListStarTable
(
OBSCORE_COLINFO
);
for
(
Subsurvey
subsurvey
:
ssurv
)
{
for
(
Dataset
dataset
:
subsurvey
.
datasetArr
)
{
{
if
(
dataset
.
obsCore
==
null
)
continue
;
// skip mergeable datasets
return
new
Object
[]
astro
.
addRow
(
new
Object
[]
{
{
// ObsCore
// ObsCore
dataset
.
obsCore
.
dataproduct_type
,
//dataset.dataType,
dataset
.
obsCore
.
dataproduct_type
,
//dataset.dataType,
...
@@ -167,7 +159,6 @@ public final class XmlSerializer
...
@@ -167,7 +159,6 @@ public final class XmlSerializer
dataset
.
obsCore
.
facility_name
,
dataset
.
obsCore
.
facility_name
,
dataset
.
obsCore
.
instrument_name
,
dataset
.
obsCore
.
instrument_name
,
// VLKB extensions
// VLKB extensions
Integer
.
valueOf
(
dataset
.
overlapCode
),
Integer
.
valueOf
(
dataset
.
overlapCode
),
Integer
.
valueOf
(
dataset
.
overlapCodeSky
),
Integer
.
valueOf
(
dataset
.
overlapCodeSky
),
...
@@ -187,7 +178,20 @@ public final class XmlSerializer
...
@@ -187,7 +178,20 @@ public final class XmlSerializer
subsurvey
.
species
,
subsurvey
.
species
,
subsurvey
.
transition
,
subsurvey
.
transition
,
subsurvey
.
description
subsurvey
.
description
});
};
}
private
static
StarTable
makeSearchResultsTable
(
Subsurvey
[]
ssurv
)
{
RowListStarTable
astro
=
new
RowListStarTable
(
OBSCORE_COLINFO
);
for
(
Subsurvey
subsurvey
:
ssurv
)
{
for
(
Dataset
dataset
:
subsurvey
.
datasetArr
)
{
if
(
dataset
.
obsCore
==
null
)
continue
;
// skip mergeable datasets
astro
.
addRow
(
obscoreRow
(
dataset
,
subsurvey
)
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment