Add -t to storescp.sh and set dicomlistener internals.

FNNDSC · Jun 23, 2021 · da869a0 · da869a0
1 parent 24c4a22
commit da869a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/dicomlistener b/dicomlistener
@@ -4,8 +4,8 @@
             socket_type         = stream
             wait                = no
             user                = root
-            server              = /opt/dcm/storescp.sh
-            server_args         = -p 11113 -E /usr/local/bin -D /home/dicom
+            server              = /usr/local/bin/storescp.sh
+            server_args         = -t /tmp/data -p 11113 -E /usr/local/bin -D /home/dicom
             type                = UNLISTED
             port                = 11113
             bind                = 0.0.0.0

diff --git a/storescp.sh b/storescp.sh
@@ -25,13 +25,15 @@ DESC
 PORT=10402
 EXECROOTPATH="/usr/local/bin"
 DATAROOTPATH="/home/dicom"
+TMPINCOMINGDATA=/tmp/data
 
-while getopts "p:E:D:" opt; do
+while getopts "p:E:D:t:" opt; do
     case $opt in
+        t) TMPINCOMINGDATA=$OPTARG              ;;
         p) PORT=$OPTARG                         ;;
         E) EXECROOTPATH=$OPTARG                 ;;
         D) DATAROOTPATH=$OPTARG                 ;;
     esac
 done
-mkdir /tmp/data
-eval storescp -od /tmp/data -pm -sp -xcr \"$EXECROOTPATH/px-repack --xcrdir \#p --xcrfile \#f --verbosity 0 --logdir $DATAROOTPATH/log --datadir $DATAROOTPATH/data --cleanup\" $PORT
+mkdir $TMPINCOMINGDATA
+eval storescp -od $TMPINCOMINGDATA -pm -sp -xcr \"$EXECROOTPATH/px-repack --xcrdir \#p --xcrfile \#f --verbosity 0 --logdir $DATAROOTPATH/log --datadir $DATAROOTPATH/data --cleanup\" $PORT