Merge pull request #674 from gloucklegnou/master

update of mica permanents URI
perma-id · May 15, 2017 · d58223a · d58223a
2 parents 84aa5ae + 0841a9c
commit d58223a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 28 deletions.
diff --git a/mica/ontology/.htaccess b/mica/ontology/.htaccess
@@ -12,66 +12,78 @@ RewriteEngine on
 ####################################################################################
 #                  MICAModel rules for web negociation                             #
 ####################################################################################
-#Rewrite rules for MicaModel HTML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml)
+#Rewrite rules for MicaModel HTML content from the vocabulary URI if requested 
+RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml) 
 RewriteCond %{HTTP_ACCEPT} text/html [OR]
 RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR]
-RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.*
+RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.* 
 RewriteRule ^MicaModel$ http://lig-coin.imag.fr/mica/ontology/MicaModel/MicaModel.html  [R=303,NE,L]
 
 # Rewrite rule to serve directed HTML content from class/prop URIs
-RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml)
+RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml) 
 RewriteCond %{HTTP_ACCEPT} text/html [OR]
 RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR]
-RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.*
+RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.* 
 RewriteRule ^MicaModel#(.+) http://lig-coin.imag.fr/mica/ontology/MicaModel/MicaModel.html#$1 [R=303,NE,L]
 
 # Rewrite rule to serve RDF/XML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} application/rdf\+xml
+RewriteCond %{HTTP_ACCEPT} application/rdf\+xml 
 RewriteRule ^MicaModel$ http://lig-coin.imag.fr/mica/ontology/MicaModel/MicaModel.rdf [R=303,NE,L]
 
 # Rewrite rule to serve TURTLE content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} text/turtle
+RewriteCond %{HTTP_ACCEPT} text/turtle  
 RewriteRule ^MicaModel$ http://lig-coin.imag.fr/mica/ontology/MicaModel/MicaModel.ttl [R=303,NE,L]
 
-#default response
+# Rewrite rule to serve TURTLE content from the vocabulary URI if requested
+RewriteCond %{HTTP_ACCEPT} application/json  
+RewriteRule ^MicaModel$ http://lig-coin.imag.fr/mica/ontology/MicaModel/MicaModel.json [R=303,NE,L]
+
+#default response 
 RewriteRule ^MicaModel$ http://lig-coin.imag.fr/mica/ontology/MicaModel/MicaModel.rdf [R=303,NE,L]
 
 
 ####################################################################################
 #                  MICAOntology rules for web negociation                          #
 ####################################################################################
-#Rewrite rules for MICAOntology HTML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml)
+#Rewrite rules for MICAOntology HTML content from the vocabulary URI if requested 
+RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml) 
 RewriteCond %{HTTP_ACCEPT} text/html [OR]
 RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR]
-RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.*
+RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.* 
 RewriteRule ^MicaOntology/$ http://lig-coin.imag.fr/mica/ontology/MicaOntology/MicaOntology.html  [R=303,NE,L]
 
 # Rewrite rule to serve directed HTML content from class/prop URIs
-RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml)
-RewriteCond %{HTTP_ACCEPT} text/html [OR]
-RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR]
-RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.*
-RewriteRule ^MicaOntology/(.+) http://lig-coin.imag.fr/MICAURI/ontology/page/$1  [R=303,NE,L]
+RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml) 
+RewriteCond %{HTTP_ACCEPT} text/html [OR] 
+RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR] 
+RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.* 
+RewriteRule ^MicaOntology/(.+) http://lig-coin.imag.fr/MICAURI/ontology/page/$1  [R=303,NE,L] 
 
 # Rewrite rule to serve RDF/XML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} application/rdf\+xml
+RewriteCond %{HTTP_ACCEPT} application/rdf\+xml 
 RewriteRule ^MicaOntology/$ http://lig-coin.imag.fr/mica/ontology/MicaOntology/MicaOntology.rdf [R=303,NE,L]
 
 # Rewrite rule to serve RDF/XML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} application/rdf\+xml
+RewriteCond %{HTTP_ACCEPT} application/rdf\+xml 
 RewriteRule ^MicaOntology/(.+) http://lig-coin.imag.fr/MICAURI/ontology/data/$1?type=rdf  [R=303,NE,L]
 
-# Rewrite rule to serve RDF/XML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} text/turtle
+# Rewrite rule to serve Turtle content from the vocabulary URI if requested
+RewriteCond %{HTTP_ACCEPT} text/turtle  
 RewriteRule ^MicaOntology/(.+) http://lig-coin.imag.fr/MICAURI/ontology/data/$1?type=rdf  [R=303,NE,L]
 
+# Rewrite rule to serve JSON content from the vocabulary URI if requested
+RewriteCond %{HTTP_ACCEPT} application/json 
+RewriteRule ^MicaOntology/(.+) http://lig-coin.imag.fr/MICAURI/ontology/data/$1?type=json  [R=303,NE,L]
+
 # Rewrite rule to serve TURTLE content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} text/turtle
+RewriteCond %{HTTP_ACCEPT} text/turtle  
 RewriteRule ^MicaOntology/$ http://lig-coin.imag.fr/mica/ontology/MicaOntology/MicaOntology.ttl [R=303,NE,L]
 
-#default response
+# Rewrite rule to serve TURTLE content from the vocabulary URI if requested
+RewriteCond %{HTTP_ACCEPT} application/json 
+RewriteRule ^MicaOntology/$ http://lig-coin.imag.fr/mica/ontology/MicaOntology/MicaOntology.json [R=303,NE,L]
+
+#default response 
 RewriteRule ^MicaOntology/$ http://lig-coin.imag.fr/mica/ontology/MicaOntology/MicaOntology.rdf [R=303,NE,L]
 
 

diff --git a/mica/resource/.htaccess b/mica/resource/.htaccess
@@ -12,20 +12,24 @@ RewriteEngine on
 ####################################################################################
 #                  Resource rules for web negociation                             #
 ####################################################################################
-#Rewrite rules for Resource HTML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml)
+#Rewrite rules for Resource HTML content from the vocabulary URI if requested 
+RewriteCond %{HTTP_ACCEPT} !application/rdf\+xml.*(text/html|application/xhtml\+xml) 
 RewriteCond %{HTTP_ACCEPT} text/html [OR]
 RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR]
-RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.*
+RewriteCond %{HTTP_USER_AGENT} ^Mozilla/.* 
 RewriteRule ^(.+) http://lig-coin.imag.fr/MICAURI/resource/page/$1  [R=303,NE,L]
 
 # Rewrite rule to serve RDF/XML content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} application/rdf\+xml
+RewriteCond %{HTTP_ACCEPT} application/rdf\+xml 
 RewriteRule ^(.+) http://lig-coin.imag.fr/MICAURI/resource/data/$1?type=rdf  [R=303,NE,L]
 
 # Rewrite rule to serve TURTLE content from the vocabulary URI if requested
-RewriteCond %{HTTP_ACCEPT} text/turtle
+RewriteCond %{HTTP_ACCEPT} text/turtle 
 RewriteRule ^(.+) http://lig-coin.imag.fr/MICAURI/resource/data/$1?type=ttl  [R=303,NE,L]
 
-#default response
+# Rewrite rule to serve json content from the vocabulary URI if requested
+RewriteCond %{HTTP_ACCEPT} application/json 
+RewriteRule ^(.+) http://lig-coin.imag.fr/MICAURI/resource/data/$1?type=json  [R=303,NE,L]
+
+#default response 
 RewriteRule ^(.+) http://lig-coin.imag.fr/MICAURI/resource/data/$1?type=rdf  [R=303,NE,L]