Skip to content

Commit 78882c0

Browse files
committed
oslcquery: fixed problem with link columns not being checked correctly for -v/-n
1 parent 185661b commit 78882c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+16953
-15665
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.13.0
2+
current_version = 0.13.2
33
commit = True
44
tag = True
55

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
SPDX-License-Identifier: MIT
1010

11-
version="0.13.0"
11+
version="0.13.2"
1212

1313

1414
Introduction

elmclient/__meta__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
app = 'elmoslcquery'
1111
description = 'Commandline OSLC query for ELM'
12-
version = '0.13.0'
12+
version = '0.13.2'
1313
license = 'MIT'
1414
author_name = 'Ian Barnard'
1515
author_mail = '[email protected]'

elmclient/_queryparser.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
| simpleidentifier
6161
6262
63-
dottedname : ( URI_REF_ESC | NAME | "'"SPACYNAME "'" ) "." ( NAME | "'" SPACYNAME "'" )
63+
dottedname : ( URI_REF_ESC | NAME | "'" SPACYNAME "'" ) "." ( NAME | "'" SPACYNAME "'" )
6464
6565
prefixedname : ( URI_REF_ESC | NAME ) ":" NAME
6666
@@ -86,7 +86,7 @@
8686
8787
URI_REF_ESC : /<https?:.*?>/
8888
89-
SPACYNAME : /[a-zA-Z0-9_][^']*/
89+
SPACYNAME : /[ a-zA-Z0-9_][^']*/
9090
9191
urioffoldername : "$" string_esc
9292
@@ -247,6 +247,7 @@ def term(self, s):
247247
#
248248
if op == "in":
249249
# the "value" is actually a list of values, each of which must be resolved if it is an identifier
250+
print( f"{value=}" )
250251
if not isinstance(value, list):
251252
value = [value]
252253
resultlist = []
@@ -256,7 +257,7 @@ def term(self, s):
256257
if self.resolverobject.resolve_enum_name_to_uri is not None:
257258
result = self.resolverobject.resolve_enum_name_to_uri(val,identifier)
258259
if result is None:
259-
raise Exception(f"List ref {val} not resolved in context {identifier}")
260+
raise Exception(f"List ref '{val}' not resolved in context {identifier}")
260261
resultlist.append("<" + result + ">")
261262
else:
262263
resultlist.append(val)

0 commit comments

Comments
 (0)