Skip to content

Commit bdb8b0c

Browse files
alexbruyalexbruy
committed
Merge pull request #2332 from NaturalGIS/fix_ogr_tools
[processing] fix some OGR-based tools
2 parents 4dd6d67 + 9cb18c6 commit bdb8b0c

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎python/plugins/processing/algs/gdal/ogr2ogrclipextent.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ def getConsoleCommands(self):
6060
inLayer = self.getParameterValue(self.INPUT_LAYER)
6161
ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
6262
clipExtent = self.getParameterValue(self.CLIP_EXTENT)
63-
ogrclipExtent = self.ogrConnectionString(clipExtent)
6463

6564
output = self.getOutputFromName(self.OUTPUT_LAYER)
6665
outFile = output.value
@@ -69,7 +68,7 @@ def getConsoleCommands(self):
6968
options = unicode(self.getParameterValue(self.OPTIONS))
7069

7170
arguments = []
72-
regionCoords = ogrclipExtent.split(',')
71+
regionCoords = clipExtent.split(',')
7372
arguments.append('-spat')
7473
arguments.append(regionCoords[0])
7574
arguments.append(regionCoords[2])

‎python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ def getConsoleCommands(self):
123123
inLayer = self.getParameterValue(self.INPUT_LAYER)
124124
ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
125125
schema = unicode(self.getParameterValue(self.SCHEMA))
126-
schemastring = "-lco SCHEMA=" + schema
127126
table = unicode(self.getParameterValue(self.TABLE))
128127
pk = unicode(self.getParameterValue(self.PK))
129128
pkstring = "-lco FID=" + pk
@@ -153,6 +152,10 @@ def getConsoleCommands(self):
153152
arguments.append('dbname=' + dbname)
154153
if len(password) > 0:
155154
arguments.append('password=' + password)
155+
if len(schema) > 0:
156+
arguments.append('active_schema=' + schema)
157+
else:
158+
arguments.append('active_schema=public')
156159
arguments.append('user=' + user + '"')
157160
arguments.append(ogrLayer)
158161
arguments.append('-nlt NONE')
@@ -165,8 +168,6 @@ def getConsoleCommands(self):
165168
arguments.append('-addfields')
166169
if overwrite:
167170
arguments.append('-overwrite')
168-
if len(schema) > 0:
169-
arguments.append(schemastring)
170171
if len(pk) > 0:
171172
arguments.append(pkstring)
172173
elif primary_key is not None:

‎python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ def getConsoleCommands(self):
161161
dbname = unicode(self.getParameterValue(self.DBNAME))
162162
password = unicode(self.getParameterValue(self.PASSWORD))
163163
schema = unicode(self.getParameterValue(self.SCHEMA))
164-
schemastring = "-lco SCHEMA=" + schema
165164
table = unicode(self.getParameterValue(self.TABLE))
166165
pk = unicode(self.getParameterValue(self.PK))
167166
pkstring = "-lco FID=" + pk
@@ -173,7 +172,6 @@ def getConsoleCommands(self):
173172
simplify = unicode(self.getParameterValue(self.SIMPLIFY))
174173
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
175174
spat = self.getParameterValue(self.SPAT)
176-
ogrspat = self.ogrConnectionString(spat)
177175
clip = self.getParameterValue(self.CLIP)
178176
where = unicode(self.getParameterValue(self.WHERE))
179177
wherestring = '-where "' + where + '"'
@@ -201,6 +199,10 @@ def getConsoleCommands(self):
201199
arguments.append('dbname=' + dbname)
202200
if len(password) > 0:
203201
arguments.append('password=' + password)
202+
if len(schema) > 0:
203+
arguments.append('active_schema=' + schema)
204+
else:
205+
arguments.append('active_schema=public')
204206
arguments.append('user=' + user + '"')
205207
arguments.append(dimstring)
206208
arguments.append(ogrLayer)
@@ -218,8 +220,6 @@ def getConsoleCommands(self):
218220
if len(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) > 0:
219221
arguments.append('-nlt')
220222
arguments.append(self.GEOMTYPE[self.getParameterValue(self.GTYPE)])
221-
if len(schema) > 0:
222-
arguments.append(schemastring)
223223
if len(geocolumn) > 0:
224224
arguments.append(geocolumnstring)
225225
if len(pk) > 0:
@@ -239,7 +239,7 @@ def getConsoleCommands(self):
239239
arguments.append('-a_srs')
240240
arguments.append(asrs)
241241
if len(spat) > 0:
242-
regionCoords = ogrspat.split(',')
242+
regionCoords = spat.split(',')
243243
arguments.append('-spat')
244244
arguments.append(regionCoords[0])
245245
arguments.append(regionCoords[2])

‎python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ def getConsoleCommands(self):
167167
tsrs = unicode(self.getParameterValue(self.T_SRS))
168168
asrs = unicode(self.getParameterValue(self.A_SRS))
169169
schema = unicode(self.getParameterValue(self.SCHEMA))
170-
schemastring = "-lco SCHEMA=" + schema
171170
table = unicode(self.getParameterValue(self.TABLE))
172171
pk = unicode(self.getParameterValue(self.PK))
173172
pkstring = "-lco FID=" + pk
@@ -179,7 +178,6 @@ def getConsoleCommands(self):
179178
simplify = unicode(self.getParameterValue(self.SIMPLIFY))
180179
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
181180
spat = self.getParameterValue(self.SPAT)
182-
ogrspat = self.ogrConnectionString(spat)
183181
clip = self.getParameterValue(self.CLIP)
184182
where = unicode(self.getParameterValue(self.WHERE))
185183
wherestring = '-where "' + where + '"'
@@ -207,6 +205,10 @@ def getConsoleCommands(self):
207205
arguments.append('dbname=' + dbname)
208206
if len(password) > 0:
209207
arguments.append('password=' + password)
208+
if len(schema) > 0:
209+
arguments.append('active_schema=' + schema)
210+
else:
211+
arguments.append('active_schema=public')
210212
arguments.append('user=' + user + '"')
211213
arguments.append(dimstring)
212214
arguments.append(ogrLayer)
@@ -224,8 +226,6 @@ def getConsoleCommands(self):
224226
if len(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) > 0:
225227
arguments.append('-nlt')
226228
arguments.append(self.GEOMTYPE[self.getParameterValue(self.GTYPE)])
227-
if len(schema) > 0:
228-
arguments.append(schemastring)
229229
if len(geocolumn) > 0:
230230
arguments.append(geocolumnstring)
231231
if len(pk) > 0:
@@ -245,7 +245,7 @@ def getConsoleCommands(self):
245245
arguments.append('-a_srs')
246246
arguments.append(asrs)
247247
if len(spat) > 0:
248-
regionCoords = ogrspat.split(',')
248+
regionCoords = spat.split(',')
249249
arguments.append('-spat')
250250
arguments.append(regionCoords[0])
251251
arguments.append(regionCoords[2])

0 commit comments

Comments
 (0)