Menu
▾
▴
[Sageplugins-commit] webapp/src/sagex/webserver Search.java, 1.1, 1.2
|
From: jreichen <jre...@us...> - 2011-05-19 04:06:18
|
Update of /cvsroot/sageplugins/webapp/src/sagex/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv30660/src/sagex/webserver
Modified Files:
Search.java
Log Message:
Support for video searches
Add BluRay
Index: Search.java
===================================================================
RCS file: /cvsroot/sageplugins/webapp/src/sagex/webserver/Search.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Search.java 18 Jul 2009 00:47:13 -0000 1.1
--- Search.java 19 May 2011 04:06:16 -0000 1.2
***************
*** 37,42 ****
private String favoriteId = null;
private String searchType = SEARCH_TYPE_AIRINGS;
! private boolean video = true;
! private boolean dvd = true;
private boolean music = false;
private boolean picture = false;
--- 37,43 ----
private String favoriteId = null;
private String searchType = SEARCH_TYPE_AIRINGS;
! private boolean video = false;
! private boolean dvd = false;
! private boolean bluRay = false;
private boolean music = false;
private boolean picture = false;
***************
*** 126,129 ****
--- 127,137 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getCaseSensitive() {
+ return casesensitive;
+ }
+
+ /**
* @param casesensitive filename search is case sensitive
*/
***************
*** 173,176 ****
--- 181,190 ----
addcomma=true;
}
+ if ( isBluRay() ) {
+ if ( addcomma)
+ searchName.append(", ");
+ searchName.append("BluRay");
+ addcomma=true;
+ }
if ( isMusic() ){
if ( addcomma)
***************
*** 261,264 ****
--- 275,285 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getDVD() {
+ return dvd;
+ }
+
+ /**
* @param dvd search for imported dvds
*/
***************
*** 268,271 ****
--- 289,314 ----
/**
+ * @return if bluRay is the imported media file type
+ */
+ public boolean isBluRay() {
+ return bluRay;
+ }
+
+ /**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getBluRay() {
+ return bluRay;
+ }
+
+ /**
+ * @param bluRay search for imported bluRay
+ */
+ public void setBluRay(boolean bluRay) {
+ System.out.println("Search: setBluRay(" + bluRay + ")");
+ this.bluRay = bluRay;
+ }
+
+ /**
* @return the endtime
*/
***************
*** 292,295 ****
--- 335,345 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getExactTitle() {
+ return exactTitle;
+ }
+
+ /**
* @param exactTitle match search string exactly
*/
***************
*** 402,405 ****
--- 452,462 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getMusic() {
+ return music;
+ }
+
+ /**
* @param music search for imported music
*/
***************
*** 434,437 ****
--- 491,501 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getPicture() {
+ return picture;
+ }
+
+ /**
* @param picture search for imported pictures
*/
***************
*** 452,455 ****
--- 516,520 ----
setDontlike(req.getParameter("dontlike"));
setDVD("on".equals(req.getParameter("DVD")));
+ setBluRay("on".equals(req.getParameter("bluRay")));
//setEndtime(null);
setExactTitle("on".equals(req.getParameter("ExactTitle")));
***************
*** 471,475 ****
//setStarttime(null);
setTimeRange(req.getParameter("TimeRange"));
! setVideo("on".equals(req.getParameter("Video")));
setWatched(req.getParameter("watched"));
}
--- 536,540 ----
//setStarttime(null);
setTimeRange(req.getParameter("TimeRange"));
! setVideo("on".equals(req.getParameter("video")));
setWatched(req.getParameter("watched"));
}
***************
*** 483,486 ****
--- 548,558 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getRegex() {
+ return regex;
+ }
+
+ /**
* @param regex use regex for filename
*/
***************
*** 660,663 ****
--- 732,742 ----
/**
+ * Required for jsp bean wildcard parameter support
+ */
+ public boolean getVideo() {
+ return video;
+ }
+
+ /**
* @param video search for imported videos
*/
***************
*** 687,691 ****
throws Exception {
Object searchResults=null;
!
if ( searchString!=null) {
if ( searchString !=null && searchString.length()>0){
--- 766,770 ----
throws Exception {
Object searchResults=null;
!
if ( searchString!=null) {
if ( searchString !=null && searchString.length()>0){
***************
*** 743,746 ****
--- 822,826 ----
(isVideo()?"IsVideoFile":"IsAiringObject")+
(isDVD()?"|IsDVD":"|IsAiringObject")+
+ (isBluRay()?"|IsBluRay":"|IsAiringObject")+
(isMusic()?"|IsMusicFile":"|IsAiringObject")+
(isPicture()?"|IsPictureFile":"|IsAiringObject"),
***************
*** 776,779 ****
--- 856,860 ----
(isVideo()?"IsVideoFile":"IsAiringObject")+
(isDVD()?"|IsDVD":"|IsAiringObject")+
+ (isBluRay()?"|IsBluRay":"|IsAiringObject")+
(isMusic()?"|IsMusicFile":"|IsAiringObject")+
(isPicture()?"|IsPictureFile":"|IsAiringObject"),
***************
*** 817,820 ****
--- 898,902 ----
searchResults = SageTV.api("FilterByBoolMethod", new Object[] {searchResults, "IsVideoFile", Boolean.FALSE});
searchResults = SageTV.api("FilterByBoolMethod", new Object[] {searchResults, "IsDVD", Boolean.FALSE});
+ searchResults = SageTV.api("FilterByBoolMethod", new Object[] {searchResults, "IsBluRay", Boolean.FALSE});
searchResults = SageTV.api("FilterByBoolMethod", new Object[] {searchResults, "IsPictureFile", Boolean.FALSE});
***************
*** 1031,1037 ****
searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetAiringStartTime"});
} else if (sort.startsWith("title_")){
! searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetAiringTitle"});
} else if (sort.startsWith("episode_")){
! searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetShowEpisode"});
}
}
--- 1113,1121 ----
searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetAiringStartTime"});
} else if (sort.startsWith("title_")){
! searchResults = SageTV.api("SortLexical",new Object[]{searchResults, SortOrder, "GetAiringTitle"});
} else if (sort.startsWith("episode_")){
! searchResults = SageTV.api("SortLexical",new Object[]{searchResults, SortOrder, "GetShowEpisode"});
! } else if (sort.startsWith("people_")){
! searchResults = SageTV.api("SortLexical",new Object[]{searchResults, SortOrder, "GetPeopleInShow"});
}
}
***************
*** 1047,1055 ****
searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetAiringStartTime"});
} else if (sort.startsWith("title_")){
! searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetAiringTitle"});
} else if (sort.startsWith("episode_")){
! searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetShowEpisode"});
} else if (sort.startsWith("people_")){
! searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetPeopleInShow"});
}
}
--- 1131,1139 ----
searchResults = SageTV.api("Sort",new Object[]{searchResults, SortOrder, "GetAiringStartTime"});
} else if (sort.startsWith("title_")){
! searchResults = SageTV.api("SortLexical",new Object[]{searchResults, SortOrder, "GetAiringTitle"});
} else if (sort.startsWith("episode_")){
! searchResults = SageTV.api("SortLexical",new Object[]{searchResults, SortOrder, "GetShowEpisode"});
} else if (sort.startsWith("people_")){
! searchResults = SageTV.api("SortLexical",new Object[]{searchResults, SortOrder, "GetPeopleInShow"});
}
}
|
