fixes for reqif export not saving file

Author: barny

elmclient/__init__.py

@@ -17,6 +17,7 @@
 from ._qm import *
 from ._relm import *
 from .__meta__ import *
+from .httpops import *
 
 __app__ = __meta__.app
 __version__ = __meta__.version

elmclient/_project.py

@@ -170,7 +170,7 @@ def _get_request(self, verb, reluri='', *, params=None, headers=None, data=None)
         if headers is not None:
             fullheaders.update(headers)
         sortedparams = None if params is None else {k:params[k] for k in sorted(params.keys())}
-        request = httpops.HttpRequest( self.app.server._session, verb, self.reluri(reluri), params=sortedparams, headers=fullheaders, data=data)
+        request = httpops.HttpRequest( self.app.server._session, verb, self.reluri(reluri), params=sortedparams, headers=fullheaders, data=data )
         return request
 
     @property

elmclient/_queryparser.py

@@ -515,6 +515,7 @@ def inop(self, s):
 
     def scoped_term(self, s):
         logger.info( f"scoped_term {s=}" )
+        print( f"scoped_term {s=}" )
         return [s[0], "scope", s[1:]]
 
 # from https://tools.oasis-open.org/version-control/svn/oslc-core/trunk/specs/oslc-core.html#selectiveProperties
@@ -526,9 +527,13 @@ def scoped_term(self, s):
 dottedname      : NAME "." NAME
 nested_prop     : (identifier | wildcard) "{" properties "}"
 wildcard        : "*"
-identifier      : ( ( URI_REF_ESC | NAME ) ":" )? NAME
+
+identifier     : ( ( URI_REF_ESC | NAME | "'" SPACYNAME "'" ) ":" )? NAME
+                    | "'" SPACYNAME "'"
+
 URI_REF_ESC     : /<https?:.*>/
 NAME            : /[a-zA-Z0-9_]\w*/
