[Mt-daapd-cvs] mt-daapd/admin-root playlist.js,1.3,1.4

[Anders B. <and...@us...>]

Update of /cvsroot/mt-daapd/mt-daapd/admin-root
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12252

Modified Files:
	playlist.js 
Log Message:
Forgot to url encode queries

Index: playlist.js
===================================================================
RCS file: /cvsroot/mt-daapd/mt-daapd/admin-root/playlist.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** playlist.js	16 Mar 2005 19:56:40 -0000	1.3
--- playlist.js	16 Mar 2005 22:35:26 -0000	1.4
***************
*** 226,229 ****
--- 226,233 ----
      el.removeAttribute('selected');
    }
+   if ('album' == label) {
+     //### All other boxes are updated, this is the last one, now get the songs
+     getSongs();
+   }
  }
  function addPlaylists(el,xmldoc) {
***************
*** 344,348 ****
    g_requestor.addRequest('databases/1/browse/artists' + filter);
    g_requestor.addRequest('databases/1/browse/albums' + filter);
-   getSongs();
  }
  
--- 348,351 ----
***************
*** 380,384 ****
    }
  	g_requestor.addRequest('databases/1/browse/albums' + filter);
! 	getSongs();
  }
  function getSongs() {
--- 383,391 ----
    }
  	g_requestor.addRequest('databases/1/browse/albums' + filter);
! }
! 
! function albumSelect(event) {
!   // just get the songs, the only box changed is this one
!   getSongs();
  }
  function getSongs() {
***************
*** 386,400 ****
    artist = document.getElementById('artist').value;
    album = document.getElementById('album').value;
    query = Array();
    if (genre != '1') {
!     query.push('\'daap.songgenre:' + genre +"'");
    }
    if (artist != '1') {
!     query.push('\'daap.songartist:' + artist +"'");
    }
    if (album != '1') {
!     query.push('\'daap.songalbum:' + album +"'");
    }
!   if (0 == filter.length) {
        // If filter array is empty then "All genres" is selected
        // so set filter to empty
--- 393,408 ----
    artist = document.getElementById('artist').value;
    album = document.getElementById('album').value;
+   //alert("genre: "+genre +"\nartist: "+ artist + "\nalbum:"+ album);
    query = Array();
    if (genre != '1') {
!     query.push('\'daap.songgenre:' + genre.myEncodeURI() +"'");
    }
    if (artist != '1') {
!     query.push('\'daap.songartist:' + artist.myEncodeURI() +"'");
    }
    if (album != '1') {
!     query.push('\'daap.songalbum:' + album.myEncodeURI() +"'");
    }
!   if (0 == query.length) {
        // If filter array is empty then "All genres" is selected
        // so set filter to empty
***************
*** 403,406 ****
--- 411,415 ----
      query = '&query=' + query.join(',');
    }
+   //alert(query);
    g_requestor.addRequest('databases/1/items' +
    '?meta=dmap.itemname,daap.songalbum,daap.songartist,daap.songgenre,daap.songtime'+query);