Commit 09e3ce57 authored by Claudio Cacciari's avatar Claudio Cacciari
Browse files

minor bug fixes

parent 3e5a6a5b
...@@ -53,9 +53,10 @@ EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response ...@@ -53,9 +53,10 @@ EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response
} }
EUDATCatchErrorChecksum(*source, *destination, *response) { EUDATCatchErrorChecksum(*source, *destination, *response) {
*source_res = ""; *source_res = "null";
*dest_res = ""; *dest_res = "null";
EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response); *b = EUDATCatchErrorChecksum(*source, *source_res, *destination, *dest_res, *response);
*b;
} }
# Check if 2 replicas have the same size. # Check if 2 replicas have the same size.
...@@ -111,9 +112,10 @@ EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response) { ...@@ -111,9 +112,10 @@ EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response) {
} }
EUDATCatchErrorSize(*source, *destination, *response) { EUDATCatchErrorSize(*source, *destination, *response) {
*source_res = ""; *source_res = "null";
*dest_res = ""; *dest_res = "null";
EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response); *b = EUDATCatchErrorSize(*source, *source_res, *destination, *dest_res, *response);
*b;
} }
# Check if a user is or is not owner of the data object/collection # Check if a user is or is not owner of the data object/collection
......
...@@ -235,8 +235,8 @@ EUDATPushObjMetadata(*path, *queue) { ...@@ -235,8 +235,8 @@ EUDATPushObjMetadata(*path, *queue) {
EUDATMessage(*queue, *message) { EUDATMessage(*queue, *message) {
*res = 'None'; *res = 'None';
getMessageParameters(*msgConfPath, *ctrlQName, *messageQueueEnabled); getMessageParameters(*msgConfPath, *ctrlQName, *enabled);
if (*messageQueueEnabled) { if (*enabled) {
logInfo("[EUDATMessage] sending message to the topic '*queue'"); logInfo("[EUDATMessage] sending message to the topic '*queue'");
logVerbose("[EUDATMessage] message '*message'"); logVerbose("[EUDATMessage] message '*message'");
if (*queue == 'None') { if (*queue == 'None') {
......
...@@ -33,7 +33,7 @@ getEpicApiParameters(*credStoreType, *credStorePath, *epicApi, *serverID, *epicD ...@@ -33,7 +33,7 @@ getEpicApiParameters(*credStoreType, *credStorePath, *epicApi, *serverID, *epicD
*serverID="irods://<hostnameWithFullDomain>:1247"; *serverID="irods://<hostnameWithFullDomain>:1247";
*epicDebug=2; *epicDebug=2;
getConfParameters(*msiFreeEnabled, *msiCurlEnabled, *authzEnabled); getConfParameters(*authzEnabled);
if (*authzEnabled) { if (*authzEnabled) {
EUDATAuthZ("$userNameClient#$rodsZoneClient", "read", *credStorePath, *response); EUDATAuthZ("$userNameClient#$rodsZoneClient", "read", *credStorePath, *response);
} }
...@@ -57,7 +57,7 @@ parseCredentials (*baseuri, *username, *prefix, *password) { ...@@ -57,7 +57,7 @@ parseCredentials (*baseuri, *username, *prefix, *password) {
*password = "<password>" *password = "<password>"
*prefix = "<prefix>" *prefix = "<prefix>"
getConfParameters(*msiFreeEnabled, *msiCurlEnabled, *authzEnabled); getConfParameters(*authzEnabled);
if (*authzEnabled) { if (*authzEnabled) {
EUDATAuthZ("$userNameClient#$rodsZoneClient", "read", "EPIC credentials", *response); EUDATAuthZ("$userNameClient#$rodsZoneClient", "read", "EPIC credentials", *response);
} }
...@@ -97,10 +97,10 @@ getLogParameters(*logConfPath) { ...@@ -97,10 +97,10 @@ getLogParameters(*logConfPath) {
# #
# Author: Claudio Cacciari (Cineca) # Author: Claudio Cacciari (Cineca)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
getMessageParameters(*msgConfPath, *controlQueueName, *messageQueueEnabled) { getMessageParameters(*msgConfPath, *controlQueueName, *enabled) {
*msgConfPath="/opt/eudat/b2safe/conf/msgManager.conf"; *msgConfPath="/opt/eudat/b2safe/conf/msgManager.conf";
*controlQueueName="B2SAFE"; *controlQueueName="B2SAFE";
*messageQueueEnabled=bool("false"); *enabled=bool("false");
} }
# Provides parameters for some B2SAFE configurations. # Provides parameters for some B2SAFE configurations.
...@@ -124,8 +124,8 @@ getConfParameters(*authzEnabled) { ...@@ -124,8 +124,8 @@ getConfParameters(*authzEnabled) {
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
getB2SAFEVersion(*version) { getB2SAFEVersion(*version) {
*major_version = "4"; *major_version = "4";
*minor_version = "0"; *minor_version = "1";
*sub_version = "1"; *sub_version = "0";
*version = *major_version ++ "." ++ *minor_version ++ "-" ++ *sub_version; *version = *major_version ++ "." ++ *minor_version ++ "-" ++ *sub_version;
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# EUDATPIDRegistration(*source, *destination, *notification, *registration_response) # EUDATPIDRegistration(*source, *destination, *notification, *registration_response)
# EUDATSearchAndCreatePID(*path, *pid) # EUDATSearchAndCreatePID(*path, *pid)
# EUDATSearchAndDefineField(*path, *pid, *key) # 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) # EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, *logEnabled, *response)
...@@ -94,10 +94,11 @@ EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, ...@@ -94,10 +94,11 @@ EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res,
} }
EUDATCheckIntegrity(*source, *destination, *logEnabled, *notification, *response) { EUDATCheckIntegrity(*source, *destination, *logEnabled, *notification, *response) {
*source_res = ""; *source_res = "null";
*dest_res = ""; *dest_res = "null";
EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *status_transfer_success = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res,
*logEnabled, *notification, *response); *logEnabled, *notification, *response);
*status_transfer_success;
} }
# Data set replication # Data set replication
...@@ -150,7 +151,7 @@ EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *res ...@@ -150,7 +151,7 @@ EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *res
logDebug("[EUDATReplication] perform a further verification about checksum and size"); logDebug("[EUDATReplication] perform a further verification about checksum and size");
*logEnabled = bool("true"); *logEnabled = bool("true");
*notification = 0; *notification = 0;
*source_res = ""; *source_res = "null";
*status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res,
*logEnabled, *notification, *response); *logEnabled, *notification, *response);
} }
...@@ -162,17 +163,14 @@ EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *res ...@@ -162,17 +163,14 @@ EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *res
++ "::registered=*registered::recursive=*recursive"; ++ "::registered=*registered::recursive=*recursive";
} }
logDebug("[EUDATReplication] response = *response"); logDebug("[EUDATReplication] response = *response");
# EUDATGetZoneNameFromPath(*source, *zone);
# *queue = *zone ++ "_" ++ $userNameClient;
# *message = "status:*status;response:*response"
# EUDATMessage(*queue, *message);
*status; *status;
} }
EUDATReplication(*source, *destination, *registered, *recursive, *response) { EUDATReplication(*source, *destination, *registered, *recursive, *response) {
*dest_res = ""; *dest_res = "null";
EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *response); *status = EUDATReplication(*source, *destination, *dest_res, *registered, *recursive, *response);
*status;
} }
# Transfer all data object saved in the logging system, # Transfer all data object saved in the logging system,
...@@ -279,7 +277,7 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) { ...@@ -279,7 +277,7 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) {
logDebug("[EUDATRegDataRepl] perform a further verification about checksum and size"); logDebug("[EUDATRegDataRepl] perform a further verification about checksum and size");
*logEnabled = bool("true"); *logEnabled = bool("true");
*notification = 0; *notification = 0;
*source_res = ""; *source_res = "null";
*status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res,
*logEnabled, *notification, *response); *logEnabled, *notification, *response);
} }
...@@ -330,7 +328,7 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) { ...@@ -330,7 +328,7 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) {
logDebug("[EUDATRegDataRepl] perform a further verification about checksum and size"); logDebug("[EUDATRegDataRepl] perform a further verification about checksum and size");
*logEnabled = bool("true"); *logEnabled = bool("true");
*notification = 0; *notification = 0;
*source_res = ""; *source_res = "null";
*status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res, *status = EUDATCheckIntegrity(*source, *source_res, *destination, *dest_res,
*logEnabled, *notification, *response); *logEnabled, *notification, *response);
} }
...@@ -348,8 +346,9 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) { ...@@ -348,8 +346,9 @@ EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response) {
} }
EUDATRegDataRepl(*source, *destination, *recursive, *response) { EUDATRegDataRepl(*source, *destination, *recursive, *response) {
*dest_res = ""; *dest_res = "null";
EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response); *status = EUDATRegDataRepl(*source, *destination, *dest_res, *recursive, *response);
*status;
} }
# Verify that a PID exist for a given path and optionally create it # 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 ...@@ -547,10 +546,11 @@ EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res, *logEnab
} }
EUDATCheckIntegrityColl(*sCollPath, *dCollPath, *logEnabled, *check_response) { EUDATCheckIntegrityColl(*sCollPath, *dCollPath, *logEnabled, *check_response) {
*source_res = ""; *source_res = "null";
*dest_res = ""; *dest_res = "null";
EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res, *totalResult = EUDATCheckIntegrityColl(*sCollPath, *source_res, *dCollPath, *dest_res,
*logEnabled, *check_response); *logEnabled, *check_response);
*totalResult;
} }
# Checks differences about checksum and size between two Data Objects # Checks differences about checksum and size between two Data Objects
...@@ -589,8 +589,9 @@ EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, *logEnabled ...@@ -589,8 +589,9 @@ EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, *logEnabled
} }
EUDATCheckIntegrityDO(*source, *destination, *logEnabled, *response) { EUDATCheckIntegrityDO(*source, *destination, *logEnabled, *response) {
*source_res = ""; *source_res = "null";
*dest_res = ""; *dest_res = "null";
EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res, *status = EUDATCheckIntegrityDO(*source, *source_res, *destination, *dest_res,
*logEnabled, *response); *logEnabled, *response);
*status;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment