From 8b12c6198a91681fb332c30a79dc0f5994c24a2e Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 25 Feb 2014 10:07:40 +0000
Subject: [PATCH] BIS-665 SP-1202 improve registration of microscopy data
without plate assigned. improve error message when convert fails
SVN: 30596
---
.../cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java | 4 ++--
.../plugin/screening/shared/dto/PlateDimensionParser.java | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java
index 9b666e2eb49..d2701402984 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java
@@ -385,8 +385,8 @@ public class Hdf5ThumbnailGenerator implements IHDF5WriterClient
if (result.isOK() == false)
{
throw new IOException(String.format(
- "Error calling 'convert' for image '%s'. Exit value: %d, I/O status: %s",
- imageFilePath, result.getExitValue(), result.getProcessIOResult().getStatus()));
+ "Error calling 'convert' with parameters %s for image '%s'. Exit value: %d, I/O status: %s",
+ params, imageFilePath, result.getExitValue(), result.getProcessIOResult().getStatus()));
} else
{
if ((imageDataSetStructure.getChannelColorComponents() != null && imageDataSetStructure
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java
index 7ccc8931e9e..847a1f069de 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateDimensionParser.java
@@ -56,7 +56,10 @@ public class PlateDimensionParser
*/
public static PlateDimension tryToGetPlateDimension(final IEntityProperty[] properties)
{
- assert properties != null : "Unspecified properties";
+ if (properties == null)
+ {
+ return null;
+ }
IEntityProperty plateGeometryProperty =
EntityHelper.tryFindProperty(properties, PLATE_GEOMETRY_PROPERTY_NAME);
if (plateGeometryProperty == null)
--
GitLab