From cffe9a0299eee366de7dd6854c9275ac9e8dab5d Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 6 Nov 2012 07:58:27 +0100
Subject: [PATCH] Fix example removal scripts reusing generic code

FEA: ItEr77S13AllowDeleteOrderElements
---
 scripts/rest-clients/remove-order-element.sh  | 33 +-----------------
 .../rest-clients/remove-work-report-line.sh   | 33 +-----------------
 scripts/rest-clients/remove-work-report.sh    | 33 +-----------------
 scripts/rest-clients/remove.sh                | 34 +++++++++++++++++++
 4 files changed, 37 insertions(+), 96 deletions(-)
 create mode 100755 scripts/rest-clients/remove.sh

diff --git a/scripts/rest-clients/remove-order-element.sh b/scripts/rest-clients/remove-order-element.sh
index 02e0bcd75..666c51fc1 100755
--- a/scripts/rest-clients/remove-order-element.sh
+++ b/scripts/rest-clients/remove-order-element.sh
@@ -1,34 +1,3 @@
 #!/bin/sh
 
-. ./rest-common-env.sh
-
-printf "Username: "
-read loginName
-printf "Password: "
-read password
-
-code=$1
-
-if [ "$1" = "--prod" ]; then
-    baseServiceURL=$PRODUCTION_BASE_SERVICE_URL
-    certificate=$PRODUCTION_CERTIFICATE
-    code=$2
-elif [ "$1" = "--dev" ]; then
-    baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL
-    certificate=$DEVELOPMENT_CERTIFICATE
-    code=$2
-else
-    baseServiceURL=$DEMO_BASE_SERVICE_URL
-    certificate=$DEMO_CERTIFICATE
-fi
-
-authorization=`echo -n "$loginName:$password" | base64`
-
-result=`curl -sv -X DELETE $certificate --header "Authorization: Basic $authorization" \
-    $baseServiceURL/orderelements/$code`
-
-if hash tidy &> /dev/null; then
-    echo $result | tidy -xml -i -q -utf8
-else
-    echo $result
-fi
+./remove.sh orderelements $*
diff --git a/scripts/rest-clients/remove-work-report-line.sh b/scripts/rest-clients/remove-work-report-line.sh
index 14e01c87d..d1b7ceb65 100755
--- a/scripts/rest-clients/remove-work-report-line.sh
+++ b/scripts/rest-clients/remove-work-report-line.sh
@@ -1,34 +1,3 @@
 #!/bin/sh
 
-. ./rest-common-env.sh
-
-printf "Username: "
-read loginName
-printf "Password: "
-read password
-
-code=$1
-
-if [ "$1" = "--prod" ]; then
-    baseServiceURL=$PRODUCTION_BASE_SERVICE_URL
-    certificate=$PRODUCTION_CERTIFICATE
-    code=$2
-elif [ "$1" = "--dev" ]; then
-    baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL
-    certificate=$DEVELOPMENT_CERTIFICATE
-    code=$2
-else
-    baseServiceURL=$DEMO_BASE_SERVICE_URL
-    certificate=$DEMO_CERTIFICATE
-fi
-
-authorization=`echo -n "$loginName:$password" | base64`
-
-result=`curl -sv -X DELETE $certificate --header "Authorization: Basic $authorization" \
-    $baseServiceURL/workreports/line/$code`
-
-if hash tidy &> /dev/null; then
-    echo $result | tidy -xml -i -q -utf8
-else
-    echo $result
-fi
+./remove.sh workreports/line $*
diff --git a/scripts/rest-clients/remove-work-report.sh b/scripts/rest-clients/remove-work-report.sh
index 43a687c91..04319d4bd 100755
--- a/scripts/rest-clients/remove-work-report.sh
+++ b/scripts/rest-clients/remove-work-report.sh
@@ -1,34 +1,3 @@
 #!/bin/sh
 
-. ./rest-common-env.sh
-
-printf "Username: "
-read loginName
-printf "Password: "
-read password
-
-code=$1
-
-if [ "$1" = "--prod" ]; then
-    baseServiceURL=$PRODUCTION_BASE_SERVICE_URL
-    certificate=$PRODUCTION_CERTIFICATE
-    code=$2
-elif [ "$1" = "--dev" ]; then
-    baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL
-    certificate=$DEVELOPMENT_CERTIFICATE
-    code=$2
-else
-    baseServiceURL=$DEMO_BASE_SERVICE_URL
-    certificate=$DEMO_CERTIFICATE
-fi
-
-authorization=`echo -n "$loginName:$password" | base64`
-
-result=`curl -sv -X DELETE $certificate --header "Authorization: Basic $authorization" \
-    $baseServiceURL/workreports/$code`
-
-if hash tidy &> /dev/null; then
-    echo $result | tidy -xml -i -q -utf8
-else
-    echo $result
-fi
+./remove.sh workreports $*
diff --git a/scripts/rest-clients/remove.sh b/scripts/rest-clients/remove.sh
new file mode 100755
index 000000000..e71b3661e
--- /dev/null
+++ b/scripts/rest-clients/remove.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+. ./rest-common-env.sh
+
+printf "Username: "
+read loginName
+printf "Password: "
+read password
+
+code=$2
+
+if [ "$2" = "--prod" ]; then
+    baseServiceURL=$PRODUCTION_BASE_SERVICE_URL
+    certificate=$PRODUCTION_CERTIFICATE
+    code=$3
+elif [ "$2" = "--dev" ]; then
+    baseServiceURL=$DEVELOPMENT_BASE_SERVICE_URL
+    certificate=$DEVELOPMENT_CERTIFICATE
+    code=$3
+else
+    baseServiceURL=$DEMO_BASE_SERVICE_URL
+    certificate=$DEMO_CERTIFICATE
+fi
+
+authorization=`echo -n "$loginName:$password" | base64`
+
+result=`curl -sv -X DELETE $certificate --header "Authorization: Basic $authorization" \
+    $baseServiceURL/$1/$code`
+
+if hash tidy &> /dev/null; then
+    echo $result | tidy -xml -i -q -utf8
+else
+    echo $result
+fi