Merge pull request #98 from merretbuurman/rulebaseadaptations

Rulebaseadaptations
EUDAT-B2SAFE · Jan 7, 2019 · 42ac5e9 · 42ac5e9
2 parents 1a28625 + 82dabba
commit 42ac5e9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/rulebase/pid-service.re b/rulebase/pid-service.re
@@ -222,6 +222,12 @@ EUDATUpdatePIDWithNewChild(*parentPID, *childPID) {
 #-------------------------------------------------------------------------------
 EUDATGeteValPid(*pid, *key) {
     logVerbose("[EUDATGeteValPid] get *key from *pid");
+    if (*pid == "") {
+        # throw error to avoid costly interaction with pid server that will fail anyway
+        logError("[EUDATGeteValPid] No PID provided. This will fail.");
+        *errorMsg = "Trying to read values from PID when no PID provided.";
+        failmsg(-1, *errorMsg); # TODO Return a more suitable return code
+    }
     getEpicApiParameters(*credStoreType, *credStorePath, *epicApi, *serverID, *epicDebug);
     msiExecCmd("epicclient.py", "*credStoreType *credStorePath read *pid --key *key",
                "null", "null", "null", *outGRP);