diff --git a/pymods/irods_utils/irods_utils.py b/pymods/irods_utils/irods_utils.py index da178618bbc5b8342bfaa28cfe5fde7b714f0fab..1a537d70c8b1712970829982cea33573780f3ef4 100644 --- a/pymods/irods_utils/irods_utils.py +++ b/pymods/irods_utils/irods_utils.py @@ -578,7 +578,7 @@ def RegisterNewExperiment( exp_form_owner, force_exp_number=None, logger=None, time_out_secs=None, - accept_undefined_user=False + accept_undefined_owner=False ): @@ -597,7 +597,7 @@ def RegisterNewExperiment( exp_form_owner, # It's a real question whether we need to do this level of userid verification - is it just to keep the riffraff out? irods_owner_user, error_message = get_irods_user(irods_sesh, exp_form_owner) - if irods_owner_user == None and not accept_undefined_user: + if irods_owner_user == None and not accept_undefined_owner: message = "Experiment owner " + exp_form_owner + " is not a registered MrData userid." logger.info( message ) return None, message @@ -613,7 +613,7 @@ def RegisterNewExperiment( exp_form_owner, + " cast_study_ipath " + cast_study_ipath logger.error( error_msg + " err: " + str(err)) message = "Castellum study " + cast_study_id + " is not registered as active in MrData." - if not accept_undefined_user: + if not accept_undefined_owner: return None, message logger.debug( "Got castellum metadata study from iRODS." @@ -695,9 +695,10 @@ def RegisterNewExperiment( exp_form_owner, logger.debug( "Next experiment number based on repo index file is: " + str( this_exp_number) ) - # Figure out if we need to right the forced exp_number to the next value for expids - if os.getenv( "MRDENV_MODE" ) == "TEST" and force_exp_number != None : - logger.info( "TEST mode force of experiment number: " + str(force_exp_number) ) + # Figure out if we need to right the forced exp_number to the next value for expidsi + # TODO: THIS COULD BE BETTER DONE BY UPTAKING THE EXP ID AS A PARAMETER + if os.getenv( "MRDENV_MODE" ) != "PROD" and force_exp_number != None : + logger.info( "Force of experiment number: " + str(force_exp_number) ) # Only write the exp number out if it is a new high. if int(force_exp_number) >= int(this_exp_number) :