From ddba220ee9a285b79586f27ded15937894ee2db4 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Tue, 21 Jun 2011 11:54:15 +0000
Subject: [PATCH] [LMS-2300] accept validation scripts without
"extract_metadata" function
SVN: 21771
---
.../cisd/openbis/dss/client/api/v1/impl/DssComponent.java | 4 ++--
.../shared/api/v1/validation/ValidationScriptRunner.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index 40fe58318fe..a955c86eeda 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -656,7 +656,7 @@ class AuthenticatedState extends AbstractDssComponentState
{
// ignore the error here since, if it is significant, it will appear again in
// validation.
- return new HashMap<String, String>();
+ return Collections.emptyMap();
}
try
@@ -667,7 +667,7 @@ class AuthenticatedState extends AbstractDssComponentState
System.err.println("Could not run metadata extraction script: ");
System.err.println(runner.getScriptString());
t.printStackTrace(System.err);
- return new HashMap<String, String>();
+ return Collections.emptyMap();
}
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
index dcc5123adf9..65b52ba2fb1 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
@@ -143,6 +143,11 @@ public class ValidationScriptRunner
{
Map<String, String> metadata = new HashMap<String, String>();
PyFunction function = tryJythonFunction(EXTRACT_METADATA_FUNCTION_NAME);
+ if (function == null)
+ {
+ return Collections.emptyMap();
+ }
+
PyObject result = function.__call__(Py.java2py(dataSetFile));
if (null != result)
{
--
GitLab