sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix some processing/ogr tools

Browse Source
This commit is contained in:
Giovanni Manghi 2015-09-22 23:03:12 +01:00
parent 6a6adc9a98
commit 9cb18c6f39
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
View File

@ -60,7 +60,6 @@ class Ogr2OgrClipExtent(OgrAlgorithm):
inLayer = self.getParameterValue(self.INPUT_LAYER) inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = self.ogrConnectionString(inLayer)[1:-1] ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
clipExtent = self.getParameterValue(self.CLIP_EXTENT) clipExtent = self.getParameterValue(self.CLIP_EXTENT)
ogrclipExtent = self.ogrConnectionString(clipExtent)
output = self.getOutputFromName(self.OUTPUT_LAYER) output = self.getOutputFromName(self.OUTPUT_LAYER)
outFile = output.value outFile = output.value
@ -69,7 +68,7 @@ class Ogr2OgrClipExtent(OgrAlgorithm):
options = unicode(self.getParameterValue(self.OPTIONS)) options = unicode(self.getParameterValue(self.OPTIONS))
arguments = [] arguments = []
regionCoords = ogrclipExtent.split(',') regionCoords = clipExtent.split(',')
arguments.append('-spat') arguments.append('-spat')
arguments.append(regionCoords[0]) arguments.append(regionCoords[0])
arguments.append(regionCoords[2]) arguments.append(regionCoords[2])

7
python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
View File

@ -123,7 +123,6 @@ class Ogr2OgrTableToPostGisList(OgrAlgorithm):
inLayer = self.getParameterValue(self.INPUT_LAYER) inLayer = self.getParameterValue(self.INPUT_LAYER)
ogrLayer = self.ogrConnectionString(inLayer)[1:-1] ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
schema = unicode(self.getParameterValue(self.SCHEMA)) schema = unicode(self.getParameterValue(self.SCHEMA))
schemastring = "-lco SCHEMA=" + schema
table = unicode(self.getParameterValue(self.TABLE)) table = unicode(self.getParameterValue(self.TABLE))
pk = unicode(self.getParameterValue(self.PK)) pk = unicode(self.getParameterValue(self.PK))
pkstring = "-lco FID=" + pk pkstring = "-lco FID=" + pk
@ -153,6 +152,10 @@ class Ogr2OgrTableToPostGisList(OgrAlgorithm):
arguments.append('dbname=' + dbname) arguments.append('dbname=' + dbname)
if len(password) > 0: if len(password) > 0:
arguments.append('password=' + password) arguments.append('password=' + password)
if len(schema) > 0:
arguments.append('active_schema=' + schema)
else:
arguments.append('active_schema=public')
arguments.append('user=' + user + '"') arguments.append('user=' + user + '"')
arguments.append(ogrLayer) arguments.append(ogrLayer)
arguments.append('-nlt NONE') arguments.append('-nlt NONE')
@ -165,8 +168,6 @@ class Ogr2OgrTableToPostGisList(OgrAlgorithm):
arguments.append('-addfields') arguments.append('-addfields')
if overwrite: if overwrite:
arguments.append('-overwrite') arguments.append('-overwrite')
if len(schema) > 0:
arguments.append(schemastring)
if len(pk) > 0: if len(pk) > 0:
arguments.append(pkstring) arguments.append(pkstring)
elif primary_key is not None: elif primary_key is not None:

10
python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
View File

