Merge pull request #114 from chStaiger/master

Replace EUDATiFieldVALUEretrieve with EUDATgetLastAVU in test rules.

changelog.txt

@@ -1,3 +1,11 @@
+B2SAFE package 4.1.0 [2017/12/18]
+- tested sucessfully against iRODS v4.2.1. The test against iRODS 4.2.2 failed due to this bug: https://github.com/irods/irods/issues/3722, therefore the v4.2.2 is not supported yet.
+- fixed bug related to EUDATReplication rule (https://github.com/EUDAT-B2SAFE/B2SAFE-core/issues/102)
+- improved install.txt documentation (https://github.com/EUDAT-B2SAFE/B2SAFE-core/issues/103)
+- added EUDATeURLupdateColl(*PID, *newURL) to update the url in multiple PIDS associeted to a whole collection of objects.
+- many improvements in the logging
+- added the option to specify the destination iRODS resource in many rules, included the EUDATReplication.
+
 B2SAFE package 4.0.1 [2017/07/11]
 - added support for iRODS 4.2.1 (https://github.com/EUDAT-B2SAFE/B2SAFE-core/issues/94)
 - fixed bug related to package deployment (https://github.com/EUDAT-B2SAFE/B2SAFE-core/issues/85)

rules/eudatRepl_checkIntegrity.r

@@ -28,7 +28,7 @@ eudatReplCheckIntegrity{
         writeBytesBuf("stdout", *R_BUF);
         msiDataObjClose(*S_FD, *status2);
         writeLine("stdout", "");
-        EUDATiFieldVALUEretrieve("*home/test_data2.txt", "PID", *value);
+        EUDATgetLastAVU("*home/test_data2.txt", "PID", *value);
         writeLine("stdout", "The Replica *home/test_data2.txt has PID = *value");
 
         # Data set integrity check

rules/eudatRepl_coll.r

@@ -45,9 +45,9 @@ eudatReplColl{
         writeLine("stdout", "");
 
         writeLine("stdout", "PIDs for data:");
-        EUDATiFieldVALUEretrieve("*tdata", "PID", *origPID);
+        EUDATgetLastAVU("*tdata", "PID", *origPID);
         writeLine("stdout", "The Original *tdata has PID = *origPID");
-        EUDATiFieldVALUEretrieve("*tcoll2/test_data.txt", "PID", *value);
+        EUDATgetLastAVU("*tcoll2/test_data.txt", "PID", *value);
         writeLine("stdout", "The Replica *tcoll2/test_data.txt has PID = *value");
 
         writeLine("stdout", "Remove replicated data object");
@@ -58,9 +58,9 @@ eudatReplColl{
 
         writeLine("stdout", "");
         writeLine("stdout", "PIDs for collections:");
-        EUDATiFieldVALUEretrieve(*tcoll, "PID", *origCollPID);
+        EUDATgetLastAVU(*tcoll, "PID", *origCollPID);
         writeLine("stdout", "The Original *tcoll has PID = *origCollPID");
-        EUDATiFieldVALUEretrieve(*tcoll2, "PID", *value);
+        EUDATgetLastAVU(*tcoll2, "PID", *value);
         writeLine("stdout", "The Replica *tcoll2 has PID = *value");
 
        writeLine("stdout", "Remove replica Collection and PID.");

rules/eudatRepl_recoverTransfer.r

@@ -29,7 +29,7 @@ eudatSimulateRecovery{
         writeBytesBuf("stdout", *R_BUF);
         msiDataObjClose(*S_FD, *status2);
         writeLine("stdout", "");
-        EUDATiFieldVALUEretrieve("*home/test_data2.txt", "PID", *value);
+        EUDATgetLastAVU("*home/test_data2.txt", "PID", *value);
         writeLine("stdout", "The Replica *home/test_data2.txt has PID = *value");
         writeLine("stdout", "");
         # Alter the content of the replica to simulate a failure

rules/eudatRepl_registered.r

@@ -29,7 +29,7 @@ eudatRepl{
         msiDataObjClose(*S_FD, *status2);
         writeLine("stdout", "");
 
-        EUDATiFieldVALUEretrieve("*home/test_data2.txt", "PID", *value);
+        EUDATgetLastAVU("*home/test_data2.txt", "PID", *value);
         writeLine("stdout", "The Replica *home/test_data2.txt has PID = *value");
         EUDATePIDremove("*home/test_data2.txt", "true");
         writeLine("stdout", "PID *value removed");