From 158ac00298b5f21a9eee69e96165137f01135139 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Mon, 8 Oct 2012 15:45:27 +0000
Subject: [PATCH] Minor simplification to DataSetLister.
SVN: 27090
---
.../bo/fetchoptions/datasetlister/DataSetDownloadRecord.java | 4 +---
.../business/bo/fetchoptions/datasetlister/DataSetLister.java | 4 ++--
.../bo/fetchoptions/datasetlister/IDataSetListingQuery.java | 4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java
index 2014d64712d..0531536a73d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java
@@ -23,9 +23,7 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo.fetchoptions.dataset
*/
class DataSetDownloadRecord
{
- String download_url;
-
- String remote_url;
+ String url;
String data_set_codes;
}
\ No newline at end of file
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java
index dcd4b4dc895..b28ba6d2040 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java
@@ -328,7 +328,7 @@ public class DataSetLister implements IDataSetLister
final String[] dataSetCodeArray =
StringUtils.split(r.data_set_codes.substring(1, r.data_set_codes.length() - 1),
',');
- result.add(new DataStoreURLForDataSets(r.download_url, dataSetCodeArray));
+ result.add(new DataStoreURLForDataSets(r.url, dataSetCodeArray));
}
return result;
}
@@ -345,7 +345,7 @@ public class DataSetLister implements IDataSetLister
final String[] dataSetCodeArray =
StringUtils.split(r.data_set_codes.substring(1, r.data_set_codes.length() - 1),
',');
- result.add(new DataStoreURLForDataSets(r.remote_url, dataSetCodeArray));
+ result.add(new DataStoreURLForDataSets(r.url, dataSetCodeArray));
}
return result;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java
index a83a31a6c2e..9c5c51b1eae 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java
@@ -69,13 +69,13 @@ public interface IDataSetListingQuery extends BaseQuery
{ StringArrayMapper.class })
public List<DataSetRelationRecord> getDataSetChildrenCodes(String[] dataSetCodes);
- @Select(sql = " select ds.download_url, array_agg(d.code::text) as data_set_codes"
+ @Select(sql = " select ds.download_url as url, array_agg(d.code::text) as data_set_codes"
+ " from data d left join data_stores ds on ds.id = d.dast_id"
+ " where d.code = any(?{1}) group by ds.download_url", parameterBindings =
{ StringArrayMapper.class })
public List<DataSetDownloadRecord> getDownloadURLs(String[] dataSetCodes);
- @Select(sql = " select ds.remote_url, array_agg(d.code::text) as data_set_codes"
+ @Select(sql = " select ds.remote_url as url, array_agg(d.code::text) as data_set_codes"
+ " from data d left join data_stores ds on ds.id = d.dast_id"
+ " where d.code = any(?{1}) group by ds.remote_url", parameterBindings =
{ StringArrayMapper.class })
--
GitLab