LMS-1541 bugfix: screening api

SVN: 16559

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java

@@ -124,9 +124,13 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
         assert wellLocation.getX() <= getContainer().getNumberOfColumns();
         assert wellLocation.getY() <= getContainer().getNumberOfRows();
 
-        long chosenChannelId =
-                query.getChannelIdByChannelNameDatasetIdOrExperimentId(getDataset().getId(),
+        Long chosenChannelId =
+                query.tryGetChannelIdByChannelNameDatasetIdOrExperimentId(getDataset().getId(),
                         getContainer().getExperimentId(), chosenChannel);
+        if (chosenChannelId == null)
+        {
+            return null;
+        }
 
         ImgImageDTO imageDTO;
         IContent content = null;

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/IImagingUploadDAO.java

@@ -144,7 +144,7 @@ public interface IImagingUploadDAO extends TransactionQuery
     public void updateChannel(ImgChannelDTO channel);
 
     @Select("select ID from CHANNELS where (DS_ID = ?{1} or EXP_ID = ?{2}) and NAME = ?{3}")
-    public long getChannelIdByChannelNameDatasetIdOrExperimentId(long id, long experimentId,
+    public Long tryGetChannelIdByChannelNameDatasetIdOrExperimentId(long id, long experimentId,
             String chosenChannel);
 
 }

screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java

@@ -243,7 +243,8 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements
                         imageLoadersMap.get(imageReference.getDatasetCode());
                 assert imageAccessor != null : "imageAccessor not found for: " + imageReference;
                 AbsoluteImageReference image = tryGetImage(imageAccessor, imageReference);
-                if (image.tryGetColorComponent() != null || image.tryGetPage() != null)
+                if (image == null
+                        || (image.tryGetColorComponent() != null || image.tryGetPage() != null))
                 {
                     // TODO 2010-06-01, Tomasz Pylak: support paging/merged channels images in API
                     imageFiles.add(null);

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningClientApiTest.java

@@ -129,7 +129,7 @@ public class ScreeningClientApiTest
                     {
 
                         PlateImageReference imageRef =
-                                new PlateImageReference(wellRow, wellCol, tile, channel + "",
+                                new PlateImageReference(wellRow, wellCol, tile, "dapi",
                                         datasetIdentifier);
                         imageRefs.add(imageRef);
                         imageFiles.add(new File(dir, createImageFileName(imageRef)));

screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/ImagingUploadDAOTest.java

@@ -139,8 +139,8 @@ public class ImagingUploadDAOTest extends AbstractDBTest
                 || channels[1] == channelId1 && channels[0] == channelId2);
 
         // test get id of first channel
-        assertEquals(channels[0], dao.getChannelIdByChannelNameDatasetIdOrExperimentId(datasetId,
-                experimentId, "dsChannel"));
+        assertEquals(channels[0], dao.tryGetChannelIdByChannelNameDatasetIdOrExperimentId(datasetId,
+                experimentId, "dsChannel").intValue());
 
         List<ImgChannelDTO> experimentChannels = dao.getChannelsByExperimentId(experimentId);
         assertEquals(1, experimentChannels.size());