diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java index ee5e4fa1cf77e4e60ef755fc6d6b9404de1b5601..6aaebc74941aa1e153ed469c4e926b0a57664653 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/PlateImageReference.java @@ -83,11 +83,11 @@ public class PlateImageReference extends DatasetIdentifier implements Serializab return false; PlateImageReference other = (PlateImageReference) obj; - if (channel != other.channel) + if (channel.equals(other.channel) == false) return false; if (tile != other.tile) return false; - if (!wellPosition.equals(other.wellPosition)) + if (wellPosition.equals(other.wellPosition) == false) return false; return true; } diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/IImagingQueryDAO.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/IImagingQueryDAO.java index 8fed686e6bcc7f86dfbc790fb2e675bd059c2d0e..701c67e4647833430a3edf4e84d07c8a1c00a42f 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/IImagingQueryDAO.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/IImagingQueryDAO.java @@ -143,7 +143,7 @@ public interface IImagingQueryDAO extends TransactionQuery + "where ID = ?{1.id}") public void updateChannel(ImgChannelDTO channel); - @Select("select ID from CHANNELS where (DS_ID = ?{1} or EXP_ID = ?{2}) and NAME = ?{3}") + @Select("select ID from CHANNELS where (DS_ID = ?{1} or EXP_ID = ?{2}) and NAME = upper(?{3})") public Long tryGetChannelIdByChannelNameDatasetIdOrExperimentId(long id, long experimentId, String chosenChannel); diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImagingQueryDAOTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImagingQueryDAOTest.java index 7d3496c9c8f092e4b7c54d27944ef0da833fb66d..2bd4945d1a1b5eb96380d11614bac2bbfce42286 100644 --- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImagingQueryDAOTest.java +++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImagingQueryDAOTest.java @@ -138,8 +138,8 @@ public class ImagingQueryDAOTest extends AbstractDBTest assertEquals(2, dao.countChannelByDatasetIdOrExperimentId(datasetId, experimentId)); String[] channelNames = dao.getChannelNamesByDatasetIdOrExperimentId(datasetId, experimentId); - assertEquals("dsChannel", channelNames[0]); - assertEquals("expChannel", channelNames[1]); + assertEquals("DSCHANNEL", channelNames[0]); + assertEquals("EXPCHANNEL", channelNames[1]); // test getChannelIdsByDatasetIdOrExperimentId long[] channels = dao.getChannelIdsByDatasetIdOrExperimentId(datasetId, experimentId);