[GRASS-SVN] r47384 - grass-addons/grass7/gui/wxpython/wx.wms

[svn_grass at osgeo.org]

Author: sudeepsingh
Date: 2011-08-03 09:40:43 -0700 (Wed, 03 Aug 2011)
New Revision: 47384

Modified:
   grass-addons/grass7/gui/wxpython/wx.wms/serverList.txt
   grass-addons/grass7/gui/wxpython/wx.wms/wmsmenu.py
Log:
non ascii username being read properly

Modified: grass-addons/grass7/gui/wxpython/wx.wms/serverList.txt
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.wms/serverList.txt	2011-08-03 16:36:18 UTC (rev 47383)
+++ grass-addons/grass7/gui/wxpython/wx.wms/serverList.txt	2011-08-03 16:40:43 UTC (rev 47384)
@@ -1,5 +1,3 @@
-VIZ_Globe http://viz.globe.gov/viz-bin/wmt.cgi u psas
-VIZ_Globe1 http://viz.globe.gov/viz-bin/wmt.cgi u psas
-dsfsdf sdsdf sdfsdf sdsdf
-qw qw qw qw
-GisNet http://www.gisnet.lv/cgi-bin/topo sudeep password
+a3 b3 c3 d3
+a2 b2 c2 d2
+GISNetServer http://www.gisnet.lv/cgi-bin/topo uname password

Modified: grass-addons/grass7/gui/wxpython/wx.wms/wmsmenu.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.wms/wmsmenu.py	2011-08-03 16:36:18 UTC (rev 47383)
+++ grass-addons/grass7/gui/wxpython/wx.wms/wmsmenu.py	2011-08-03 16:40:43 UTC (rev 47384)
@@ -8,7 +8,9 @@
 from parse import parsexml, isServiceException, populateLayerTree
 from WMSMapDisplay import NewImageFrame
 from addserver import AddServerFrame
+from ServerInfoAPIs import addServerInfo, removeServerInfo, updateServerInfo, initServerInfoBase, getAllRows
 
+
 # begin wxGlade: extracode
 # end wxGlade
 
@@ -44,6 +46,7 @@
         
         #Sudeep's Code Starts
         #self.urlInput.SetValue('http://www.gisnet.lv/cgi-bin/topo')
+        self.soup = initServerInfoBase('ServersList.xml')
         self.__populate_Url_List(self.ServerList)
         self.selectedURL="No server selected"
         self.layerTreeRoot = self.LayerTree.AddRoot("Layers")
@@ -89,7 +92,15 @@
     def update_Url_List(self, name):
         ComboBox = self.ServerList
         ComboBox.Append(name)
+        
     def __populate_Url_List(self, ComboBox):
+        self.servers = getAllRows(self.soup)
+        for key, value in self.servers.items():
+            ComboBox.Append(value.servername+" "+value.url)
+        print self.servers
+        return
+    
+    
         f = open('serverList.txt','r')
         lines = f.readlines()
         self.servers = {}