Changeset 7619

Timestamp:

Mar 4, 2019, 9:29:50 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2150: Batch item importers in item list members view

The "Internal ID" method need to use a query for finding items otherwise it will not work as expected in "Item list" mode.

File:

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

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

@@ -22 +22 @@
 package net.sf.basedb.plugins.batchimport;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import net.sf.basedb.core.BasicItem;
 import net.sf.basedb.core.DbControl;
-import net.sf.basedb.core.ItemNotFoundException;
 import net.sf.basedb.core.ItemQuery;
+import net.sf.basedb.core.Type;
+import net.sf.basedb.core.query.Expressions;
+import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.util.Values;
 
@@ -90 +92 @@
   
   /**
-    Return the original query, unmodified.
+    Adds a restriction to the query:
+    <code>id = :identifier</code>
   */
   @Override
   public <I extends BasicItem> ItemQuery<I> prepareQuery(DbControl dc, ItemQuery<I> query)
   {
+    query.restrictPermanent(
+      Restrictions.eq(
+        Hql.property("id"),
+        Expressions.parameter("identifier")
+      )
+    );
     return query;
   }
 
   /**
-    Use <code>getById</code> method to find an item. The query is not
-    used except to find the type of item to load.
+    Find the item with <code>id = identifier</code>
   */
   @Override
   public <I extends BasicItem> List<I> find(DbControl dc, ItemQuery<I> query, String identifier)
   {
-    List<I> items = new ArrayList<I>(1);
     int id = Values.getInt(identifier);
-    if (id != 0)
-    {
-      try
-      {
-        I item = query.getItemType().getById(dc, id);
-        items.add(item);
-      }
-      catch (ItemNotFoundException ex)
-      {}
-    }
-    return items;
+    query.setParameter("identifier", id, Type.INT);
+    return query.list(dc);
   }
   // ---------------------------