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

Merged 1.9.2

parents 672a9ea5 43a8b0bb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 253 additions and 71 deletions
Makefile
+ 3
− 0
View file @ aa57a7ae
......@@ -27,6 +27,9 @@ db:
destroy-db:
$(TOP)/sbin/dm_destroy_db.sh
ca:
$(TOP)/sbin/dm_create_ca.sh
backup:
$(TOP)/sbin/dm_backup.sh
......
bin/30ID/dm-30id-daq 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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/30ID/dm-30id-upload 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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/BIOCAT/dm-biocat-daq 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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/BIOCAT/dm-biocat-upload 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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/OPTICS/dm-optics-daq 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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/OPTICS/dm-optics-upload 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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/dm-compress-files 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/compressFilesCli.py $DM_COMMAND_ARGS"
bin/dm-decompress-files 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/decompressFilesCli.py $DM_COMMAND_ARGS"
bin/dm-delete-experiment-file deleted 100755 → 0
+ 1
− 17
View file @ 672a9ea5
#!/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
$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/deleteExperimentFileCli.py $@
bin/dm-delete-experiment-file 0 → 120000
+ 1
− 17
View file @ aa57a7ae
dm-delete-file
\ No newline at end of file
bin/dm-delete-file 0 → 100755
+ 17
− 0
View file @ aa57a7ae
#!/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
$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/deleteFileCli.py $@
bin/dm-delete-files 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/deleteFilesCli.py $DM_COMMAND_ARGS"
bin/dm-list-files 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/listFilesCli.py $DM_COMMAND_ARGS"
bin/dm-stat-experiment-file deleted 100755 → 0
+ 1
− 18
View file @ 672a9ea5
#!/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_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/ds_web_service/cli/statExperimentFileCli.py $DM_COMMAND_ARGS"
bin/dm-stat-experiment-file 0 → 120000
+ 1
− 18
View file @ aa57a7ae
dm-stat-file
\ No newline at end of file
bin/dm-stat-file 0 → 100755
+ 18
− 0
View file @ aa57a7ae
#!/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_command_setup.sh
eval "$DM_ROOT_DIR/src/python/dm/aps_beamline_tools/cli/statFileCli.py $DM_COMMAND_ARGS"
doc/RELEASE_NOTES.txt
+ 21
− 0
View file @ aa57a7ae
Release 1.11 (05/15/2018)
=============================
- Added support for compressing and decompressing files
- New commands:
* compress-files
* decompress-files
- Added support for deleting files
- New commands:
* delete-file
* delete-files
- Modified stat-file utility, which now requires explicit --md5sum flag to
retrieve checksum
- Added new --path-pattern option to the list-files command
- DM Station GUI fixes/enhancements:
- Added initial GUI test suite
- Added right-click copying functionality
- Fixed issue with trailing comma for DAQ/upload parameters
- Fixed CPU usage bug
- Fixed incorrect handling of user selections
- Fixed focus policy for several buttons
Release 1.10 (03/30/2018)
=============================
- Added support for command output in html format
......
etc/dm.deploy.conf
+ 1
− 1
View file @ aa57a7ae
......@@ -17,5 +17,5 @@ DM_CAT_WEB_SERVICE_HOST=DM_HOSTNAME
DM_CAT_WEB_SERVICE_PORT=44436
DM_PROC_WEB_SERVICE_HOST=DM_HOSTNAME
DM_PROC_WEB_SERVICE_PORT=55536
DM_SOFTWARE_VERSION=1.10
DM_SOFTWARE_VERSION=1.11
etc/ds-web-service.conf.template
+ 9
− 0
View file @ aa57a7ae
......@@ -34,6 +34,15 @@ mongoDbUri=mongodb://localhost:27017
mongoDbUser=dm
mongoDbPasswordFile=DM_INSTALL_DIR/etc/DM_DB_NAME.db.passwd
[ApsEsafDbManager]
db=oracle
dbPort=1527
dbHost=ra.aps.anl.gov
dbName=aps1
dbSchema=ESAF
dbUser=dmadmin
dbPasswordFile=DM_INSTALL_DIR/etc/aps.esaf.db.passwd
[FileProcessingManager]
numberOfProcessingThreads=3
defaultNumberOfRetries=3
......
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