[QGIS Commit] r9782 - trunk/qgis/python/plugins/mapserver_export

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-12-13 08:19:26 -0500 (Sat, 13 Dec 2008)
New Revision: 9782

Modified:
   trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
   trunk/qgis/python/plugins/mapserver_export/mapserverexportdialog.py
   trunk/qgis/python/plugins/mapserver_export/ms_export.py
   trunk/qgis/python/plugins/mapserver_export/qgsmapserverexportbase.ui
   trunk/qgis/python/plugins/mapserver_export/ui_mapserverexport.py
Log:
mapserver export fix:
- use double quotation marks for postgres layers (fixes #1104)
- export original instead of localized unit names


Modified: trunk/qgis/python/plugins/mapserver_export/mapserverexport.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/mapserverexport.py	2008-12-13 11:07:45 UTC (rev 9781)
+++ trunk/qgis/python/plugins/mapserver_export/mapserverexport.py	2008-12-13 13:19:26 UTC (rev 9782)
@@ -81,7 +81,7 @@
       exporter = Qgis2Map(str(self.dlg.ui.txtQgisFilePath.text()), str(self.dlg.ui.txtMapFilePath.text()))
       print "Setting options"
       exporter.setOptions( 
-          self.dlg.ui.cmbMapUnits.currentText(),
+          self.dlg.ui.cmbMapUnits.itemData( self.dlg.ui.cmbMapUnits.currentIndex() ).toString(),
           self.dlg.ui.cmbMapImageType.currentText(),
           self.dlg.ui.txtMapName.text(),
           self.dlg.ui.txtMapWidth.text(),

Modified: trunk/qgis/python/plugins/mapserver_export/mapserverexportdialog.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/mapserverexportdialog.py	2008-12-13 11:07:45 UTC (rev 9781)
+++ trunk/qgis/python/plugins/mapserver_export/mapserverexportdialog.py	2008-12-13 13:19:26 UTC (rev 9782)
@@ -27,3 +27,7 @@
     self.ui = Ui_QgsMapserverExportBase() 
     self.ui.setupUi(self) 
 
+    for unit in ["dd", "feet", "meters", "miles", "inches", "kilometers"]:
+        self.ui.cmbMapUnits.addItem( QtGui.QApplication.translate("QgsMapserverExportBase", unit, None, QtGui.QApplication.UnicodeUTF8), QtCore.QVariant(unit) )
+
+

Modified: trunk/qgis/python/plugins/mapserver_export/ms_export.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/ms_export.py	2008-12-13 11:07:45 UTC (rev 9781)
+++ trunk/qgis/python/plugins/mapserver_export/ms_export.py	2008-12-13 13:19:26 UTC (rev 9782)
@@ -323,11 +323,11 @@
         # it's a postgis layer
         (pgConnString, sqlData, sqlFilter) = self.parsePostgisConnection(dataString)
         layer_def += "    CONNECTIONTYPE postgis\n"
-        layer_def += "    CONNECTION '" + pgConnString + "'\n"
-        layer_def += "    DATA '" + sqlData + "'\n"
+        layer_def += "    CONNECTION \"" + pgConnString + "\"\n"
+        layer_def += "    DATA \"" + sqlData + "\"\n"
         # don't write the filter keyword if there isn't one
         if sqlFilter:
-          layer_def += "    FILTER '" + sqlFilter + "'\n"
+          layer_def += "    FILTER \"" + sqlFilter + "\"\n"
 
       elif providerString == 'wms' and lyr.getAttribute("type").encode('utf-8').upper() == 'RASTER':
         # it's a WMS layer 

Modified: trunk/qgis/python/plugins/mapserver_export/qgsmapserverexportbase.ui
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/qgsmapserverexportbase.ui	2008-12-13 11:07:45 UTC (rev 9781)
+++ trunk/qgis/python/plugins/mapserver_export/qgsmapserverexportbase.ui	2008-12-13 13:19:26 UTC (rev 9782)
@@ -257,36 +257,6 @@
         </item>
         <item>
          <widget class="QComboBox" name="cmbMapUnits" >
-          <item>
-           <property name="text" >
-            <string>dd</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>feet</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>meters</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>miles</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>inches</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>kilometers</string>
-           </property>
-          </item>
          </widget>
         </item>
         <item>

Modified: trunk/qgis/python/plugins/mapserver_export/ui_mapserverexport.py
===================================================================
--- trunk/qgis/python/plugins/mapserver_export/ui_mapserverexport.py	2008-12-13 11:07:45 UTC (rev 9781)
+++ trunk/qgis/python/plugins/mapserver_export/ui_mapserverexport.py	2008-12-13 13:19:26 UTC (rev 9782)
@@ -230,12 +230,6 @@
         self.btnChooseFooterFile.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Browse...", None, QtGui.QApplication.UnicodeUTF8))
         self.grpMap.setTitle(QtGui.QApplication.translate("QgsMapserverExportBase", "Map", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel3.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Units", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "dd", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "feet", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "meters", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "miles", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "inches", None, QtGui.QApplication.UnicodeUTF8))
-        self.cmbMapUnits.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "kilometers", None, QtGui.QApplication.UnicodeUTF8))
         self.textLabel4.setText(QtGui.QApplication.translate("QgsMapserverExportBase", "Image type", None, QtGui.QApplication.UnicodeUTF8))
         self.cmbMapImageType.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "gif", None, QtGui.QApplication.UnicodeUTF8))
         self.cmbMapImageType.addItem(QtGui.QApplication.translate("QgsMapserverExportBase", "gtiff", None, QtGui.QApplication.UnicodeUTF8))