Merge pull request #152 from CLARIAH/dev

fix #150

Author: albertmeronyo

src/gquery.py

@@ -126,12 +126,16 @@ def get_parameters(rq, variables, endpoint, query_metadata, auth=None):
             vtype = 'string'
             vlang = None
             vdatatype = None
+            vformat = None
 
             mtype = match.group('type')
             muserdefined = match.group('userdefined')
 
-            if mtype in ['iri','number','literal','string']:
+            if mtype in ['number','literal','string']:
                 vtype = mtype
+            if mtype in ['iri']: #TODO: proper form validation of input parameter uris
+                vtype = 'string'
+                vformat = 'iri'
             elif mtype:
                 vtype = 'string'
 
@@ -149,7 +153,8 @@ def get_parameters(rq, variables, endpoint, query_metadata, auth=None):
                 'enum': sorted(vcodes),
                 'type': vtype,
                 'datatype': vdatatype,
-                'lang': vlang
+                'lang': vlang,
+                'format': vformat
             }
 
             glogger.info('Finished parsing the following parameters: {}'.format(parameters))
@@ -327,13 +332,16 @@ def rewrite_query(query, parameters, get_args):
         # If the parameter has a value
         if v:
             # IRI
-            if p['type'] == 'iri':
+            if p['type'] == 'iri': # TODO: never reached anymore, since iris are now type=string with format=iri
                 query = query.replace(p['original'], "{}{}{}".format('<',v,'>'))
             # A number (without a datatype)
             elif p['type'] == 'number':
                 query = query.replace(p['original'], v)
             # Literals
             elif p['type'] == 'literal' or p['type'] == 'string':
+                # If it's a iri
+                if p['format'] == 'iri':
+                    query = query.replace(p['original'], "{}{}{}".format('<',v,'>'))
                 # If there is a language tag
                 if p['lang']:
                     query = query.replace(p['original'], "\"{}\"@{}".format(v, p['lang']))

src/utils.py

@@ -188,6 +188,11 @@ def process_sparql_query_text(query_text, loader, call_name, extraMetadata):
             param['required'] = p['required']
             param['in'] = "query"
             param['description'] = "A value of type {} that will substitute {} in the original query".format(p['type'], p['original'])
+            if p['lang']:
+                param['description'] = "A value of type {}@{} that will substitute {} in the original query".format(p['type'], p['lang'], p['original'])
+            if p['format']:
+                param['format'] = p['format']
+                param['description'] = "A value of type {} ({}) that will substitute {} in the original query".format(p['type'], p['format'], p['original'])
             if p['enum']:
                 param['enum'] = p['enum']
 

tests/test_gquery.py

@@ -42,7 +42,8 @@ def test_get_parameters(self):
 
             orig = param['original']
             if '_iri' in orig:
-                self.assertEqual(param['type'], 'iri', 'Should be type iri')
+                self.assertEqual(param['type'], 'string', 'Should be type string')
+                self.assertEqual(param['format'], 'iri', 'Should be format iri')
             if '_number' in orig:
                 self.assertEqual(param['type'], 'number',
                                  'Should be type number')
@@ -145,7 +146,8 @@ def build_get_parameter(self, origName, rwName):
             'enum': [],
             'type': 'literal',
             'datatype': 'xsd:string',
-            'lang': 'en'
+            'lang': 'en',
+            'format': None
         }
 
     def test_rewrite_query(self):