You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/07/12 18:16:31 UTC
[4/6] jena git commit: Deal with a service URL with query string
Deal with a service URL with query string
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/58b6b0e3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/58b6b0e3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/58b6b0e3
Branch: refs/heads/master
Commit: 58b6b0e34e02cd204329a6e1377967b6b1b4c326
Parents: 3bbe2d8
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 12 13:33:57 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 12 13:33:57 2016 +0100
----------------------------------------------------------------------
jena-fuseki2/apache-jena-fuseki/bin/s-delete | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-get | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-head | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-post | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-put | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-query | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-update | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/s-update-form | 9 ++++++++-
jena-fuseki2/apache-jena-fuseki/bin/soh | 9 ++++++++-
9 files changed, 72 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-delete
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-delete b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-delete
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-delete
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-get
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-get b/jena-fuseki2/apache-jena-fuseki/bin/s-get
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-get
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-get
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-head
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-head b/jena-fuseki2/apache-jena-fuseki/bin/s-head
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-head
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-head
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-post
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-post b/jena-fuseki2/apache-jena-fuseki/bin/s-post
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-post
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-post
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-put
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-put b/jena-fuseki2/apache-jena-fuseki/bin/s-put
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-put
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-put
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-query
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-query b/jena-fuseki2/apache-jena-fuseki/bin/s-query
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-query
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-query
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-update
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update b/jena-fuseki2/apache-jena-fuseki/bin/s-update
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
+++ b/jena-fuseki2/apache-jena-fuseki/bin/s-update-form
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results
http://git-wip-us.apache.org/repos/asf/jena/blob/58b6b0e3/jena-fuseki2/apache-jena-fuseki/bin/soh
----------------------------------------------------------------------
diff --git a/jena-fuseki2/apache-jena-fuseki/bin/soh b/jena-fuseki2/apache-jena-fuseki/bin/soh
index 16cb44c..dcafe62 100755
--- a/jena-fuseki2/apache-jena-fuseki/bin/soh
+++ b/jena-fuseki2/apache-jena-fuseki/bin/soh
@@ -462,7 +462,14 @@ def SPARQL_query_GET(service, query, args2)
args = { "query" => query }
args.merge!(args2)
qs=args.collect { |k,v| "#{k}=#{uri_escape(v)}" }.join('&')
- action="#{service}?#{qs}"
+
+ if service.include? "?"
+ then
+ action="#{service}&#{qs}"
+ else
+ action="#{service}?#{qs}"
+ end
+
headers={}
headers.merge!($headers)
headers[$hAccept]=$accept_results