Modify the soap methods

diff --git a/zukebox_server/src/services/search/zb_search.py b/zukebox_server/src/services/search/zb_search.py
index 3c6c06c..90b1716 100644 (file)
--- a/zukebox_server/src/services/search/zb_search.py
+++ b/zukebox_server/src/services/search/zb_search.py
@@ -19,44 +19,44 @@ class SearchOutBoundExcept(Exception):
 
 
 class Search(Service):
-       """Class Search
+    """Class Search
            Implements a search service of zukebox-server
        """
 
-       service_type = "urn:schemas-upnp-org:service:Search:1"
-       service_name = "Search"
-       facade = ZFacade(db_path, webserver)
-
-       def __init__(self, xml_path):
-           scpd_path = pjoin(xml_path, "zukebox-search-scpd.xml");
-           Service.__init__(self, service_name, service_type, '', scpd_path)
-           log.info("Search service scpd_path = %s" % scpd_path)
-
-           self.genre_list = []
-           self.name_music_list = []
-           self.name_artist_list = []
-           self.all_audio_list = []
-
-       def soap_SearchGenreList(self, *args, **kargs):
-           self.genreType = kwargs['GenreType']
-           self.genre_list = self.facade.get_audio_genre(self.genreType)
-           rt = {"Genre_list": self.genre_list}
-           return {"SearchGenreList": rt}
-
-       def soap_SearchMusicList(self, *args, **kargs):
-           self.musicName = kwargs['MusicName']
-           self.name_music_list = self.facade.get_audio_item(self.musicName)
-           rt = {"Music_list": self.name_music_list}
-           return {"SearchMusicList": rt}
-
-       def soap_SearchArtistList(self, *args, **kargs):
-           self.artistName = kwargs['ArtistName']
-           self.name_artist_list = self.facade.get_audio_artist(self.artistName)
-           rt = {"Artist_list": self.name_artist_list}
-           return {"SearchArtistList": rt}
-
-       def soap_SearchAllAudioList(self, *args, **kargs):
-           self.all_audio_list = self.facade.get_audio_all()
-           rt = {"All_Audio_list": self.all_audio_list}
-           return {"SearchAllAudioList": rt}
-           
+    service_type = "urn:schemas-upnp-org:service:Search:1"
+    service_name = "Search"
+    facade = ZFacade(db_path, webserver)
+
+    def __init__(self, xml_path):
+        scpd_path = join(xml_path, "zukebox-search-scpd.xml")
+        Service.__init__(self, self.service_name, self.service_type,'',
+                        scpd_path)
+
+        self.genre_list = []
+        self.name_music_list = []
+        self.name_artist_list = []
+        self.all_audio_list = []
+
+    def soap_SearchGenreList(self, *args, **kargs):
+        self.genreType = kwargs['GenreType']
+        self.genre_list = self.facade.get_audio_genre(self.genreType)
+        g_list = self.genre_list.__repr__()
+        return {"SearchGenreList": g_list}
+
+    def soap_SearchMusicList(self, *args, **kargs):
+        self.musicName = kwargs['MusicName']
+        self.name_music_list = self.facade.get_audio_item(self.musicName)
+        nm_list =  self.name_music_list.__repr__()
+        return {"SearchMusicList": nm_list}
+
+    def soap_SearchArtistList(self, *args, **kargs):
+        self.artistName = kwargs['ArtistName']
+        self.name_artist_list = self.facade.get_audio_artist(self.artistName)
+        na_list = self.name_artist_list.__repr__()
+        return {"SearchArtistList": na_list}
+
+    def soap_SearchAllAudioList(self, *args, **kargs):
+        self.all_audio_list = self.facade.get_audio_all()
+        aa_list = self.all_audio_list.__repr__()
+        return {"SearchAllAudioList": aa_list}
+