[LMS-1609] update spots width/height only when empty

SVN: 17001

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ScreeningContainerDatasetInfoHelper.java

@@ -126,7 +126,7 @@ public class ScreeningContainerDatasetInfoHelper
         {
             if (updateContainer)
             {
-                dao.updateContainer(containerId, info.getContainerColumns(), info
+                dao.updateContainerEmptySpots(containerId, info.getContainerColumns(), info
                         .getContainerRows());
             }
             return new CreatedOrFetchedEntity(updateContainer == false, containerId);

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/IImagingQueryDAO.java

@@ -125,8 +125,8 @@ public interface IImagingQueryDAO extends TransactionQuery
     public long addChannel(ImgChannelDTO channel);
 
     @Update("update CONTAINERS " + "set SPOTS_WIDTH = ?{2}, SPOTS_HEIGHT = ?{3} "
-            + "where ID = ?{1}")
-    public void updateContainer(long id, int columns, int rows);
+            + "where ID = ?{1} and SPOTS_WIDTH = 0 and SPOTS_HEIGHT = 0")
+    public void updateContainerEmptySpots(long id, int columns, int rows);
 
     @Select("insert into CONTAINERS (PERM_ID, SPOTS_WIDTH, SPOTS_HEIGHT, EXPE_ID) values "
             + "(?{1.permId}, ?{1.numberOfColumns}, ?{1.numberOfRows}, ?{1.experimentId}) returning ID")

screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/genedata/FeatureStorageProcessorTest.java

@@ -89,7 +89,7 @@ public class FeatureStorageProcessorTest extends AbstractFileSystemTestCase
                     one(dao).tryGetContainerIdPermId(CONTAINER_PERM_ID);
                     will(returnValue((long) 1));
 
-                    one(dao).updateContainer(1, 0, 0);
+                    one(dao).updateContainerEmptySpots(1, 0, 0);
                     one(dao).commit();
 
                     ImgDatasetDTO dataSetDTO = new ImgDatasetDTO(DATA_SET_PERM_ID, 3, 2, 1);