From ac02e59fd7889c4fa82e657d3bb0e890905c2b35 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Fri, 18 Oct 2024 15:27:40 +0300
Subject: [PATCH] adds column cross-reference for service descriptor
---
.../main/java/webapi/formatfilter/ObscoreExt.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java b/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java
index f9be0fb..fea9845 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java
@@ -1,17 +1,27 @@
import uk.ac.starlink.table.*;// ColumnInfo needed
+import uk.ac.starlink.votable.*;
class ObscoreExt
{
+ static private ColumnInfo genPubDidColInfo()
+ {
+ ColumnInfo colInfo = new ColumnInfo( "obs_publisher_did", String.class, "Publisher Did" );
+ colInfo.setAuxDatum(new DescribedValue(VOStarTable.ID_INFO, "primaryID"));
+ return colInfo;
+ }
+
+
public static final ColumnInfo[] OBSCORE_COLINFO =
{
+
new ColumnInfo( "dataproduct_type", String.class, "Dataproduct Type (image|cube)" ),
new ColumnInfo( "calib_level", Integer.class, "Calibration level" ),
new ColumnInfo( "obs_collection", String.class, "Collection" ),
new ColumnInfo( "obs_title", String.class, "Title" ),
new ColumnInfo( "obs_id", String.class, "Observation Id" ),
- new ColumnInfo( "obs_publisher_did", String.class, "Publisher Did" ),
+ genPubDidColInfo(),
new ColumnInfo( "bib_reference", String.class, "Bibbliographic refererence" ),
new ColumnInfo( "data_rights", String.class, "Data rights" ),
--
GitLab