From 50275a1451ae7e4b8c3ed975a51ba0948fee523c Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 17 Jun 2014 08:14:09 +0000
Subject: [PATCH] SSDM-387: Improve metadata captured in archiving operation.
More readable layout for multiple containers.
SVN: 31722
---
.../dss/generic/server/MetaDataBuilder.java | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
index 53f7b2958f0..5623c9b7d53 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java
@@ -129,55 +129,55 @@ public class MetaDataBuilder
for(int i = 0; i < dataSet.getContainerDataSets().size(); i++) {
//Container
ContainerDataSet container = dataSet.getContainerDataSets().get(i);
- builder.container("[" + i + "].code", container.getCode());
- builder.container("[" + i + "].permId", container.getPermId());
- builder.container("[" + i + "].identifier", container.getIdentifier());
+ builder.container(i, "code", container.getCode());
+ builder.container(i, "permId", container.getPermId());
+ builder.container(i, "identifier", container.getIdentifier());
if(container.getDataSetType() != null) {
- builder.container("[" + i + "].type", container.getDataSetType().getCode());
+ builder.container(i, "type", container.getDataSetType().getCode());
}
if(container.getRegistrator() != null) {
- builder.container("[" + i + "].registrator", container.getRegistrator().getUserId());
+ builder.container(i, "registrator", container.getRegistrator().getUserId());
}
if(container.getRegistrationDate() != null) {
- builder.container("[" + i + "].registration_date", container.getRegistrationDate().toString());
+ builder.container(i, "registration_date", container.getRegistrationDate().toString());
}
if(container.getModificationDate() != null) {
- builder.container("[" + i + "].modification_date", container.getModificationDate().toString());
+ builder.container(i, "modification_date", container.getModificationDate().toString());
}
//Container Experiment
if(container.getExperiment() != null) {
- builder.container("[" + i + "].experiment_code", container.getExperiment().getCode());
- builder.container("[" + i + "].experiment_permId", container.getExperiment().getPermId());
- builder.container("[" + i + "].experiment_identifier", container.getExperiment().getIdentifier());
+ builder.container(i, "experiment_code", container.getExperiment().getCode());
+ builder.container(i, "experiment_permId", container.getExperiment().getPermId());
+ builder.container(i, "experiment_identifier", container.getExperiment().getIdentifier());
if(container.getExperiment().getExperimentType() != null) {
- builder.container("[" + i + "].experiment_type", container.getExperiment().getExperimentType().getCode());
+ builder.container(i, "experiment_type", container.getExperiment().getExperimentType().getCode());
}
if(container.getExperiment().getRegistrator() != null) {
- builder.container("[" + i + "].experiment_registrator", container.getExperiment().getRegistrator().getUserId());
+ builder.container(i, "experiment_registrator", container.getExperiment().getRegistrator().getUserId());
}
if(container.getExperiment().getRegistrationDate() != null) {
- builder.container("[" + i + "].experiment_registration_date", container.getExperiment().getRegistrationDate().toString());
+ builder.container(i, "experiment_registration_date", container.getExperiment().getRegistrationDate().toString());
}
if(container.getExperiment().getModificationDate() != null) {
- builder.container("[" + i + "].experiment_modification_date", container.getExperiment().getModificationDate().toString());
+ builder.container(i, "experiment_modification_date", container.getExperiment().getModificationDate().toString());
}
}
//Container Sample
if(container.getSample() != null) {
- builder.container("[" + i + "].sample_code", container.getSample().getCode());
- builder.container("[" + i + "].sample_permId", container.getSample().getPermId());
- builder.container("[" + i + "].sample_identifier", container.getSample().getIdentifier());
+ builder.container(i, "sample_code", container.getSample().getCode());
+ builder.container(i, "sample_permId", container.getSample().getPermId());
+ builder.container(i, "sample_identifier", container.getSample().getIdentifier());
if(container.getSample().getSampleType() != null) {
- builder.container("[" + i + "].sample_type", container.getSample().getSampleType().getCode());
+ builder.container(i, "sample_type", container.getSample().getSampleType().getCode());
}
if(container.getSample().getRegistrator() != null) {
- builder.container("[" + i + "].sample_registrator", container.getSample().getRegistrator().getUserId());
+ builder.container(i, "sample_registrator", container.getSample().getRegistrator().getUserId());
}
if(container.getSample().getRegistrationDate() != null) {
- builder.container("[" + i + "].sample_registration_date", container.getSample().getRegistrationDate().toString());
+ builder.container(i, "sample_registration_date", container.getSample().getRegistrationDate().toString());
}
if(container.getSample().getModificationDate() != null) {
- builder.container("[" + i + "].sample_modification_date", container.getSample().getModificationDate().toString());
+ builder.container(i, "sample_modification_date", container.getSample().getModificationDate().toString());
}
}
}
@@ -218,9 +218,9 @@ public class MetaDataBuilder
}
}
- private void container(String key, String value)
+ private void container(int number, String key, String value)
{
- addRow(CONTAINER, key, value);
+ addRow(CONTAINER + "[" + number + "]", key, value);
}
private void dataSet(String key, String value)
--
GitLab