Skip to content

Commit 88d4605

Browse files
committed
Merge pull request #2355 from om-henners/master
[processing] Update OGR tools
2 parents 1dd8e79 + 524f6ab commit 88d4605

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

python/plugins/processing/algs/gdal/ogrinfo.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828

2929
from processing.core.parameters import ParameterVector
30+
from processing.core.parameters import ParameterBoolean
31+
3032
from processing.core.outputs import OutputHTML
3133

3234
from processing.algs.gdal.GdalUtils import GdalUtils
@@ -36,6 +38,7 @@
3638
class OgrInfo(OgrAlgorithm):
3739

3840
INPUT = 'INPUT'
41+
SUMMARY_ONLY = 'SUMMARY_ONLY'
3942
OUTPUT = 'OUTPUT'
4043

4144
def defineCharacteristics(self):
@@ -44,13 +47,17 @@ def defineCharacteristics(self):
4447

4548
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'),
4649
[ParameterVector.VECTOR_TYPE_ANY], False))
50+
self.addParameter(ParameterBoolean(self.SUMMARY_ONLY,
51+
self.tr('Summary output only'),
52+
True))
4753

4854
self.addOutput(OutputHTML(self.OUTPUT, self.tr('Layer information')))
4955

5056
def getConsoleCommands(self):
5157
arguments = ["ogrinfo"]
5258
arguments.append('-al')
53-
arguments.append('-so')
59+
if self.getParameterValue(self.SUMMARY_ONLY):
60+
arguments.append('-so')
5461
layer = self.getParameterValue(self.INPUT)
5562
conn = self.ogrConnectionString(layer)
5663
arguments.append(conn)

python/plugins/processing/algs/gdal/ogrsql.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,21 @@
2828
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
2929
from processing.core.parameters import ParameterVector
3030
from processing.core.parameters import ParameterString
31+
from processing.core.parameters import ParameterSelection
3132
from processing.core.outputs import OutputVector
3233

3334
from processing.algs.gdal.GdalUtils import GdalUtils
3435
from processing.algs.gdal.OgrAlgorithm import OgrAlgorithm
3536

3637

38+
DIALECTS = [None, 'ogrsql', 'sqlite']
39+
3740
class OgrSql(OgrAlgorithm):
3841

3942
INPUT = 'INPUT'
4043
OUTPUT = 'OUTPUT'
4144
SQL = 'SQL'
45+
DIALECT = 'DIALECT'
4246

4347
def defineCharacteristics(self):
4448
self.name, self.i18n_name = self.trAlgorithm('Execute SQL')
@@ -48,6 +52,12 @@ def defineCharacteristics(self):
4852
[ParameterVector.VECTOR_TYPE_ANY], False))
4953
self.addParameter(ParameterString(self.SQL, self.tr('SQL'), ''))
5054

55+
self.addParameter(ParameterSelection(
56+
self.DIALECT,
57+
self.tr('Dialect'),
58+
DIALECTS)
59+
)
60+
5161
self.addOutput(OutputVector(self.OUTPUT, self.tr('SQL result')))
5262

5363
def getConsoleCommands(self):
@@ -60,6 +70,13 @@ def getConsoleCommands(self):
6070
arguments.append('-sql')
6171
arguments.append(sql)
6272

73+
dialectIdx = self.getParameterValue(self.DIALECT)
74+
dialect = DIALECTS[dialectIdx]
75+
76+
if dialect:
77+
arguments.append("-dialect")
78+
arguments.append(dialect)
79+
6380
output = self.getOutputFromName(self.OUTPUT)
6481
outFile = output.value
6582
arguments.append(outFile)

0 commit comments

Comments
 (0)