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

[svn_grass at osgeo.org]

Author: sudeepsingh
Date: 2011-07-29 19:45:51 -0700 (Fri, 29 Jul 2011)
New Revision: 47313

Modified:
   grass-addons/grass7/gui/wxpython/wx.wms/ServerInfoAPIs.py
   grass-addons/grass7/gui/wxpython/wx.wms/addserver.py
Log:
xml info storing functionality integerated, reading servers added

Modified: grass-addons/grass7/gui/wxpython/wx.wms/ServerInfoAPIs.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.wms/ServerInfoAPIs.py	2011-07-29 19:08:37 UTC (rev 47312)
+++ grass-addons/grass7/gui/wxpython/wx.wms/ServerInfoAPIs.py	2011-07-30 02:45:51 UTC (rev 47313)
@@ -5,21 +5,25 @@
 
 def initServerInfoBase(fileName):
     try:
-        f = open(fileName,'r+')
+        f = open(fileName,'r')
         xml = f.read()   
+        f.close()
         soup = BeautifulStoneSoup(xml)
         serverinfolist = soup.findAll('serverinfo')
+        print 'serverinfolisthere'
+        print serverinfolist
         print len(serverinfolist)    
     except:
-        f = open(fileName,'w')
         serverinfolist = []
         soup = BeautifulSoup()
+        xml = "null"
     
     if(len(serverinfolist) == 0):
+
             serverinfo = Tag(soup, "serverinfo")
             soup.insert(0, serverinfo)
             
-    return soup, f
+    return soup
 
 
 def addServerInfo(soup, serverinfo, snamevalue, urlvalue, unamevalue, passwordvalue):
@@ -73,18 +77,17 @@
 
 def getAllRows(soup):
     elements = soup.findAll('server')
-    servers = []
+    servers = {}
     for element in elements:
         servername = element.findAll('servername')[0]
         serverurl = element.findAll('serverurl')[0]
         username = element.findAll('username')[0]
         password = element.findAll('password')[0]
         serverdata = ServerData()
-        serverdata.servername = servername
-        serverdata.url = serverurl
-        serverdata.username = username
-        serverdata.password = password
-        print servername
-        #servers[servername] = serverdata
+        serverdata.servername = servername.contents[0].strip()
+        serverdata.url = serverurl.contents[0].strip()
+        serverdata.username = username.contents[0].strip()
+        serverdata.password = password.contents[0].strip()
+        servers[serverdata.servername] = serverdata
         
     return servers
\ No newline at end of file

Modified: grass-addons/grass7/gui/wxpython/wx.wms/addserver.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.wms/addserver.py	2011-07-29 19:08:37 UTC (rev 47312)
+++ grass-addons/grass7/gui/wxpython/wx.wms/addserver.py	2011-07-30 02:45:51 UTC (rev 47313)
@@ -3,6 +3,8 @@
 # generated by wxGlade 0.6.3 on Thu Jul 14 06:22:35 2011
 
 import wx
+from BeautifulSoup import BeautifulSoup, Tag, NavigableString, BeautifulStoneSoup
+from ServerInfoAPIs import addServerInfo, removeServerInfo, updateServerInfo, initServerInfoBase, getAllRows
 
 # begin wxGlade: extracode
 # end wxGlade
@@ -44,8 +46,13 @@
         self.Bind(wx.EVT_BUTTON, self.OnAddNew, self.AddNew)
         self.Bind(wx.EVT_BUTTON, self.OnQuit, self.Quit)
         # end wxGlade
+        
+        
+        #sudeep code starts
+        self.soup = initServerInfoBase('out.xml')
         self.Bind(wx.EVT_CLOSE, self.OnQuit)
         self.__populate_URL_List(self.ServerList)
+        #sudeep code ends
 
     def __set_properties(self):
         # begin wxGlade: ServerAdd.__set_properties
@@ -106,6 +113,11 @@
         # end wxGlade
 
     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 = {}
@@ -158,6 +170,8 @@
             serverData.password = newPassword
             self.servers[newServerName] = serverData
             f = open('serverList.txt','a')
+            serverInfo = '<serverinfo>'
+            serverINFO += '<servername>'
             f.write(newServerName+" "+newUrl+ " "+newUserName+" "+newPassword+"\n")
             f.close()
             self.selectedURL = newUrl