SP-978 / BIS-559 : Use default project for experiment batch registration/update

SVN: 30036

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java

@@ -221,6 +221,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MetaprojectAssignmentsF
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MetaprojectCriteria;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAuthorizationGroup;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewBasicExperiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewColumnOrFilter;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewDataSet;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewETNewPTAssigments;
@@ -247,6 +248,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ScriptType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ScriptUpdateResult;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.UpdatedBasicExperiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.UpdatedDataSet;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.UpdatedSample;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Vocabulary;
@@ -3014,6 +3016,9 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
                             sb.insert(0, NewSample.WITH_EXPERIMENTS_COMMENT);
                         }
                         sb.insert(0, NewSample.SAMPLE_REGISTRATION_TEMPLATE_COMMENT);
+                    } else if (entityKind.equals(EntityKind.EXPERIMENT))
+                    {
+                        sb.insert(0, NewBasicExperiment.EXPERIMENT_REGISTRATION_TEMPLATE_COMMENT);
                     }
                     break;
                 case UPDATE:
@@ -3023,6 +3028,9 @@ public final class CommonServer extends AbstractCommonServer<ICommonServerForInt
                     } else if (entityKind.equals(EntityKind.DATA_SET))
                     {
                         sb.insert(0, UpdatedDataSet.DATASET_UPDATE_TEMPLATE_COMMENT);
+                    } else if (entityKind.equals(EntityKind.EXPERIMENT))
+                    {
+                        sb.insert(0, UpdatedBasicExperiment.EXPERIMENT_UPDATE_TEMPLATE_COMMENT);
                     } else
                     {
                         sb.insert(0, UPDATE_TEMPLATE_COMMENT);

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewBasicExperiment.java

@@ -25,6 +25,9 @@ public class NewBasicExperiment extends Identifier<NewBasicExperiment> implement
 {
     private static final long serialVersionUID = ServiceVersionHolder.VERSION;
 
+    public static final String EXPERIMENT_REGISTRATION_TEMPLATE_COMMENT =
+            "# Three short formats are accepted for identifiers, 'EXPERIMENT_CODE', '/EXPERIMENT_CODE', '/PROJECT_CODE/EXPERIMENT_CODE' when the full identifier is not given '/SPACE_CODE/PROJECT_CODE/EXPERIMENT_CODE' the default space and project are applied, if they are not configured an error will be thrown.\n";
+
     private IEntityProperty[] properties = IEntityProperty.EMPTY_ARRAY;
 
     public NewBasicExperiment()

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedBasicExperiment.java

@@ -25,9 +25,9 @@ public class UpdatedBasicExperiment extends NewBasicExperiment
 {
     public static final String EXPERIMENT_UPDATE_TEMPLATE_COMMENT =
             "# All columns except \"identifier\" can be removed from the file.\n"
+                    + "# Three short formats are accepted for identifiers, 'EXPERIMENT_CODE', '/EXPERIMENT_CODE', '/PROJECT_CODE/EXPERIMENT_CODE' when the full identifier is not given '/SPACE_CODE/PROJECT_CODE/EXPERIMENT_CODE' the default space and project are applied, if they are not configured an error will be thrown.\n"
                     + "# If a column is removed from the file or a cell in a column is left empty the corresponding values of updated expriments will be preserved.\n"
                     + "# To delete a value/connection from openBIS one needs to put \"--DELETE--\" or \"__DELETE__\" into the corresponding cell\n"
-                    + "# The \"identifier\" column should contain experiment identifiers, e.g. /SPACE/PROJECT/EXPERIMENT_1,\n"
                     + "# The \"project\" column (if not removed) should contain project identifiers, e.g. /SPACE/PROJECT\n";
 
     public static final String PROJECT = "project";