Merge branch 'development' into feature/dataset

Conflicts:
	lib/4store.rb

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/4store.rb b/lib/4store.rb
index 24eec80..43e41c8 100644
--- a/lib/4store.rb
+++ b/lib/4store.rb
@@ -49,6 +49,10 @@ module OpenTox
 
       def self.query sparql, mime_type
         if sparql =~ /SELECT/i
+#         return RestClient.get(sparql_uri, :params => { :query => sparql }, :accept => mime_type).body.gsub(/<|>/,'').split("\n") if mime_type == 'application/sparql-results+xml' 
+#         list = RestClient.get(sparql_uri, :params => { :query => sparql }, :accept => "text/plain").body.gsub(/<|>/,'').split("\n")
+#         list.shift 
+#         return list unless mime_type
           case mime_type
           when 'application/sparql-results+xml' 
             RestClient.get(sparql_uri, :params => { :query => sparql }, :accept => mime_type).body