From 09e3ce57148560ad8e0949d5aea2e72661c90fd8 Mon Sep 17 00:00:00 2001 From: Claudio Cacciari Date: Sat, 16 Dec 2017 10:07:58 +0000 Subject: [PATCH] minor bug fixes --- rulebase/catchError.re | 14 +++++++----- rulebase/eudat.re | 4 ++-- rulebase/local.re | 12 +++++----- rulebase/replication.re | 49 +++++++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 38 deletions(-) diff --git a/rulebase/catchError.re b/rulebase/catchError.re index a83fc53..9f54647 100644 --- a/rulebase/catchError.re +++ b/rulebase/catchError.re @@ -53,9 +53,10 @@ EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response } EUDATCatchErrorChecksum(*source, *destination, *response) { - *source_res = ""; - *dest_res = ""; - EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response); + *source_res = "null"; + *dest_res = "null"; + *b = EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response); + *b; } # Check if 2 replicas have the same size. @@ -111,9 +112,10 @@ EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response) { } EUDATCatchErrorSize(*source, *destination, *response) { - *source_res = ""; - *dest_res = ""; - EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response); + *source_res = "null"; + *dest_res = "null"; + *b = EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response); + *b; } # Check if a user is or is not owner of the data object/collection diff --git a/rulebase/eudat.re b/rulebase/eudat.re index 8de747e..f5c2572 100644 --- a/rulebase/eudat.re +++ b/rulebase/eudat.re @@ -235,8 +235,8 @@ EUDATPushObjMetadata(*path, *queue) { EUDATMessage(*queue, *message) { *res = 'None'; - getMessageParameters(*msgConfPath, *ctrlQName, *messageQueueEnabled); - if (*messageQueueEnabled) { + getMessageParameters(*msgConfPath, *ctrlQName, *enabled); + if (*enabled) { logInfo("[EUDATMessage] sending message to the topic '*queue'"); logVerbose("[EUDATMessage] message '*message'"); if (*queue == 'None') { diff --git a/rulebase/local.re b/rulebase/local.re index 18cfac1..153fe3d 100644 --- a/rulebase/local.re +++ b/rulebase/local.re @@ -33,7 +33,7 @@ getEpicApiParameters(*credStoreType, *credStorePath, *epicApi, *serverID, *epicD *serverID="irods://:1247"; *epicDebug=2; - getConfParameters(*msiFreeEnabled, *msiCurlEnabled, *authzEnabled); + getConfParameters(*authzEnabled); if (*authzEnabled) { EUDATAuthZ("$userNameClient#$rodsZoneClient", "read", *credStorePath, *response); } @@ -57,7 +57,7 @@ parseCredentials (*baseuri, *username, *prefix, *password) { *password = "" *prefix = "" - getConfParameters(*msiFreeEnabled, *msiCurlEnabled, *authzEnabled); + getConfParameters(*authzEnabled); if (*authzEnabled) { EUDATAuthZ("$userNameClient#$rodsZoneClient", "read", "EPIC credentials", *response); } @@ -97,10 +97,10 @@ getLogParameters(*logConfPath) { # # Author: Claudio Cacciari (Cineca) #------------------------------------------------------------------------------- -getMessageParameters(*msgConfPath, *controlQueueName, *messageQueueEnabled) { +getMessageParameters(*msgConfPath, *controlQueueName, *enabled) { *msgConfPath="/opt/eudat/b2safe/conf/msgManager.conf"; *controlQueueName="B2SAFE"; - *messageQueueEnabled=bool("false"); + *enabled=bool("false"); } # Provides parameters for some B2SAFE configurations. @@ -124,8 +124,8 @@ getConfParameters(*authzEnabled) { #------------------------------------------------------------------------------- getB2SAFEVersion(*version) { *major_version = "4"; - *minor_version = "0"; - *sub_version = "1"; + *minor_version = "1"; + *sub_version = "0"; *version = *major_version ++ "." ++ *minor_version ++ "-" ++ *sub_version; } diff --git a/rulebase/replication.re b/rulebase/replication.re index 5dc1b0d..b4f2c69 100644 --- a/rulebase/replication.re +++ b/rulebase/replication.re @@ -17,7 +17,7 @@ # EUDATPIDRegistration(*source, *destination, *notification, *registration_response) # EUDATSearchAndCreatePID(*path, *pid) # EUDATSearchAndDefineField(*path, *pid, *key) -# EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res, *logEnabled, *response) +# EUDATCheckIntegrityColl(*sCollPesult*source_res, *dCollPath, *dest_res, *logEnabled, *response) # EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, *logEnabled, *response) @@ -94,10 +94,11 @@ EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, } EUDATCheckIntegrity(*source, *destination, *logEnabled, *notification, *response) { - *source_res = ""; - *dest_res = ""; - EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, - *logEnabled, *notification, *response); + *source_res = "null"; + *dest_res = "null"; + *status_transfer_success = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, + *logEnabled, *notification, *response); + *status_transfer_success; } # Data set replication @@ -150,7 +151,7 @@ EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *res logDebug("[EUDATReplication] perform a further verification about checksum and size"); *logEnabled = bool("true"); *notification = 0; - *source_res = ""; + *source_res = "null"; *status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *logEnabled, *notification, *response); } @@ -162,17 +163,14 @@ EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *res ++ "::registered=*registered::recursive=*recursive"; } logDebug("[EUDATReplication] response = *response"); -# EUDATGetZoneNameFromPath(*source, *zone); -# *queue = *zone ++ "_" ++ $userNameClient; -# *message = "status:*status;response:*response" -# EUDATMessage(*queue, *message); *status; } EUDATReplication(*source, *destination, *registered, *recursive, *response) { - *dest_res = ""; - EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *response); + *dest_res = "null"; + *status = EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *response); + *status; } # Transfer all data object saved in the logging system, @@ -279,7 +277,7 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) { logDebug("[EUDATRegDataRepl] perform a further verification about checksum and size"); *logEnabled = bool("true"); *notification = 0; - *source_res = ""; + *source_res = "null"; *status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *logEnabled, *notification, *response); } @@ -330,7 +328,7 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) { logDebug("[EUDATRegDataRepl] perform a further verification about checksum and size"); *logEnabled = bool("true"); *notification = 0; - *source_res = ""; + *source_res = "null"; *status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *logEnabled, *notification, *response); } @@ -348,8 +346,9 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) { } EUDATRegDataRepl(*source, *destination, *recursive, *response) { - *dest_res = ""; - EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response); + *dest_res = "null"; + *status = EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response); + *status; } # Verify that a PID exist for a given path and optionally create it @@ -547,10 +546,11 @@ EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res, *logEnab } EUDATCheckIntegrityColl(*sCollPath, *dCollPath, *logEnabled, *check_response) { - *source_res = ""; - *dest_res = ""; - EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res, - *logEnabled, *check_response); + *source_res = "null"; + *dest_res = "null"; + *totalResult = EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res, + *logEnabled, *check_response); + *totalResult; } # Checks differences about checksum and size between two Data Objects @@ -589,8 +589,9 @@ EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, *logEnabled } EUDATCheckIntegrityDO(*source, *destination, *logEnabled, *response) { - *source_res = ""; - *dest_res = ""; - EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, - *logEnabled, *response); + *source_res = "null"; + *dest_res = "null"; + *status = EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, + *logEnabled, *response); + *status; }