From f125d60a430ca6bd7a34015caaa3670ba59ccec7 Mon Sep 17 00:00:00 2001
From: Louwrentius <Louwrentius@7749c172-d934-11dd-87b6-9d1a99559f42>
Date: Sun, 22 Mar 2009 17:15:47 +0000
Subject: [PATCH] Currently fixing file name sanitizing.

---
 branches/distributed-ppss/ppss.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/branches/distributed-ppss/ppss.sh b/branches/distributed-ppss/ppss.sh
index 86d9fb5..ec70816 100755
--- a/branches/distributed-ppss/ppss.sh
+++ b/branches/distributed-ppss/ppss.sh
@@ -906,13 +906,18 @@ download_item () {
         log DEBUG "Transfering item $ITEM_NO_PATH to local disk."
         if [ "$SECURE_COPY" == "1" ] && [ ! -z "$SSH_SERVER" ] 
         then
-            ITEM_ESCAPED=`echo "$ITEM" | \
+            if [ ! -z "$SRC_DIR" ]
+            then
+                ITEM_PATH="$SRC_DIR/$ITEM"
+            else
+                ITEM_PATH="$ITEM"
+            fi 
+            ITEM_ESCAPED=`echo "$ITEM_PATH" | \
                     sed s/\\ /\\\\\\\\\\\\\\ /g | \
                     sed s/\\'/\\\\\\\\\\\\\\'/g | \
                     sed s/\&/\\\\\\\\\\\\\\&/g | \
                     sed s/\(/\\\\\\\\\\(/g | \
                     sed s/\)/\\\\\\\\\\)/g ` 
-
             scp -q $SSH_OPTS $SSH_KEY $USER@$SSH_SERVER:"$ITEM_ESCAPED" ./$PPSS_LOCAL_TMPDIR
             log DEBUG "Exit code of remote transfer is $?"
         else
@@ -945,9 +950,7 @@ upload_item () {
                     sed s/\&/\\\\\\\\\\\\\\&/g | \
                     sed s/\(/\\\\\\\\\\(/g | \
                     sed s/\)/\\\\\\\\\\)/g `
-        echo
-        echo " ======= +++ $DIR_ESCAPED"
-        echo
+
         scp -q $SSH_OPTS $SSH_KEY "$ITEM"/* $USER@$SSH_SERVER:"$DIR_ESCAPED" 
         ERROR="$?"
         if [ ! "$ERROR" == "0" ]
@@ -1071,7 +1074,7 @@ get_item () {
     # Gives a status update on the current progress..
     PERCENT=$((100 * $ARRAY_POINTER / $SIZE_OF_ARRAY ))
     log INFO "Currently $PERCENT percent complete. Processed $ARRAY_POINTER of $SIZE_OF_ARRAY items." 
-    echo -en "\033[1A"
+    #echo -en "\033[1A"
 
     # Check if all items have been processed.
     if [ "$ARRAY_POINTER" -ge "$SIZE_OF_ARRAY" ]
@@ -1225,7 +1228,6 @@ commando () {
         fi
 
         NEWDIR="$REMOTE_OUTPUT_DIR/$DIRNAME"
-
         DIR_ESCAPED=`echo "$NEWDIR" | \
                     sed s/\\ /\\\\\\\\\\\\\\ /g | \
                     sed s/\\'/\\\\\\\\\\\\\\'/g | \
@@ -1233,10 +1235,7 @@ commando () {
                     sed s/\(/\\\\\\\\\\(/g | \
                     sed s/\)/\\\\\\\\\\)/g `
 
-
-
         exec_cmd "mkdir -p $DIR_ESCAPED"
-
         upload_item "$PPSS_LOCAL_OUTPUT/$ITEM_NO_PATH" "$DIRNAME"
         
         elapsed "$BEFORE" "$AFTER" >> "$ITEM_LOG_FILE"