Changeset 7618

Timestamp:

Mar 4, 2019, 7:46:01 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2149: Batch item importers should be able to use an annotation for item identification

Added column mapping for the "Is identifier" flag to the annotation type importer.

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AnnotationTypeImporter.java (modified) (5 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AnnotationTypeImporter.java

@@ -114 +114 @@
 
   /**
+    Column mapping parameter for "Is identifier" flag.
+  */
+  private static final PluginParameter<String> isIdentifierColumnMapping = 
+    new PluginParameter<String>(
+      "isIdentifierColumnMapping",
+      "Is identifier",
+      "Mapping that picks the 'Is identifier' flag from the data columns. " +
+      "Example: \\Is identifier\\",
+      optionalColumnMapping
+    );
+
+  /**
     Column mapping parameter for "Required for MIAME" flag.
   */
@@ -314 +326 @@
   private Mapper multiplicityMapper;
   private Mapper defaultValueMapper;
+  private Mapper isIdentifierMapper;
   private Mapper miameMapper;
   private Mapper protocolParameterMapper;
@@ -366 +379 @@
     parameters.add(multiplicityColumnMapping);
     parameters.add(defaultValueColumnMapping);
+    parameters.add(isIdentifierColumnMapping);
     parameters.add(miameColumnMapping);
     parameters.add(protocolParameterColumnMapping);
@@ -405 +419 @@
     defaultValueMapper = getMapper(ffp, (String)job.getValue("defaultValueColumnMapping"), 
         cropStrings ? AnnotationType.MAX_DEFAULT_VALUE_LENGTH : null, null);
+    isIdentifierMapper = getMapper(ffp, (String)job.getValue("isIdentifierColumnMapping"), null, null);
     miameMapper = getMapper(ffp, (String)job.getValue("miameColumnMapping"), null, null);
     protocolParameterMapper = getMapper(ffp, (String)job.getValue("protocolParameterColumnMapping"), null, null);
@@ -444 +459 @@
     if (multiplicityMapper != null) at.setMultiplicity(multiplicityMapper.getInt(data));
     if (defaultValueMapper != null) at.setDefaultValue(defaultValueMapper.getValue(data));
+    if (isIdentifierMapper != null) at.setIdentifier(Values.getBoolean(isIdentifierMapper.getValue(data)));
     if (miameMapper != null) at.setRequiredForMiame(Values.getBoolean(miameMapper.getValue(data)));
     if (protocolParameterMapper != null) at.setProtocolParameter(Values.getBoolean(protocolParameterMapper.getValue(data)));