Skip to content

Commit 87e93c1

Browse files
authored
Merge pull request #7307 from rldhont/processing-r-enconde-string-218
[Bugfix][Processing] R script: ParameterString has to be encoding
2 parents 294f8ac + 70e0395 commit 87e93c1

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

python/plugins/processing/algs/r/RAlgorithm.py

+10-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import os
2929
import json
30+
import types
3031

3132
from qgis.PyQt.QtGui import QIcon
3233

@@ -499,12 +500,20 @@ def getImportCommands(self):
499500
commands.append(param.name + '= NULL')
500501
else:
501502
commands.append(param.name + ' = "' + param.value + '"')
502-
elif isinstance(param, (ParameterTableField, ParameterTableMultipleField, ParameterString,
503+
elif isinstance(param, (ParameterTableField, ParameterTableMultipleField,
503504
ParameterFile)):
504505
if param.value is None:
505506
commands.append(param.name + '= NULL')
506507
else:
507508
commands.append(param.name + '="' + param.value + '"')
509+
elif isinstance(param, ParameterString):
510+
if param.value is None:
511+
commands.append(param.name + '= NULL')
512+
elif type(param.value) == types.StringType:
513+
commands.append(param.name + '="' + param.value + '"')
514+
else:
515+
c = unicode(param.name) + u'="' + unicode(param.value) + u'"'
516+
commands.append(c.encode('utf8'))
508517
elif isinstance(param, (ParameterNumber, ParameterSelection)):
509518
if param.value is None:
510519
commands.append(param.name + '= NULL')

0 commit comments

Comments
 (0)