+SPACYNAME           : /[a-zA-Z0-9_][^']*/
 """
 
 _orderby_grammar = """

elmclient/examples/dn_simple_typesystemimport.py

@@ -122,12 +122,12 @@
     if response.status_code == 202 and location is not None:
         # wait for the tracker to finished
         result = tgt_c.wait_for_tracker( location, interval=1.0, progressbar=True, msg=f"Importing typesystem")
-                
+        # TODO: success result is now the xml of the verdict       
         # result None is a success!
-        if result is not None:
-            print( f"Result={result}" )
+        if result is not None and type(result) is not string:
+            print( f"Failed Result={result}" )
         else:
-            print( f"Result is None" )
+            print( f"Success! {result=}" )
     else:
         raise Exception( "Typesystem import failed!" )
 

elmclient/examples/reqif_io.py

@@ -113,6 +113,8 @@ def reqif_main():
 
     parser_delete.add_argument('definitionnames',nargs='*',default=[],help='One or more names of export definitions to delete - this can be a regex where . matches any character, etc. If you want the regex to match a complete name put ^ at the start and $ at the end')
     parser_delete.add_argument('-n', '--noconfirm', action='store_true', help="Don't prompt to confirm each delete (DANGEROUS!)")
+    parser_delete.add_argument('-x', '--exception', action='store_true', help="Don't raise an exception if definition doesn't exist")
+    
 
     args = parser.parse_args()
 
@@ -398,7 +400,7 @@ def getmatchingdefs(alldefs,definitionnames):
                 else:
                     raise Exception( "Odd response to export command, no Location" )
 
-                if args.delaybetween>0:
+                if len(matches)>1 and args.delaybetween>0:
                     print( "Delaying between exports" )
                     time.sleep(args.delaybetween)
 
@@ -629,30 +631,37 @@ def getmatchingdefs(alldefs,definitionnames):
                     reffound = False
                     for ref in allrefs:
                         logger.debug( f"{ref=}" )
+                        print( f"{ref=}" )
                         if utils.isint(ref):
                             # search for an id
                             if ref in ids:
                                 if ids[ref] not in artincs:
                                     artincs.append(ids[ref])
+                                    print( f"Added module {ref}" )
                                     continue
                         else:
-                            # search for regex match
+                            # search for literal name or a regex match
                             if re.match(r'^[a-zA-Z0-9 _]+$', ref ):
+                                # literal match
+                                print( f"nre {ref}" )
                                 logger.debug( f"nre" )
                                 # pure string match
                                 # try regex match
                                 for k,v in allmodules.items():
                                     if v.get( 'dcterms:title' ) == ref:
                                         if k not in artincs:
                                             artincs.append(k)
+                                            print( f"Added module {ref}" )
                                             continue
                             else:
                                 logger.debug( f"re" )
+                                print( f"re {ref}" )
                                 # try regex match
                                 for k,v in allmodules.items():
                                     if re.search( ref, v.get( 'dcterms:title' ), re.IGNORECASE ):
                                         if k not in artincs:
                                             artincs.append(k)
+                                            print( f"Added module matching {v.get( 'dcterms:title' )} re {ref}" )
                                             continue
                         if not artincs:
                             raise Exception( f"No modules found for {ref}!" )
@@ -755,8 +764,10 @@ def getmatchingdefs(alldefs,definitionnames):
         if args.definitionnames:
             rawmatches = getmatchingdefs(alldefs,args.definitionnames )
             if not rawmatches[0]:
-                raise Exception( f"Definition {args.definitionnames} not found" )
-                burp
+                if not args.exception:
+                    raise Exception( f"Definition {args.definitionnames} not found" )
+                print( f"No definitions matching {args.definitionnames} found - exception suppressed so this isn't a failure" )
+                return
             # merge all the matches so only get reported once
             matches = {}
             for match in rawmatches:
@@ -765,7 +776,10 @@ def getmatchingdefs(alldefs,definitionnames):
             raise Exception( "No definition name provided!" )
 
         if not matches:
-            raise Exception( f"Definitions {args.definitionnames} not found" )
+            if not args.exception:
+                raise Exception( f"Definitions {args.definitionnames} not found" )
+            print( f"No definitions matching {args.definitionnames} found - exception suppressed so this isn't a failure" )
+            return
 
         for k in sorted(matches.keys(),key= lambda k: matches[k]['dcterms:title']):
             print( f"Deleting {matches[k]['dcterms:title']}" )

elmclient/httpops.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: MIT
 ##
 
-
 import codecs
 import html.parser
 import http
@@ -253,6 +252,8 @@ def wait_for_tracker( self, location, *, interval=1.0, progressbar=False, msg='W
                     status = rdfxml.xmlrdf_get_resource_text( response_x, ".//oslc:statusCode" ) or "NO STATUS CODE"
                     message = rdfxml.xmlrdf_get_resource_text( response_x, ".//oslc:message" ) or "NO MESSAGE"
                     verdict = f"{status} {message}"
+                else:
+                    verdict = response_x
                 break
             time.sleep( interval )
         if progressbar:
@@ -286,7 +287,14 @@ def _get_delete_request(self, reluri='', *, params=None, headers=None ):
 
 class HttpRequest():
     def __init__(self, session, verb, uri, *, params=None, headers=None, data=None):
-        self._req = requests.Request( verb,uri, params=params, headers=headers, data=data )
+        # Requests encoding of parameters uses + for space - we need it to use %20!
+        if params:
+            paramstring = f"?{urllib.parse.urlencode( params, quote_via=urllib.parse.quote, safe='/')}"
+        else:
+            paramstring = ""
+
+#        self._req = requests.Request( verb,uri, params=params, headers=headers, data=data )
+        self._req = requests.Request( verb,uri+paramstring, headers=headers, data=data )
         self._session = session
 
     def get_user_password(self, url=None):

elmclient/oslcqueryapi.py

@@ -374,6 +374,7 @@ def execute_oslc_query(self, querycapabilityuri, *, whereterms=None, select=None
             query_params1 = self.hooks[0](query_params)
         else:
              query_params1 = query_params
+
         results = self._execute_vanilla_oslc_query(querycapabilityuri,query_params1, select=select, prefixes=prefixes, show_progress=show_progress, verbose=verbose, maxresults=maxresults, delaybetweenpages=delaybetweenpages, pagesize=pagesize, intent=intent)
         return results
 
@@ -407,7 +408,7 @@ def _get_query_clauses(self, whereterms, prefixmap):
                 if operator == "scope":
                     # handle nested series of whereterms recursively
                     scopedterm = self._get_query_clauses(value, prefixmap)
-                    clauses.append(f'{tag} {{ {scopedterm} }}')
+                    clauses.append(f'{tag}{{{scopedterm}}}')    # note there are no space chars allowed by the OSLC Query sytax!
                 elif operator == "in":
                     inlist = []
                     for val in value:
@@ -494,6 +495,7 @@ def _execute_vanilla_oslc_query(self, querycapabilityuri, query_params, orderby=
             query_params['oslc.paging'] = 'true'
             query_params['oslc.pageSize'] = str(pagesize) if maxresults is None or ( pagesize>0 and pagesize<maxresults ) else str(maxresults)
 
+
         logger.debug(f"execute_query {query_params} {select}")
         base_uri = querycapabilityuri
         logger.info( f"The base OSLC Query URL is {base_uri}" )
@@ -507,7 +509,9 @@ def _execute_vanilla_oslc_query(self, querycapabilityuri, query_params, orderby=
         url_parts[4] = ""
         url_parts[5] = ""
         # reconstruct just the base scheme:hostname
+        # inisists on using + instead of %20!
         query_url = urllib.parse.urlunparse(url_parts)
+        
         logger.info( f"The full OSLC Query URL is {query_url}" )
 
         # in case of paged results, always prepare to collect a list of results
@@ -516,11 +520,11 @@ def _execute_vanilla_oslc_query(self, querycapabilityuri, query_params, orderby=
         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='')}"
+        fullurl = f"{query_url}?{urllib.parse.urlencode( params, quote_via=urllib.parse.quote, safe='/')}"
         if verbose:
             print( f"Full query URL is {fullurl}" )
 #        print( f"Full query URL is {fullurl}" )
-
+#        burp
         # retrieve all pages of results - they will be processed later
         total = 1
         page = 0
@@ -554,7 +558,7 @@ def _execute_vanilla_oslc_query(self, querycapabilityuri, query_params, orderby=
                 # no more results to get
                 break
 
-            # no parameters should be sent on following pages
+            # no parameters should be sent on following pages, they are present in the href link to next page!
             params = None
 
             # work out the url for the next page