@ -161,7 +161,6 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
dbname = unicode(self.getParameterValue(self.DBNAME)) dbname = unicode(self.getParameterValue(self.DBNAME))
password = unicode(self.getParameterValue(self.PASSWORD)) password = unicode(self.getParameterValue(self.PASSWORD))
schema = unicode(self.getParameterValue(self.SCHEMA)) schema = unicode(self.getParameterValue(self.SCHEMA))
schemastring = "-lco SCHEMA=" + schema
table = unicode(self.getParameterValue(self.TABLE)) table = unicode(self.getParameterValue(self.TABLE))
pk = unicode(self.getParameterValue(self.PK)) pk = unicode(self.getParameterValue(self.PK))
pkstring = "-lco FID=" + pk pkstring = "-lco FID=" + pk
@ -173,7 +172,6 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
simplify = unicode(self.getParameterValue(self.SIMPLIFY)) simplify = unicode(self.getParameterValue(self.SIMPLIFY))
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
spat = self.getParameterValue(self.SPAT) spat = self.getParameterValue(self.SPAT)
ogrspat = self.ogrConnectionString(spat)
clip = self.getParameterValue(self.CLIP) clip = self.getParameterValue(self.CLIP)
where = unicode(self.getParameterValue(self.WHERE)) where = unicode(self.getParameterValue(self.WHERE))
wherestring = '-where "' + where + '"' wherestring = '-where "' + where + '"'
@ -201,6 +199,10 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
arguments.append('dbname=' + dbname) arguments.append('dbname=' + dbname)
if len(password) > 0: if len(password) > 0:
arguments.append('password=' + password) arguments.append('password=' + password)
if len(schema) > 0:
arguments.append('active_schema=' + schema)
else:
arguments.append('active_schema=public')
arguments.append('user=' + user + '"') arguments.append('user=' + user + '"')
arguments.append(dimstring) arguments.append(dimstring)
arguments.append(ogrLayer) arguments.append(ogrLayer)
@ -218,8 +220,6 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
if len(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) > 0: if len(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) > 0:
arguments.append('-nlt') arguments.append('-nlt')
arguments.append(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) arguments.append(self.GEOMTYPE[self.getParameterValue(self.GTYPE)])
if len(schema) > 0:
arguments.append(schemastring)
if len(geocolumn) > 0: if len(geocolumn) > 0:
arguments.append(geocolumnstring) arguments.append(geocolumnstring)
if len(pk) > 0: if len(pk) > 0:
@ -239,7 +239,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm):
arguments.append('-a_srs') arguments.append('-a_srs')
arguments.append(asrs) arguments.append(asrs)
if len(spat) > 0: if len(spat) > 0:
regionCoords = ogrspat.split(',') regionCoords = spat.split(',')
arguments.append('-spat') arguments.append('-spat')
arguments.append(regionCoords[0]) arguments.append(regionCoords[0])
arguments.append(regionCoords[2]) arguments.append(regionCoords[2])

10
python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
View File

@ -167,7 +167,6 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
tsrs = unicode(self.getParameterValue(self.T_SRS)) tsrs = unicode(self.getParameterValue(self.T_SRS))
asrs = unicode(self.getParameterValue(self.A_SRS)) asrs = unicode(self.getParameterValue(self.A_SRS))
schema = unicode(self.getParameterValue(self.SCHEMA)) schema = unicode(self.getParameterValue(self.SCHEMA))
schemastring = "-lco SCHEMA=" + schema
table = unicode(self.getParameterValue(self.TABLE)) table = unicode(self.getParameterValue(self.TABLE))
pk = unicode(self.getParameterValue(self.PK)) pk = unicode(self.getParameterValue(self.PK))
pkstring = "-lco FID=" + pk pkstring = "-lco FID=" + pk
@ -179,7 +178,6 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
simplify = unicode(self.getParameterValue(self.SIMPLIFY)) simplify = unicode(self.getParameterValue(self.SIMPLIFY))
segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) segmentize = unicode(self.getParameterValue(self.SEGMENTIZE))
spat = self.getParameterValue(self.SPAT) spat = self.getParameterValue(self.SPAT)
ogrspat = self.ogrConnectionString(spat)
clip = self.getParameterValue(self.CLIP) clip = self.getParameterValue(self.CLIP)
where = unicode(self.getParameterValue(self.WHERE)) where = unicode(self.getParameterValue(self.WHERE))
wherestring = '-where "' + where + '"' wherestring = '-where "' + where + '"'
@ -207,6 +205,10 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
arguments.append('dbname=' + dbname) arguments.append('dbname=' + dbname)
if len(password) > 0: if len(password) > 0:
arguments.append('password=' + password) arguments.append('password=' + password)
if len(schema) > 0:
arguments.append('active_schema=' + schema)
else:
arguments.append('active_schema=public')
arguments.append('user=' + user + '"') arguments.append('user=' + user + '"')
arguments.append(dimstring) arguments.append(dimstring)
arguments.append(ogrLayer) arguments.append(ogrLayer)
@ -224,8 +226,6 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
if len(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) > 0: if len(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) > 0:
arguments.append('-nlt') arguments.append('-nlt')
arguments.append(self.GEOMTYPE[self.getParameterValue(self.GTYPE)]) arguments.append(self.GEOMTYPE[self.getParameterValue(self.GTYPE)])
if len(schema) > 0:
arguments.append(schemastring)
if len(geocolumn) > 0: if len(geocolumn) > 0:
arguments.append(geocolumnstring) arguments.append(geocolumnstring)
if len(pk) > 0: if len(pk) > 0:
@ -245,7 +245,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm):
arguments.append('-a_srs') arguments.append('-a_srs')
arguments.append(asrs) arguments.append(asrs)
if len(spat) > 0: if len(spat) > 0:
regionCoords = ogrspat.split(',') regionCoords = spat.split(',')
arguments.append('-spat') arguments.append('-spat')
arguments.append(regionCoords[0]) arguments.append(regionCoords[0])
arguments.append(regionCoords[2]) arguments.append(regionCoords[2])