You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/03/17 13:28:50 UTC
svn commit: r1735408 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/ webapp/root/
Author: degenaro
Date: Thu Mar 17 12:28:50 2016
New Revision: 1735408
URL: http://svn.apache.org/viewvc?rev=1735408&view=rev
Log:
UIMA-4860 DUCC Web Server (WS) Services and Preferences improvements
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1735408&r1=1735407&r2=1735408&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Thu Mar 17 12:28:50 2016
@@ -969,9 +969,7 @@ public class DuccHandlerClassic extends
for(IServiceAdapter service : servicesSortedCollection) {
boolean list = DuccWebUtil.isListable(request, users, maxRecords, counter, service);
if(!list) {
- if(!service.isAlert()) {
- continue;
- }
+ continue;
}
counter++;
// Row Begin
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1735408&r1=1735407&r2=1735408&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Thu Mar 17 12:28:50 2016
@@ -1108,9 +1108,7 @@ public class DuccHandlerJsonFormat exten
for(IServiceAdapter service : servicesSortedCollection) {
boolean list = DuccWebUtil.isListable(request, users, maxRecords, counter, service);
if(!list) {
- if(!service.isAlert()) {
- continue;
- }
+ continue;
}
counter++;
JsonArray row = new JsonArray();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java?rev=1735408&r1=1735407&r2=1735408&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java Thu Mar 17 12:28:50 2016
@@ -46,67 +46,36 @@ public class DuccWebUtil {
response.setDateHeader("Expires", 0); // Proxies.
}
- public static final boolean isListable(HttpServletRequest request, ArrayList<String> users, int maxRecords, int counter, IDuccWork dw) {
- boolean list = false;
+ private static final boolean isListable(HttpServletRequest request,ArrayList<String> users, int maxRecords, int counter, String user) {
DuccCookies.FilterUsersStyle filterUsersStyle = DuccCookies.getFilterUsersStyle(request);
- if(!users.isEmpty()) {
- String jobUser = dw.getStandardInfo().getUser().trim();
- switch(filterUsersStyle) {
- case IncludePlusActive:
- if(!dw.isCompleted()) {
- list = true;
- }
- else if(users.contains(jobUser)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- break;
- case ExcludePlusActive:
- if(!dw.isCompleted()) {
- list = true;
- }
- else if(!users.contains(jobUser)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- break;
- case Include:
- if(users.contains(jobUser)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ boolean retVal = false;
+ if((maxRecords == 0)||(counter < maxRecords)) {
+ if(users.isEmpty()) {
+ retVal = true;
+ }
+ else {
+ switch(filterUsersStyle) {
+ case IncludePlusActive: // deprecated, treat same as include
+ case Include:
+ if(users.contains(user)) {
+ retVal = true;
}
- }
- break;
- case Exclude:
- if(!users.contains(jobUser)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ break;
+ case ExcludePlusActive: // deprecated, treat same as exclude
+ case Exclude:
+ if(!users.contains(user)) {
+ retVal = true;
}
- }
- break;
- }
- }
- else {
- if(!dw.isCompleted()) {
- list = true;
- }
- else if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
+ break;
+ }
}
}
- return list;
+ return retVal;
+ }
+
+ public static final boolean isListable(HttpServletRequest request, ArrayList<String> users, int maxRecords, int counter, IDuccWork dw) {
+ String user = dw.getStandardInfo().getUser().trim();
+ return isListable(request, users, maxRecords, counter, user);
}
private static String key_user = IServicesRegistry.user;
@@ -144,66 +113,8 @@ public class DuccWebUtil {
}
public static final boolean isListable(HttpServletRequest request, ArrayList<String> users, int maxRecords, int counter, Properties propertiesMeta) {
- boolean list = false;
- DuccCookies.FilterUsersStyle filterUsersStyle = DuccCookies.getFilterUsersStyle(request);
- if(!users.isEmpty()) {
- String user = propertiesMeta.getProperty(key_user);
- if(user != null) {
- user = user.trim();
- switch(filterUsersStyle) {
- case IncludePlusActive:
- if(isAvailable(propertiesMeta)) {
- list = true;
- }
- else if(users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- break;
- case ExcludePlusActive:
- if(isAvailable(propertiesMeta)) {
- list = true;
- }
- else if(!users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- break;
- case Include:
- if(users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- break;
- case Exclude:
- if(!users.contains(user)) {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- break;
- }
- }
- }
- else {
- if(maxRecords > 0) {
- if (counter < maxRecords) {
- list = true;
- }
- }
- }
- return list;
+ String user = propertiesMeta.getProperty(key_user);
+ return isListable(request, users, maxRecords, counter, user);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp?rev=1735408&r1=1735407&r2=1735408&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/preferences.jsp Thu Mar 17 12:28:50 2016
@@ -172,12 +172,12 @@ if (displayStyle) {
<td><i><b>Filter Users</b></i>
<td>
<td><input type="radio" name="filter_users_style" value="include" checked onclick="ducc_preferences_set('filter_users_style','include')" /> Include
- <td>
- <td><input type="radio" name="filter_users_style" value="include+active" onclick="ducc_preferences_set('filter_users_style','include+active')" /> Include+Active
+ <td style="display: none;">
+ <td style="display: none;"><input type="radio" name="filter_users_style" value="include+active" onclick="ducc_preferences_set('filter_users_style','include+active')" /> Include+Active
<td>
<td><input type="radio" name="filter_users_style" value="exclude" onclick="ducc_preferences_set('filter_users_style','exclude')" /> Exclude
- <td>
- <td><input type="radio" name="filter_users_style" value="exclude+active" onclick="ducc_preferences_set('filter_users_style','exclude+active')" /> Exclude+Active
+ <td style="display: none;">
+ <td style="display: none;"><input type="radio" name="filter_users_style" value="exclude+active" onclick="ducc_preferences_set('filter_users_style','exclude+active')" /> Exclude+Active
<td>
<td>
<%