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/08 16:28:40 UTC
svn commit: r1734104 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerClassic.java DuccHandlerJsonFormat.java DuccWebUtil.java
Author: degenaro
Date: Tue Mar 8 15:28:40 2016
New Revision: 1734104
URL: http://svn.apache.org/viewvc?rev=1734104&view=rev
Log:
UIMA-3989 DUCC Web Server (WS) Services page to show up to max records + those in Alert status, if any
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
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=1734104&r1=1734103&r2=1734104&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 Tue Mar 8 15:28:40 2016
@@ -969,7 +969,9 @@ public class DuccHandlerClassic extends
for(IServiceAdapter service : servicesSortedCollection) {
boolean list = DuccWebUtil.isListable(request, users, maxRecords, counter, service);
if(!list) {
- continue;
+ if(!service.isAlert()) {
+ 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=1734104&r1=1734103&r2=1734104&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 Tue Mar 8 15:28:40 2016
@@ -1102,7 +1102,17 @@ public class DuccHandlerJsonFormat exten
Collection<IServiceAdapter> servicesSortedCollection = servicesSortCache.getSortedCollection();
if(!servicesSortedCollection.isEmpty()) {
StringBuffer col;
+ int maxRecords = getServicesMax(request);
+ ArrayList<String> users = getServicesUsers(request);
+ int counter = 0;
for(IServiceAdapter service : servicesSortedCollection) {
+ boolean list = DuccWebUtil.isListable(request, users, maxRecords, counter, service);
+ if(!list) {
+ if(!service.isAlert()) {
+ continue;
+ }
+ }
+ counter++;
JsonArray row = new JsonArray();
int sid = service.getId();
String user = service.getUser();
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=1734104&r1=1734103&r2=1734104&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 Tue Mar 8 15:28:40 2016
@@ -197,10 +197,7 @@ public class DuccWebUtil {
}
}
else {
- if(isAvailable(propertiesMeta)) {
- list = true;
- }
- else if(maxRecords > 0) {
+ if(maxRecords > 0) {
if (counter < maxRecords) {
list = true;
}