diff --git a/utils/lodspk.sh b/utils/lodspk.sh
index bf1504aee8885c5c5765ea6e84e278278dfa2c28..9571fbd34b6f12a1917fcc16ad9ccd8a586bce56 100755
--- a/utils/lodspk.sh
+++ b/utils/lodspk.sh
@@ -40,19 +40,21 @@ if [[ $currentOperation == "create" || $currentOperation == "delete" ]]; then
fi
currentUnit=$3
-
- if [[ ${formats[@]} =~ $4 ]]; then
- currentFormat=$4
- else
- if [ -z "$4" ]; then
- currentFormat="all"
+ currentFormat="html"
+ if [ ! -z "$4" ]; then
+ if [[ ${formats[@]} =~ $4 ]]; then
+ currentFormat=$4
else
echo "Format \"$4\" not valid"
echo $USAGE
exit 1
fi
+ else
+ if [[ $currentOperation == "delete" ]]; then
+ currentFormat="all"
+ fi
fi
- $DIR/modules/create-$currentModule.sh "$currentUnit" "$currentFormat"
+ $DIR/modules/$currentOperation-$currentModule.sh "$currentUnit" "$currentFormat"
fi
## Debug
diff --git a/utils/modules/create-service.sh b/utils/modules/create-service.sh
index d7908926f3ec7da4584095c2333e58a79229de2d..cd29ce9fac0410c36697f20921af1945d43fe221 100755
--- a/utils/modules/create-service.sh
+++ b/utils/modules/create-service.sh
@@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
initToken='service'
-modelHtml=$(cat <<QUERY
+modelHtml=`cat <<QUERY
{%for h in base.header %}
PREFIX {{h.prefix}}: <{{h.ns}}>
{%endfor%}
@@ -13,9 +13,9 @@ SELECT DISTINCT ?resource WHERE {
[] a ?resource .
{%if base.args.arg0 %} } {%endif%}
}
-QUERY)
+QUERY`
-viewHtml=$(cat <<VIEW
+viewHtml=`cat <<VIEW
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
@@ -34,17 +34,17 @@ viewHtml=$(cat <<VIEW
</ul>
</body>
</html>
-VIEW)
+VIEW`
-modelRdf=$(cat <<QUERY
+modelRdf=`cat <<QUERY
DESCRIBE ?resource WHERE {
[] a ?resource .
}
-QUERY)
+QUERY`
-viewRdf=$(cat <<QUERY
+viewRdf=`cat <<QUERY
{{r|safe}}
-QUERY)
+QUERY`
modelTtl=$modelRdf
viewTtl=$viewRdf
diff --git a/utils/modules/create-type.sh b/utils/modules/create-type.sh
index 18a5cff11171effecbce2faaec7ffbf82f4d398b..0f9a552a6a2819f1134cc636e6323804e40892dd 100755
--- a/utils/modules/create-type.sh
+++ b/utils/modules/create-type.sh
@@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
initToken='type'
-modelHtml=$(cat <<QUERY
+modelHtml=`cat <<QUERY
SELECT ?s2 ?p2 ?s1 ?p1 WHERE {
{
GRAPH ?g{
@@ -22,11 +22,10 @@ SELECT ?s2 ?p2 ?s1 ?p1 WHERE {
}
}
}
-QUERY
-)
+QUERY`
-viewHtml=$(cat <<VIEW
+viewHtml=`cat <<VIEW
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
@@ -79,17 +78,17 @@ viewHtml=$(cat <<VIEW
</div>
</body>
</html>
-VIEW)
+VIEW`
-modelRdf=$(cat <<QUERY
+modelRdf=`cat <<QUERY
DESCRIBE ?resource WHERE {
[] a ?resource .
}
-QUERY)
+QUERY`
-viewRdf=$(cat <<VIEW
+viewRdf=`cat <<VIEW
{{models.main|safe}}
-VIEW)
+VIEW`
modelTtl=$modelRdf
viewTtl=$viewRdf
diff --git a/utils/modules/create-uri.sh b/utils/modules/create-uri.sh
index e2587bd7d19ffe686f36f6e7690f47876144b3e1..9eb2dc39ba7a7045f44b2ae147e00fab677d1741 100755
--- a/utils/modules/create-uri.sh
+++ b/utils/modules/create-uri.sh
@@ -4,19 +4,20 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
initToken='uri'
-modelHtml=$(cat <<QUERY
+modelHtml=`cat <<QUERY
SELECT ?s2 ?p2 ?s1 ?p1 WHERE {
+ GRAPH ?g{
{
<{{uri}}> ?s1 ?p1 .
}UNION{
?s2 ?p2 <{{uri}}> .
}
+ }
}
-QUERY
-)
+QUERY`
-viewHtml=$(cat <<VIEW
+viewHtml=`cat <<VIEW
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
@@ -67,17 +68,17 @@ viewHtml=$(cat <<VIEW
</div>
</body>
</html>
-VIEW)
+VIEW`
-modelRdf=$(cat <<QUERY
+modelRdf=`cat <<QUERY
DESCRIBE ?resource WHERE {
[] a ?resource .
}
-QUERY)
+QUERY`
-viewRdf=$(cat <<VIEW
+viewRdf=`cat <<VIEW
{{r|safe}}
-VIEW)
+VIEW`
modelTtl=$modelRdf
viewTtl=$viewRdf
diff --git a/utils/modules/delete-service.sh b/utils/modules/delete-service.sh
index 780ebab235081cc7386e529afdedf673b604d9e4..0adc58c37b811dd76647fffbf6ebd8442d625278 100755
--- a/utils/modules/delete-service.sh
+++ b/utils/modules/delete-service.sh
@@ -7,6 +7,7 @@ initToken='service'
#Check models
mainModelDir=$DIR/../../models/$initToken.$1
+mainViewDir=$DIR/../../views/$initToken.$1
if [ ! -e "$mainModelDir" ]
then
@@ -17,7 +18,10 @@ fi
obj=( )
if [ "$2" == "all" ]
then
- obj=( html rdf ttl nt json )
+ rm -rf $mainModelDir
+ rm -rf $mainViewDir
+ echo $initToken.$1 deleted >&2
+ exit
else
obj=( $2 )
fi
@@ -32,7 +36,6 @@ done
#Check views
-mainViewDir=$DIR/../../views/$initToken.$1
if [ ! -e "$mainViewDir" ]
then
@@ -62,4 +65,4 @@ else
rm -rf $mainViewDir/$i.template
done
fi
-echo $initToken.$1 deleted successfully! >&2
+echo $initToken.$1 deleted >&2
diff --git a/utils/modules/delete-type.sh b/utils/modules/delete-type.sh
index 877d3c99a927316600acf5f3c569b3340d18d630..c934f7e7e41c6c403d48b3a819046409005e09e5 100755
--- a/utils/modules/delete-type.sh
+++ b/utils/modules/delete-type.sh
@@ -7,6 +7,7 @@ initToken='type'
#Check models
mainModelDir=$DIR/../../models/$initToken.$1
+mainViewDir=$DIR/../../views/$initToken.$1
if [ ! -e "$mainModelDir" ]
then
@@ -17,7 +18,10 @@ fi
obj=( )
if [ "$2" == "all" ]
then
- obj=( html rdf ttl nt json )
+ rm -rf $mainModelDir
+ rm -rf $mainViewDir
+ echo $initToken.$1 deleted >&2
+ exit
else
obj=( $2 )
fi
@@ -32,7 +36,6 @@ done
#Check views
-mainViewDir=$DIR/../../views/$initToken.$1
if [ ! -e "$mainViewDir" ]
then
diff --git a/utils/modules/delete-uri.sh b/utils/modules/delete-uri.sh
index eaf82c3c06e3c62cacd542536575d2cbaa19d530..a247cb67e549a446bac6675a0bf68a298f0d5bf4 100755
--- a/utils/modules/delete-uri.sh
+++ b/utils/modules/delete-uri.sh
@@ -7,6 +7,7 @@ initToken='uri'
#Check models
mainModelDir=$DIR/../../models/$initToken.$1
+mainViewDir=$DIR/../../views/$initToken.$1
if [ ! -e "$mainModelDir" ]
then
@@ -17,7 +18,10 @@ fi
obj=( )
if [ "$2" == "all" ]
then
- obj=( html rdf ttl nt json )
+ rm -rf $mainModelDir
+ rm -rf $mainViewDir
+ echo $initToken.$1 deleted >&2
+ exit
else
obj=( $2 )
fi
@@ -32,7 +36,6 @@ done
#Check views
-mainViewDir=$DIR/../../views/$initToken.$1
if [ ! -e "$mainViewDir" ]
then