diff --git a/Model/lib/wdk/model/records/datasetRecords.xml b/Model/lib/wdk/model/records/datasetRecords.xml
index 56c1a198..a48f677c 100644
--- a/Model/lib/wdk/model/records/datasetRecords.xml
+++ b/Model/lib/wdk/model/records/datasetRecords.xml
@@ -179,6 +179,11 @@
-->
+
+
+
+
+
@@ -285,7 +290,7 @@ while in protected and private studies there will be human intervention in the d
-
+
@@ -429,7 +434,22 @@ OR if the linkName and or URL require access to other attributes....also how to
+
+
+
+
@@ -1082,6 +1102,19 @@ Based on evolutionarily informed expectations of gene content of near-universal
+
+
+
+
+
+
+
+
@@ -1335,8 +1368,6 @@ where mystudies.dataset_id = dp.dataset_presenter_id
-
-
@@ -1633,7 +1664,7 @@ where mystudies.dataset_id = dp.dataset_presenter_id
where dsp.dataset_presenter_id = dp.dataset_presenter_id(+)
UNION
select CONCAT('EDAUD_', d.user_dataset_id) as dataset_id,
- case when is_public = 1 then 'yes' else 'no' end as is_public
+ case when accessibility != 'private' then 'yes' else 'no' end as is_public
from @VDI_CONTROL_SCHEMA@.availableuserdatasets d
]]>
@@ -1940,7 +1971,7 @@ select dsp.dataset_presenter_id as dataset_id,
@@ -1949,12 +1980,12 @@ select dsp.dataset_presenter_id as dataset_id,
@@ -2012,20 +2043,14 @@ select dsp.dataset_presenter_id as dataset_id,
where dsp.dataset_presenter_id = dsc.dataset_presenter_id (+)
and dsc.is_primary_contact = 1
UNION
--- SELECT CONCAT('EDAUD_', d.user_dataset_id) as dataset_id
--- , dc.name as contact
--- , affiliation as institution
--- , email
--- , short_attribution
--- from @VDI_CONTROL_SCHEMA@.availableuserdatasets d, @VDI_CONTROL_SCHEMA@.dataset_contact dc
--- where dc.is_primary = 1
--- and dc.dataset_id = d.user_dataset_id
SELECT CONCAT('EDAUD_', d.user_dataset_id) as dataset_id
- , null as contact
- , null as institution
- , null as email
- , null as short_attribution
- from @VDI_CONTROL_SCHEMA@.availableuserdatasets d
+ , dc.name as contact
+ , affiliation as institution
+ , email
+ , short_attribution
+ from @VDI_CONTROL_SCHEMA@.availableuserdatasets d, @VDI_CONTROL_SCHEMA@.dataset_contact dc
+ where dc.is_primary = 1
+ and dc.dataset_id = d.user_dataset_id
]]>
@@ -2061,20 +2086,14 @@ select dsp.dataset_presenter_id as dataset_id,
where dsp.dataset_presenter_id = dsc.dataset_presenter_id (+)
and dsc.is_primary_contact = 1
UNION
--- SELECT CONCAT('EDAUD_', d.user_dataset_id) as dataset_id
--- , dc.name as contact
--- , affiliation as institution
--- , email
--- , short_attribution
--- from @VDI_CONTROL_SCHEMA@.availableuserdatasets d, @VDI_CONTROL_SCHEMA@.dataset_contact dc
--- where dc.is_primary = 1
--- and dc.dataset_id = d.user_dataset_id
SELECT CONCAT('EDAUD_', d.user_dataset_id) as dataset_id
- , null as contact
- , null as institution
- , null as email
- , null as short_attribution
- from @VDI_CONTROL_SCHEMA@.availableuserdatasets d
+ , dc.name as contact
+ , affiliation as institution
+ , email
+ , short_attribution
+ from @VDI_CONTROL_SCHEMA@.availableuserdatasets d, @VDI_CONTROL_SCHEMA@.dataset_contact dc
+ where dc.is_primary = 1
+ and dc.dataset_id = d.user_dataset_id
]]>
@@ -2170,8 +2189,25 @@ from apidbtuning.datasetnametaxon dsnt
)
group by dataset_id
UNION
- select CONCAT('EDAUD_', d.user_dataset_id) as dataset_id, null as organism_prefix
- from @VDI_CONTROL_SCHEMA@.availableuserdatasets d
+SELECT dataset_id,
+ REGEXP_REPLACE(
+ SUBSTR(
+ LISTAGG(org, '
') WITHIN GROUP (ORDER BY org), 1, 4000
+ ),
+ '
[A-Za-z\. <>&]+$', '
...'
+ ) AS organism_prefix
+FROM (
+ SELECT DISTINCT 'EDAUD_' || aud.user_dataset_id AS dataset_id,
+ CASE
+ WHEN oa.organism_name IS NULL THEN NULL
+ ELSE REGEXP_REPLACE(oa.organism_name, '^(\w*)\s(\w*)\s(\.*)', '\1 \2') || ''
+ END AS org
+ FROM @VDI_CONTROL_SCHEMA@.availableuserdatasets aud
+ LEFT JOIN @VDI_CONTROL_SCHEMA@.dataset_organism dd ON aud.user_dataset_id = dd.dataset_id
+ LEFT JOIN apidbtuning.organismattributes oa ON dd.organism_abbrev = oa.internal_abbrev
+ ) t
+GROUP BY dataset_id;
+
]]>
@@ -2246,6 +2282,29 @@ from apidbtuning.datasetnametaxon dsnt
+
+
+
+
+
+
+
+
+
+
+
+