[Netlinx-modules-commit] NetLinx-Modules/SlimServer SlimServerMod.axs,1.2,1.3

[Jeff C. <co...@us...>]

Update of /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23665

Modified Files:
	SlimServerMod.axs 
Log Message:
Add support for international (accented) characters (feature ID 1247542).

Note that this feature depends on SlimServer CLI support, and thus requires
"SlimServer Version: 6.2.0 - 4753" or later).



Index: SlimServerMod.axs
===================================================================
RCS file: /cvsroot/netlinx-modules/NetLinx-Modules/SlimServer/SlimServerMod.axs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SlimServerMod.axs	21 Sep 2005 14:27:17 -0000	1.2
--- SlimServerMod.axs	1 Nov 2005 20:40:26 -0000	1.3
***************
*** 12,16 ****
  (*  FILE CREATED ON: 10/03/2004 AT: 09:00:00               *)
  (***********************************************************)
! (*  FILE_LAST_MODIFIED_ON: 09/20/2005  AT: 20:25:49        *)
  (***********************************************************)
  (*  ORPHAN_FILE_PLATFORM: 1                                *)
--- 12,16 ----
  (*  FILE CREATED ON: 10/03/2004 AT: 09:00:00               *)
  (***********************************************************)
! (*  FILE_LAST_MODIFIED_ON: 10/30/2005  AT: 09:52:47        *)
  (***********************************************************)
  (*  ORPHAN_FILE_PLATFORM: 1                                *)
***************
*** 682,688 ****
      playerID = "GetPlayerID(unitNum)";
      if (startSong == 0)
! 	sBuffer = "playerID,'status - ',itoa(numSongs),' tags:gal'";
      else
! 	sBuffer = "playerID,'status ',itoa(startSong),' ',itoa(numSongs),' tags:gal'";
  
      // To avoid "flooding" SlimServer with status requests,
--- 682,688 ----
      playerID = "GetPlayerID(unitNum)";
      if (startSong == 0)
! 	sBuffer = "playerID,'status - ',itoa(numSongs),' charset:iso-8859-1 tags:gal'";
      else
! 	sBuffer = "playerID,'status ',itoa(startSong),' ',itoa(numSongs),' charset:iso-8859-1 tags:gal'";
  
      // To avoid "flooding" SlimServer with status requests,
***************
*** 1616,1620 ****
      }
  
!     sBuffer = "sBuffer,' ',itoa(infoData.startItem),' ',itoa(infoData.countItem),' context:',itoa(sessionNum)";
  
      // Add any other options to the command as appropriate
--- 1616,1620 ----
      }
  
!     sBuffer = "sBuffer,' ',itoa(infoData.startItem),' ',itoa(infoData.countItem),' context:',itoa(sessionNum),' charset:iso-8859-1'";
  
      // Add any other options to the command as appropriate
***************
*** 2022,2026 ****
  		}
  	    }
! 	    active (sTag = 'tags'): {
  		// Carry over from the command - we recognize it and ignore it
  	    }
--- 2022,2026 ----
  		}
  	    }
! 	    active (sTag = 'tags' || sTag = 'charset'): {
  		// Carry over from the command - we recognize it and ignore it
  	    }
***************
*** 2183,2187 ****
  	    active (sTag == 'search'):
  		fSearchPerformed = 1;
! 	    active (sTag = 'tags' || sTag = 'artist_id' || sTag = 'album_id' || sTag == 'genre_id'): {
  		// Ignore filters on the original search command
  	    }
--- 2183,2187 ----
  	    active (sTag == 'search'):
  		fSearchPerformed = 1;
! 	    active (sTag = 'tags' || sTag = 'artist_id' || sTag = 'album_id' || sTag == 'genre_id' || sTag = 'charset'): {
  		// Ignore filters on the original search command
  	    }
***************
*** 2280,2284 ****
  	    active (sTag == 'search'):
  		fSearchPerformed = 1;
! 	    active (sTag = 'tags' || sTag = 'artist_id' || sTag = 'album_id' || sTag == 'genre_id' || sTag == 'sort'): {
  		// Ignore filters on the original search command
  	    }
--- 2280,2284 ----
  	    active (sTag == 'search'):
  		fSearchPerformed = 1;
! 	    active (sTag = 'tags' || sTag = 'artist_id' || sTag = 'album_id' || sTag == 'genre_id' || sTag == 'sort' || sTag = 'charset'): {
  		// Ignore filters on the original search command
  	    }
***************
*** 2367,2371 ****
  		InfoSearch[sessionNum][lvl].maxItems = atoi(strSeg);
  	    }
! 	    active (sTag = 'tags'): {
  		// Ignore filters on the original search command
  	    }
--- 2367,2371 ----
  		InfoSearch[sessionNum][lvl].maxItems = atoi(strSeg);
  	    }
! 	    active (sTag = 'tags' || sTag = 'charset'): {
  		// Ignore filters on the original search command
  	    }