From af5dd72c53b957dfc64264f2697108d7154ce074 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@graves.cl>
Date: Tue, 11 Jun 2013 23:06:11 -0700
Subject: [PATCH] Types will be defined by replacing ":" by "__" for
compatibility reasons.
Currently, both formats are supported for backwards compatibility
---
classes/modules/typeModule.php | 2 ++
.../types/{rdfs:Resource => rdfs__Resource}/html.template | 0
.../{rdfs:Resource => rdfs__Resource}/queries/po.query | 0
.../{rdfs:Resource => rdfs__Resource}/queries/sp.query | 0
utils/modules/create-type.sh | 8 ++++----
5 files changed, 6 insertions(+), 4 deletions(-)
rename doc/examples/originalComponents/types/{rdfs:Resource => rdfs__Resource}/html.template (100%)
rename doc/examples/originalComponents/types/{rdfs:Resource => rdfs__Resource}/queries/po.query (100%)
rename doc/examples/originalComponents/types/{rdfs:Resource => rdfs__Resource}/queries/sp.query (100%)
diff --git a/classes/modules/typeModule.php b/classes/modules/typeModule.php
index 29ef32a9..eb8116be 100644
--- a/classes/modules/typeModule.php
+++ b/classes/modules/typeModule.php
@@ -126,8 +126,10 @@ class TypeModule extends abstractModule{
foreach($t as $v){
$curie = Utils::uri2curie($v);
$typesAndValues[$curie] = 0;
+ $typesAndValues[str_replace(":", "__", $curie)] = 0;
if(isset($conf['type']['priority'][$curie]) && $conf['type']['priority'][$curie] >= 0){
$typesAndValues[$curie] = $conf['type']['priority'][$curie];
+ $typesAndValues[str_replace(":", "__", $curie)] = $conf['type']['priority'][$curie];
}
}
}
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/html.template b/doc/examples/originalComponents/types/rdfs__Resource/html.template
similarity index 100%
rename from doc/examples/originalComponents/types/rdfs:Resource/html.template
rename to doc/examples/originalComponents/types/rdfs__Resource/html.template
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/queries/po.query b/doc/examples/originalComponents/types/rdfs__Resource/queries/po.query
similarity index 100%
rename from doc/examples/originalComponents/types/rdfs:Resource/queries/po.query
rename to doc/examples/originalComponents/types/rdfs__Resource/queries/po.query
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query b/doc/examples/originalComponents/types/rdfs__Resource/queries/sp.query
similarity index 100%
rename from doc/examples/originalComponents/types/rdfs:Resource/queries/sp.query
rename to doc/examples/originalComponents/types/rdfs__Resource/queries/sp.query
diff --git a/utils/modules/create-type.sh b/utils/modules/create-type.sh
index 87b909d6..8e25073c 100755
--- a/utils/modules/create-type.sh
+++ b/utils/modules/create-type.sh
@@ -5,13 +5,13 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
initToken='types'
cd $DIR
-
+componentName=${1/\:/__}
#Check models
-mainDir=$DIR/../../components/$initToken/$1/
+mainDir=$DIR/../../components/$initToken/$componentName/
if [ -e "$mainDir" ]
then
- echo "ERROR: This type $1 already exists." >&2
+ echo "ERROR: This type $componentName already exists." >&2
exit 1
else
mkdir -p $mainDir
@@ -19,4 +19,4 @@ fi
cp -rf ../defaults/type/* $mainDir/
-echo $1 created successfully! >&2
+echo $componentName created successfully! >&2
--
GitLab