Author: jonathan Date: Wed Feb 18 11:59:56 2009 New Revision: 31082 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=31082
Log: MASHUP-1140: now uses the requested username if there isn't a formal name to go along with it. (The query is still guaranteed to be blank, but may go live if a user with that name is added.) Modified: branches/mashup/java/1.5/java/modules/www/search.jsp Modified: branches/mashup/java/1.5/java/modules/www/search.jsp URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/www/search.jsp?rev=31082&r1=31081&r2=31082&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/www/search.jsp (original) +++ branches/mashup/java/1.5/java/modules/www/search.jsp Wed Feb 18 11:59:56 2009 @@ -116,6 +116,7 @@ String queryTitle = ""; String queryPath = ""; + String queryUser = ""; String[] queryParams = new String[] { }; QueryResults results = null; int currentPage = 0; @@ -132,8 +133,10 @@ } else if (query.equalsIgnoreCase("mashups") && searchFor.equals("")) { // Set up the predefined query for "[My] Mashups" + queryUser = RegistryUtils.getFullName(request, searchScope); + if (queryUser == null) queryUser = searchScope; queryTitle = ((searchScope.equals(currentUser) && !isFeed) ? "My" : - RegistryUtils.getFullName(request, searchScope) + "'s") + " mashups"; + queryUser + "'s") + " mashups"; queryPath = MashupConstants.MY_MASHUPS_QUERY_PATH; queryParams = new String[] { searchScope }; @@ -149,8 +152,10 @@ MashupConstants.IMPOSSIBLE_VALUE, MashupConstants.IMPOSSIBLE_VALUE }; // prevent matches by default } else { + queryUser = RegistryUtils.getFullName(request, searchScope); + if (queryUser == null) queryUser = searchScope; queryTitle = ((searchScope.equals(currentUser) && !isFeed) ? "My" : - RegistryUtils.getFullName(request, searchScope) + "'s") + " mashups "; + queryUser + "'s") + " mashups "; queryPath = MashupConstants.MY_CUSTOM_QUERY_PATH; params = new String[] { MashupConstants.IMPOSSIBLE_VALUE, MashupConstants.IMPOSSIBLE_VALUE, @@ -191,10 +196,11 @@ } else if (query.equalsIgnoreCase("toprated")) { // Set up the predefined query for "[My] Highest Rated Mashups" + queryUser = RegistryUtils.getFullName(request, searchScope); + if (queryUser == null) queryUser = searchScope; queryPath = MashupConstants.MY_TOP_MASHUPS_QUERY_PATH; queryTitle = ((searchScope.equals(currentUser) && !isFeed) ? "My" : - RegistryUtils.getFullName(request, searchScope) + "'s") + - " highest rated mashups"; + queryUser + "'s") + " highest rated mashups"; queryParams = new String[] { searchScope }; @@ -209,9 +215,12 @@ } else if (query.equalsIgnoreCase("comments")) { // Set up the predefined query for [My] comments + queryUser = RegistryUtils.getFullName(request, searchScope); + if (queryUser == null) queryUser = searchScope; + queryPath = MashupConstants.MY_COMMENTS_QUERY_PATH; queryTitle = ((searchScope.equals(currentUser) && !isFeed) ? "My" : - RegistryUtils.getFullName(request, searchScope) + "'s") + " comments"; + queryUser + "'s") + " comments"; queryParams = new String[] { "%" + searchFor + "%", searchScope }; @@ -223,7 +232,9 @@ if (searchScope.equals(currentUser) && !isFeed) { queryTitle = "My recent"; } else if (!searchScope.equals("")) { - queryTitle = RegistryUtils.getFullName(request, searchScope) + "'s recent"; + queryUser = RegistryUtils.getFullName(request, searchScope); + if (queryUser == null) queryUser = searchScope; + queryTitle = queryUser + "'s recent"; } else queryTitle = "Recent"; if (!activity.equalsIgnoreCase("all")) { _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
