Changeset 7858

Timestamp:

Oct 20, 2020, 8:29:43 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2224: Files should be annotatable

Annotation importer should use PATH instead of NAME when referencing files.

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/AnnotationFlatFileImporter.java (modified) (2 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/AnnotationFlatFileImporter.java

@@ -79 +79 @@
 import net.sf.basedb.core.signal.ThreadSignalHandler;
 import net.sf.basedb.plugins.batchimport.AnnotationIdMethod;
+import net.sf.basedb.plugins.batchimport.FileImporter.PathIdMethod;
 import net.sf.basedb.plugins.batchimport.IdMethod;
 import net.sf.basedb.plugins.batchimport.InternalIdMethod;
@@ -1283 +1284 @@
   {
     List<IdMethod> methods = new ArrayList<>();
-    methods.add(PropertyIdMethod.NAME);
+    methods.add(item == Item.FILE ? PathIdMethod.ROOT : PropertyIdMethod.NAME);
     methods.add(InternalIdMethod.INTERNAL_ID);
     if (item == null || hasExternalId(item)) methods.add(PropertyIdMethod.EXTERNAL_ID);