Skip to content
Snippets Groups Projects
Commit a54f190b authored by Robert Butora's avatar Robert Butora
Browse files

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
...@@ -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) );
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment