From b4ccd442810c48501290727bc244cf10cebbaac3 Mon Sep 17 00:00:00 2001 From: Sinisa Veseli <sveseli@aps.anl.gov> Date: Fri, 26 Jun 2015 20:09:15 +0000 Subject: [PATCH] added few cataloging commands --- bin/dm-add-experiment-file | 18 ++++++++++++++++++ bin/dm-get-experiment-file | 18 ++++++++++++++++++ bin/dm-get-experiment-files | 18 ++++++++++++++++++ bin/dm-get-files | 18 ++++++++++++++++++ bin/dm-start-daq | 3 ++- bin/dm-update-experiment-file | 18 ++++++++++++++++++ bin/dm_command_setup.sh | 24 ++++++++++++++++++++++++ 7 files changed, 116 insertions(+), 1 deletion(-) create mode 100755 bin/dm-add-experiment-file create mode 100755 bin/dm-get-experiment-file create mode 100755 bin/dm-get-experiment-files create mode 100755 bin/dm-get-files create mode 100755 bin/dm-update-experiment-file create mode 100755 bin/dm_command_setup.sh diff --git a/bin/dm-add-experiment-file b/bin/dm-add-experiment-file new file mode 100755 index 00000000..b4d86e88 --- /dev/null +++ b/bin/dm-add-experiment-file @@ -0,0 +1,18 @@ +#!/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/cat_web_service/cli/addExperimentFileCli.py $DM_COMMAND_ARGS" + + diff --git a/bin/dm-get-experiment-file b/bin/dm-get-experiment-file new file mode 100755 index 00000000..32e17908 --- /dev/null +++ b/bin/dm-get-experiment-file @@ -0,0 +1,18 @@ +#!/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/cat_web_service/cli/getExperimentFileCli.py $DM_COMMAND_ARGS" + + diff --git a/bin/dm-get-experiment-files b/bin/dm-get-experiment-files new file mode 100755 index 00000000..0d8ada6d --- /dev/null +++ b/bin/dm-get-experiment-files @@ -0,0 +1,18 @@ +#!/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/cat_web_service/cli/getExperimentFilesCli.py $DM_COMMAND_ARGS" + + diff --git a/bin/dm-get-files b/bin/dm-get-files new file mode 100755 index 00000000..a429f8fb --- /dev/null +++ b/bin/dm-get-files @@ -0,0 +1,18 @@ +#!/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/cat_web_service/cli/getFilesCli.py $DM_COMMAND_ARGS" + + diff --git a/bin/dm-start-daq b/bin/dm-start-daq index c7ff7e31..3192d84d 100755 --- a/bin/dm-start-daq +++ b/bin/dm-start-daq @@ -11,7 +11,8 @@ if [ -z $DM_ROOT_DIR ]; then fi source $setupFile > /dev/null fi +source dm_command_setup.sh -$DM_ROOT_DIR/src/python/dm/daq_web_service/cli/startDaqCli.py $@ +eval "$DM_ROOT_DIR/src/python/dm/daq_web_service/cli/startDaqCli.py $DM_COMMAND_ARGS" diff --git a/bin/dm-update-experiment-file b/bin/dm-update-experiment-file new file mode 100755 index 00000000..385a7a7d --- /dev/null +++ b/bin/dm-update-experiment-file @@ -0,0 +1,18 @@ +#!/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/cat_web_service/cli/updateExperimentFileCli.py $DM_COMMAND_ARGS" + + diff --git a/bin/dm_command_setup.sh b/bin/dm_command_setup.sh new file mode 100755 index 00000000..88a9c74d --- /dev/null +++ b/bin/dm_command_setup.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# Helper functions for DM commands. + +# Fix command line arguments +DM_COMMAND_ARGS="" +while [ $# -ne 0 ]; do + arg=$1 + if [[ $arg == -* ]]; then + key=`echo $arg | cut -f1 -d'='` + keyHasValue=`echo $arg | grep '='` + if [ ! -z "$keyHasValue" ]; then + value=`echo $arg | cut -f2- -d'='` + DM_COMMAND_ARGS="$DM_COMMAND_ARGS $key=\"$value\"" + else + DM_COMMAND_ARGS="$DM_COMMAND_ARGS $key" + fi + else + DM_COMMAND_ARGS="$DM_COMMAND_ARGS \"$arg\"" + fi + shift +done + + -- GitLab