[Sageplugins-commit] webserver/net/sf/sageplugins/webserver DetailedInfoServlet.java, 1.63, 1.64 Airing.java, 1.40, 1.41

[jreichen <jre...@us...>]

Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv25837/net/sf/sageplugins/webserver

Modified Files:
	DetailedInfoServlet.java Airing.java 
Log Message:
Display show season and episode

Index: Airing.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Airing.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Airing.java	20 Mar 2011 17:25:54 -0000	1.40
--- Airing.java	22 Mar 2011 03:33:21 -0000	1.41
***************
*** 254,257 ****
--- 254,258 ----
  		
  
+         String seasonAndEpisode = null;
  		String ep=getEpisode();
          if (  ep != null && ep.trim().length()==0)
***************
*** 283,287 ****
  		out.println("      </a></div></td>");
  		
!         if ( showfilesize ) {
              String sizeStr=null;
              if ( idType==ID_TYPE_MEDIAFILE){
--- 284,310 ----
  		out.println("      </a></div></td>");
  		
!         if ( idType == ID_TYPE_AIRING || 
!             ( idType == ID_TYPE_MEDIAFILE &&
!               SageApi.booleanApi("IsTVFile",new Object[]{sageAiring} )
!            )
!         ){
!             Integer seasonNumber = (Integer)SageApi.Api("GetShowSeasonNumber", new Object[]{sageAiring});
!             Integer episodeNumber = (Integer)SageApi.Api("GetShowEpisodeNumber", new Object[]{sageAiring});
!             if (((seasonNumber != null) && (seasonNumber > 0)) ||
!                 ((episodeNumber != null) &&(episodeNumber > 0))) {
!                 if ((seasonNumber > 0)) {
!                     seasonAndEpisode = "Season " + seasonNumber;
!                 }
!                 if ((seasonNumber > 0) && (episodeNumber > 0)) {
!                     seasonAndEpisode += "<br />";
!                 }
!                 if ((episodeNumber > 0)) {
!                     seasonAndEpisode += "Episode " + episodeNumber;
!                 }
!                 out.println("      <td class=\"seasonepisodecell\"><div class=\""+tdclass+"\">"+infoLink+seasonAndEpisode+"</a></div></td>");
!             }
!         }
! 		
! 		if ( showfilesize ) {
              String sizeStr=null;
              if ( idType==ID_TYPE_MEDIAFILE){

Index: DetailedInfoServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/DetailedInfoServlet.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** DetailedInfoServlet.java	20 Mar 2011 17:25:54 -0000	1.63
--- DetailedInfoServlet.java	22 Mar 2011 03:33:21 -0000	1.64
***************
*** 462,465 ****
--- 462,481 ----
                  out.println("<p>"+"Original Air Date: "+Translate.encode(formattedOriginalAirDate)+"</p>");
              }
+             Integer seasonNumber = (Integer)SageApi.Api("GetShowSeasonNumber", new Object[]{airing.sageAiring});
+             Integer episodeNumber = (Integer)SageApi.Api("GetShowEpisodeNumber", new Object[]{airing.sageAiring});
+             if (((seasonNumber != null) && (seasonNumber > 0)) ||
+                 ((episodeNumber != null) &&(episodeNumber > 0))) {
+                 out.print("<p>");
+                 if ((seasonNumber > 0)) {
+                     out.print("Season " + seasonNumber);
+                 }
+                 if ((seasonNumber > 0) && (episodeNumber > 0)) {
+                     out.print(" ");
+                 }
+                 if ((episodeNumber > 0)) {
+                     out.print("Episode " + episodeNumber);
+                 }
+                 out.println("</p>");
+             }
              getAndDisplay(out,"","GetExtraAiringDetails",airing);
      		getAndDisplay(out,"","GetShowMisc",airing);