Changeset 7617

Timestamp:

Mar 4, 2019, 7:45:29 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

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

The batch importers now only select annotation types with the 'identifier' flag set.

Location:

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport

Files:

• AbstractItemImporter.java (modified) (1 diff)
• AnnotationIdMethod.java (modified) (3 diffs)

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

@@ -998 +998 @@
      * The value type must be one of STRING, INT or LONG
      * It must not be an enumeration
+     * The 'identifier' flag must be set
     
     @since 3.15

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

@@ -59 +59 @@
      * The value type must be one of STRING, INT or LONG
      * It must not be an enumeration
+     * The 'identifier' flag must be set
     @param itemType Either a specified item or null to return all possible annotation id methods
   */
@@ -64 +65 @@
   {
     ItemQuery<AnnotationType> query = AnnotationType.getQuery(itemType);
-    query.include(Include.MINE, Include.IN_PROJECT, Include.SHARED);
+    query.include(Include.MINE, Include.IN_PROJECT, Include.SHARED, Include.OTHERS);
     // The annotation type must be STRING, INTEGER or LONG
     query.restrict(Restrictions.in(Hql.property("valueType"), Expressions.parameter("valueTypes", Type.INT)));
@@ -70 +71 @@
     // Enumerations can't be used
     query.restrict(Restrictions.eq(Hql.property("enumeration"), Expressions.bool(false)));
-    
+    // The 'identifier' flag must be set
+    query.restrict(Restrictions.eq(Hql.property("identifier"), Expressions.bool(true)));
     query.order(Orders.asc(Hql.property("name")));
     // Get a list of possible annotation types