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/01/07 21:09:03 UTC
svn commit: r1723623 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
AlienTextFile.java DuccHandler.java
Author: degenaro
Date: Thu Jan 7 20:09:03 2016
New Revision: 1723623
URL: http://svn.apache.org/viewvc?rev=1723623&view=rev
Log:
UIMA-4717 ducc-mon fails to display log files if there is a '+' in the filename
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java?rev=1723623&r1=1723622&r2=1723623&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/AlienTextFile.java Thu Jan 7 20:09:03 2016
@@ -161,7 +161,7 @@ public class AlienTextFile extends Alien
}
private String getDu() throws Throwable {
- String methodName = "getDu";
+ String location = "getDu";
String data = "";
try {
String[] command = buildCommandDu();
@@ -169,25 +169,25 @@ public class AlienTextFile extends Alien
trace("data size:"+data.length());
}
catch(Throwable t) {
- duccLogger.warn(methodName, duccId, t);
+ duccLogger.warn(location, duccId, t);
}
return data;
}
private int convertToInt(String value, int otherwise) {
- String methodName = "convertToInt";
+ String location = "convertToInt";
int retVal = otherwise;
try {
retVal = Integer.parseInt(value);
}
catch(Throwable t) {
- duccLogger.trace(methodName, duccId, t);
+ duccLogger.trace(location, duccId, t);
}
return retVal;
}
public int getByteSize() {
- String methodName = "getByteSize";
+ String location = "getByteSize";
int retVal = sizeDefault;
try {
String text = getDu();
@@ -195,16 +195,16 @@ public class AlienTextFile extends Alien
text = text.trim();
String[] tokens = text.split("\\s+");
if(tokens.length > 0) {
- duccLogger.debug(methodName, duccId, tokens[0]);
+ duccLogger.debug(location, duccId, tokens[0]);
retVal = convertToInt(tokens[0], sizeDefault);
}
else {
- duccLogger.debug(methodName, duccId, "empty");
+ duccLogger.debug(location, duccId, "empty");
}
}
}
catch(Throwable t) {
- duccLogger.warn(methodName, duccId, t);
+ duccLogger.warn(location, duccId, t);
}
return retVal;
}
@@ -225,7 +225,7 @@ public class AlienTextFile extends Alien
}
private String getDd(int skip, int count) throws Throwable {
- String methodName = "getDd";
+ String location = "getDd";
String data = "";
try {
String[] command = buildCommandDd(skip, count);
@@ -233,13 +233,13 @@ public class AlienTextFile extends Alien
trace("data size:"+data.length());
}
catch(Throwable t) {
- duccLogger.warn(methodName, duccId, t);
+ duccLogger.warn(location, duccId, t);
}
return data;
}
public String getChunk(int byteStart, int byteCount) {
- String methodName = "getChunk";
+ String location = "getChunk";
String retVal = "";
try {
int skip = (int) Math.ceil(byteStart / (1.0*sizeBlockDd));
@@ -248,7 +248,7 @@ public class AlienTextFile extends Alien
retVal = getDd(skip, count);
}
catch(Throwable t) {
- duccLogger.warn(methodName, duccId, t);
+ duccLogger.warn(location, duccId, t);
}
return retVal;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1723623&r1=1723622&r2=1723623&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Thu Jan 7 20:09:03 2016
@@ -109,6 +109,7 @@ import org.apache.uima.ducc.ws.utils.For
import org.apache.uima.ducc.ws.utils.HandlersHelper;
import org.apache.uima.ducc.ws.utils.LinuxSignals;
import org.apache.uima.ducc.ws.utils.LinuxSignals.Signal;
+import org.apache.uima.ducc.ws.utils.UrlHelper;
import org.apache.uima.ducc.ws.utils.alien.AlienWorkItemStateReader;
import org.apache.uima.ducc.ws.utils.alien.EffectiveUser;
import org.apache.uima.ducc.ws.utils.alien.FileInfo;
@@ -933,7 +934,8 @@ public class DuccHandler extends DuccAbs
}
private String getFilePagerUrl(String file_name, int pages) {
- String parms = "?"+"fname="+file_name+"&"+"pages="+pages;
+ String encoded_file_name = UrlHelper.encode(file_name);
+ String parms = "?"+"fname="+encoded_file_name+"&"+"pages="+pages;
String url=duccFilePager+parms;
return url;
}