oslcquery now shows the query url using oslc_config.context parameter…

… if you use the -V option - although it still uses the Configuration.Context header when making the query

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.26.0
+current_version = 0.26.2
 commit = True
 tag = True
 

README.md

@@ -8,7 +8,7 @@
 
  SPDX-License-Identifier: MIT
 
- version="0.26.0"
+ version="0.26.2"
 
 What's New?
 ===========

elmclient/__meta__.py

@@ -9,7 +9,7 @@
 
 app = 'elmoslcquery'
 description = 'Commandline OSLC query for ELM'
-version = '0.26.0'
+version = '0.26.2'
 license = 'MIT'
 author_name = 'Ian Barnard'
 author_mail = 'ian.barnard@uk.ibm.com'

elmclient/oslcqueryapi.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 ##
 
-
+import copy
 import logging
 import re
 import time
@@ -338,7 +338,7 @@ def _evaluate_steps(self, querycapabilityuri,querysteps,*,resultstack=None, sele
 #                    raise Exception( f"Very strange parse result! {step}" )
                 else:
                     # do an actual query
-                    results = self.execute_oslc_query(querycapabilityuri,whereterms=[step], select=select, prefixes=prefixes, orderbys=orderbys, searchterms=searchterms, show_progress=show_progress, maxresults=maxresults, delaybetweenpages=delaybetweenpages, pagesize=pagesize, verbose=verbose, saverawresults=saverawresults, cacheable=cacheable)
+                    results = self.execute_oslc_query(querycapabilityuri,whereterms=[step], select=select, prefixes=prefixes, orderbys=orderbys, searchterms=searchterms, show_progress=show_progress, maxresults=maxresults, delaybetweenpages=delaybetweenpages, pagesize=pagesize, verbose=verbose, saverawresults=saverawresults, cacheable=cacheable, intent="Perform OSLC Query")
                     if isinstance(results, list):
                         resultlist = {}
                         for result in results:
@@ -580,12 +580,15 @@ def _execute_vanilla_oslc_query(self, querycapabilityuri, query_params, orderby=
         params = {}
         params.update(query)
         logger.info( f"The parameters for this query are {params}" )
-
         fullurl = f"{query_url}?{urllib.parse.urlencode( params, quote_via=urllib.parse.quote, safe='/')}"
         if verbose:
             print( f"Full query URL is {fullurl}" )
+            if self.local_config:
+                params1 = copy.copy( params )
+                params1['oslc_config.context'] = self.local_config
+                fullurlparam = f"{query_url}?{urllib.parse.urlencode( params1, quote_via=urllib.parse.quote, safe='/')}"
+                print( f"FYI the query URL with local configuration is {fullurlparam}" )
 
-#        print( f"Full query URL is {fullurl}" )
         # retrieve all pages of results - they will be processed later
         total = 1
         page = 0
@@ -689,7 +692,7 @@ def _execute_vanilla_oslc_query(self, querycapabilityuri, query_params, orderby=
             if delaybetweenpages>0.0:
                 time.sleep(delaybetweenpages)
 
-            # suppress the Configuration-Context header because it seems that
+            # after the first page suppress the Configuration-Context header because it seems that
             # when that and param oslc_config.context are provided they both get added
             # to each nextpage URL which grows ever longer and eventually breaks
             # requests see https://github.com/IBM/ELM-Python-Client/discussions/44#discussioncomment-6151370