Skip to content

Commit b523c12

Browse files
author
jef
committedDec 13, 2008
mapserver export fix:
- use double quotation marks for postgres layers (fixes #1104) - export original instead of localized unit names git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9782 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

5 files changed

+8
-40
lines changed

5 files changed

+8
-40
lines changed
 

‎python/plugins/mapserver_export/mapserverexport.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def run(self):
8181
exporter = Qgis2Map(str(self.dlg.ui.txtQgisFilePath.text()), str(self.dlg.ui.txtMapFilePath.text()))
8282
print "Setting options"
8383
exporter.setOptions(
84-
self.dlg.ui.cmbMapUnits.currentText(),
84+
self.dlg.ui.cmbMapUnits.itemData( self.dlg.ui.cmbMapUnits.currentIndex() ).toString(),
8585
self.dlg.ui.cmbMapImageType.currentText(),
8686
self.dlg.ui.txtMapName.text(),
8787
self.dlg.ui.txtMapWidth.text(),

‎python/plugins/mapserver_export/mapserverexportdialog.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ def __init__(self):
2727
self.ui = Ui_QgsMapserverExportBase()
2828
self.ui.setupUi(self)
2929

30+
for unit in ["dd", "feet", "meters", "miles", "inches", "kilometers"]:
31+
self.ui.cmbMapUnits.addItem( QtGui.QApplication.translate("QgsMapserverExportBase", unit, None, QtGui.QApplication.UnicodeUTF8), QtCore.QVariant(unit) )
32+
33+

‎python/plugins/mapserver_export/ms_export.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@ def writeMapLayers(self):
323323
# it's a postgis layer
324324
(pgConnString, sqlData, sqlFilter) = self.parsePostgisConnection(dataString)
325325
layer_def += " CONNECTIONTYPE postgis\n"
326-
layer_def += " CONNECTION '" + pgConnString + "'\n"
327-
layer_def += " DATA '" + sqlData + "'\n"
326+
layer_def += " CONNECTION \"" + pgConnString + "\"\n"
327+
layer_def += " DATA \"" + sqlData + "\"\n"
328328
# don't write the filter keyword if there isn't one
329329
if sqlFilter:
330-
layer_def += " FILTER '" + sqlFilter + "'\n"
330+
layer_def += " FILTER \"" + sqlFilter + "\"\n"
331331

332332
elif providerString == 'wms' and lyr.getAttribute("type").encode('utf-8').upper() == 'RASTER':
333333
# it's a WMS layer

‎python/plugins/mapserver_export/qgsmapserverexportbase.ui

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -257,36 +257,6 @@
257257
</item>
258258
<item>
259259
<widget class="QComboBox" name="cmbMapUnits" >
260-
<item>
261-
<property name="text" >
262-
<string>dd</string>
263-
</property>
264-
</item>
265-
<item>
266-
<property name="text" >
267-
<string>feet</string>
268-
</property>
269-
</item>
270-
<item>
271-
<property name="text" >
272-
<string>meters</string>
273-
</property>
274-
</item>
275-
<item>
276-
<property name="text" >
277-
<string>miles</string>
278-
</property>
279-
</item>
280-
<item>
281-
<property name="text" >
282-
<string>inches</string>
283-
</property>
284-
</item>
285-
<item>
286-
<property name="text" >
287-
<string>kilometers</string>
288-
</property>
289-
</item>
290260
</widget>
291261
</item>
292262
<item>

‎python/plugins/mapserver_export/ui_mapserverexport.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,6 @@ def retranslateUi(self, QgsMapserverExportBase):
230230
self.btnChooseFooterFile.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Browse...", None, QtGui.QApplication.UnicodeUTF8))
231231
self.grpMap.setTitle(QtGui.QApplication.translate("QgsMapserverExportBase", "Map", None, QtGui.QApplication.UnicodeUTF8))
232232
self.textLabel3.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Units", None, QtGui.QApplication.UnicodeUTF8))
233-
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "dd", None, QtGui.QApplication.UnicodeUTF8))
234-
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "feet", None, QtGui.QApplication.UnicodeUTF8))
235-
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "meters", None, QtGui.QApplication.UnicodeUTF8))
236-
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "miles", None, QtGui.QApplication.UnicodeUTF8))
237-
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "inches", None, QtGui.QApplication.UnicodeUTF8))
238-
self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "kilometers", None, QtGui.QApplication.UnicodeUTF8))
239233
self.textLabel4.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Image type", None, QtGui.QApplication.UnicodeUTF8))
240234
self.cmbMapImageType.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "gif", None, QtGui.QApplication.UnicodeUTF8))
241235
self.cmbMapImageType.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "gtiff", None, QtGui.QApplication.UnicodeUTF8))

0 commit comments

Comments
 (0)
Please sign in to comment.