From 3267feec216579890f9358bb39e6e003335d74c5 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Thu, 1 Mar 2012 08:50:20 -0800
Subject: [PATCH] Fixed issue #74

---
 utils/modules/create-service.sh |  4 +--
 utils/modules/create-type.sh    |  9 ++---
 utils/modules/create-uri.sh     |  6 ++--
 utils/modules/delete-type.sh    | 58 +++------------------------------
 4 files changed, 15 insertions(+), 62 deletions(-)

diff --git a/utils/modules/create-service.sh b/utils/modules/create-service.sh
index fc406001..8c52a9bb 100755
--- a/utils/modules/create-service.sh
+++ b/utils/modules/create-service.sh
@@ -46,7 +46,7 @@ else
   mkdir -p $mainDir/queries
 fi
 
-echo $modelHtml > $mainDir/queries/main.query
-echo $viewHtml > $mainDir/html.template
+echo -e "$modelHtml" > $mainDir/queries/main.query
+echo -e "$viewHtml" > $mainDir/html.template
 
 echo $initToken.$1 created/modified successfully! >&2
diff --git a/utils/modules/create-type.sh b/utils/modules/create-type.sh
index 4e1b3770..379e2fe0 100755
--- a/utils/modules/create-type.sh
+++ b/utils/modules/create-type.sh
@@ -81,7 +81,8 @@ viewHtml=`cat <<VIEW
     
     <br/>
   </body>
-</html>VIEW`
+</html>
+VIEW`
 
 
 #Check models
@@ -94,8 +95,8 @@ else
   mkdir -p $mainDir/queries
 fi
 
-echo "$modelHtmlSP" > $mainDir/queries/sp.query
-echo "$modelHtmlPO" > $mainDir/queries/po.query
-echo "$viewHtml" > $mainDir/html.template
+echo -e "$modelHtmlSP" > $mainDir/queries/sp.query
+echo -e "$modelHtmlPO" > $mainDir/queries/po.query
+echo -e "$viewHtml" > $mainDir/html.template
 
 echo $1 created successfully! >&2
diff --git a/utils/modules/create-uri.sh b/utils/modules/create-uri.sh
index f14405f3..cb916463 100755
--- a/utils/modules/create-uri.sh
+++ b/utils/modules/create-uri.sh
@@ -98,8 +98,8 @@ fi
 #Create  file structure
 
 mkdir $mainDir/queries
-echo "$modelHtmlSP" > $mainDir/queries/sp.query
-echo "$modelHtmlPO" > $mainDir/queries/po.query
-echo "$viewHtml" > $mainDir/html.template
+echo -e "$modelHtmlSP" > $mainDir/queries/sp.query
+echo -e "$modelHtmlPO" > $mainDir/queries/po.query
+echo -e "$viewHtml" > $mainDir/html.template
 
 echo $initToken.$1 created/modified successfully! >&2
diff --git a/utils/modules/delete-type.sh b/utils/modules/delete-type.sh
index c934f7e7..9cddaf89 100755
--- a/utils/modules/delete-type.sh
+++ b/utils/modules/delete-type.sh
@@ -2,67 +2,19 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-initToken='type'
+initToken='types'
 
 
 #Check models
-mainModelDir=$DIR/../../models/$initToken.$1
-mainViewDir=$DIR/../../views/$initToken.$1
+mainDir=$DIR/../../components/$initToken/$1
 
-if [ ! -e "$mainModelDir" ]
+if [ ! -e "$mainDir" ]
 then
-  echo "ERROR: $initToken.$1 doesn't exist in models. Operation aborted" >&2
+  echo "ERROR: $initToken/$1 doesn't exist in models. Operation aborted" >&2
   exit 1
 fi
 
-obj=( )
-if [ "$2" == "all" ]
-then
-  rm -rf $mainModelDir
-  rm -rf $mainViewDir
-  echo $initToken.$1 deleted >&2
-  exit
-else
-  obj=( $2 )
-fi
-
-for i in ${obj[@]}
-do
-  if [ ! -e $mainModelDir/$i.queries ]
-  then
-    echo "WARNING: $initToken.$1/$i.query does not exists in models." >&2
-  fi
-done
-
-
-#Check views
-
-if [ ! -e "$mainViewDir" ]
-then
-  echo "ERROR: $initToken.$1 doesn't exist in views. Operation aborted." >&2
-fi
-
-
-for i in ${obj[@]}
-do
-  if [ ! -e $mainViewDir/$i.template ]
-  then
-    echo "WARNING: $mainViewDir/$i.template doesn't exist in views." >&2
-  fi
-done
-
-
 #Delete  file structure
 
-if [ "$2" == "all" ]
-then
-  rm -rf $mainModelDir
-  rm -rf $mainViewDir
-else
-  for i in ${obj[@]}
-  do
-    rm -rf  $mainModelDir/$i.queries
-    rm -rf  $mainViewDir/$i.template   
-  done
-fi
+rm -rf $mainDir
 echo $initToken.$1 deleted successfully! >&2
-- 
GitLab