Skip to content
Snippets Groups Projects
Commit 4b35868d authored by sveseli's avatar sveseli
Browse files

merge from 1.1

parents 9d8921dd 92a5fd5a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 191 additions and 5 deletions
bin/11IDB/dm-11idb-daq 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/daqCli.py $DM_COMMAND_ARGS"
bin/11IDB/dm-11idb-upload 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/uploadCli.py $DM_COMMAND_ARGS"
bin/11IDC/dm-11idc-daq 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/daqCli.py $DM_COMMAND_ARGS"
bin/11IDC/dm-11idc-upload 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/uploadCli.py $DM_COMMAND_ARGS"
bin/6BM/dm-6bm-daq 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/daqCli.py $DM_COMMAND_ARGS"
bin/6BM/dm-6bm-upload 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/uploadCli.py $DM_COMMAND_ARGS"
bin/6IDD/dm-6idd-daq 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/daqCli.py $DM_COMMAND_ARGS"
bin/6IDD/dm-6idd-upload 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/uploadCli.py $DM_COMMAND_ARGS"
bin/8IDI/dm-8idi-daq 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/daqCli.py $DM_COMMAND_ARGS"
bin/8IDI/dm-8idi-upload 0 → 100755
+ 18
− 0
View file @ 4b35868d
#!/bin/sh
# Run command
if [ -z $DM_ROOT_DIR ]; then
cd `dirname $0` && myDir=`pwd`
setupFile=$myDir/../../setup.sh
if [ ! -f $setupFile ]; then
echo "Cannot find setup file: $setupFile"
exit 1
fi
source $setupFile > /dev/null
fi
source $DM_ROOT_DIR/bin/dm_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/uploadCli.py $DM_COMMAND_ARGS"
src/python/dm/__init__.py
+ 1
− 1
View file @ 4b35868d
__version__ = "1.1 (2017.03.03)"
__version__ = "1.1 (2017.03.06)"
src/python/dm/aps_bss/impl/bssClient.py
+ 9
− 3
View file @ 4b35868d
......@@ -96,15 +96,21 @@ class BssClient:
for experimenter in experimenterArray:
user = ApsUserInfo({
'id' : experimenter.id,
'badge' : experimenter.badge,
'email' : experimenter.email,
'firstName' : experimenter.firstName,
'lastName' : experimenter.lastName
})
if hasattr(experimenter, 'badge'):
user['badge'] = experimenter.badge
else:
# Ignore this user, has no badge
continue
if hasattr(experimenter, 'piFlag'):
user['piFlag'] = experimenter.piFlag
if hasattr(experimenter, 'instId'):
user['instId'] = experimenter.instId
if hasattr(experimenter, 'firstName'):
user['firstName'] = ''.join(filter(lambda x:x in string.printable, experimenter.firstName))
if hasattr(experimenter, 'lastName'):
user['lastName'] = ''.join(filter(lambda x:x in string.printable, experimenter.lastName))
if hasattr(experimenter, 'institution'):
# Remove non-printable characters
user['institution'] = ''.join(filter(lambda x:x in string.printable, experimenter.institution))
......
src/python/dm/common/processing/plugins/rsyncFileTransferPlugin.py
+ 1
− 1
View file @ 4b35868d
......@@ -116,7 +116,7 @@ class RsyncFileTransferPlugin(FileTransferPlugin):
self.logger.debug('Starting transfer: %s -> %s' % (srcUrl, destUrl))
command = self.DIRECTORY_TRANSFER_COMMAND
if destDirectory:
targetDirectory = '%s/%s' % (storageDirectory,targetDirectory)
targetDirectory = '%s/%s' % (storageDirectory,destDirectory)
command = self.DIRECTORY_TRANSFER_WITH_MKDIR_COMMAND % targetDirectory
self.start(src=srcUrl, dest=destUrl, command=command, templateInfo=uploadInfo, cwd=dataDirectory)
......
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