Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tom Morris 2013-02-26 00:01:06 -05:00
commit 389e762251
8 changed files with 15 additions and 4 deletions

View File

@ -303,6 +303,7 @@ public abstract class Command {
response.setCharacterEncoding("UTF-8");
response.setHeader("Content-Type", "application/json");
response.setHeader("Cache-Control", "no-cache");
Writer w = response.getWriter();
JSONWriter writer = new JSONWriter(w);

View File

@ -85,6 +85,7 @@ public class GetModelsCommand extends Command {
try {
response.setCharacterEncoding("UTF-8");
response.setHeader("Content-Type", "application/json");
response.setHeader("Cache-Control", "no-cache");
Properties options = new Properties();
JSONWriter writer = new JSONWriter(response.getWriter());

View File

@ -65,7 +65,6 @@ import org.apache.commons.fileupload.ProgressListener;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.util.Streams;
import org.apache.commons.io.FileCleaningTracker;
import org.apache.tools.bzip2.CBZip2InputStream;
import org.apache.tools.tar.TarEntry;
import org.apache.tools.tar.TarInputStream;
@ -187,7 +186,6 @@ public class ImportingUtilities {
};
DiskFileItemFactory fileItemFactory = new DiskFileItemFactory();
fileItemFactory.setFileCleaningTracker(new FileCleaningTracker());
ServletFileUpload upload = new ServletFileUpload(fileItemFactory);
upload.setProgressListener(new ProgressListener() {
@ -212,8 +210,10 @@ public class ImportingUtilities {
}
});
List tempFiles = upload.parseRequest(request);
progress.setProgress("Uploading data ...", -1);
parts: for (Object obj : upload.parseRequest(request)) {
parts: for (Object obj : tempFiles) {
if (progress.isCanceled()) {
break;
}
@ -355,6 +355,13 @@ public class ImportingUtilities {
uploadCount++;
}
}
stream.close();
}
// Delete all temp files.
for (Object obj : tempFiles) {
((FileItem)obj).delete();
}
JSONUtilities.safePut(retrievalRecord, "uploadCount", uploadCount);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -680,6 +680,7 @@ ListFacet.prototype._editExpression = function() {
self._config.expression = expr;
self._elmts.expressionDiv.text(self._config.expression);
self._elmts.changeButton.attr("title", "Current Expression: " + self._config.expression);
if (self._config.expression == "value" || self._config.expression == "grel:value") {
self._elmts.clusterLink.show();
} else {
@ -689,6 +690,7 @@ ListFacet.prototype._editExpression = function() {
self.reset();
self._updateRest();
}
self._elmts.expressionDiv.hide();
}
);
};

2
refine
View File

@ -854,7 +854,7 @@ if [ ! -x "$JAVA" ] ; then
error "Could not find the 'java' executable at '$JAVA', are you sure your JAVA_HOME environment variable is pointing to a proper java installation?"
fi
JAVA_VERSION=`$JAVA -version 2>&1 | grep version | cut -d ' ' -f 3 | egrep '^\"1\.(6|7)'`
JAVA_VERSION=`$JAVA -version 2>&1 | grep version | cut -d ' ' -f 3 | egrep '^\"1\.(6|7|8)'`
if [ -z "$JAVA_VERSION" ] ; then
error "OpenRefine requires Java version 6 or later. If you have multiple versions of Java installed, please set the environment variable JAVA_HOME to the correct version."
fi