summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-07-08 19:40:22 +0200
committerSimon Rettberg2015-07-08 19:40:22 +0200
commitf99ba9714f704ae7bc043eb4ff9ded3f8bf27026 (patch)
tree46004703ccab656860ff4eacb5b41d0ded055285 /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
parent[client] Redo package structure, add comments/TODOs, rename GUI classes (diff)
downloadtutor-module-f99ba9714f704ae7bc043eb4ff9ded3f8bf27026.tar.gz
tutor-module-f99ba9714f704ae7bc043eb4ff9ded3f8bf27026.tar.xz
tutor-module-f99ba9714f704ae7bc043eb4ff9ded3f8bf27026.zip
[server] Implement OS list fetching, caching, and fallback to local DB
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 03bb8444..24a110e5 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -41,7 +41,7 @@ import org.openslx.bwlp.thrift.iface.TInvalidTokenException;
import org.openslx.bwlp.thrift.iface.TNotFoundException;
import org.openslx.bwlp.thrift.iface.TTransferRejectedException;
import org.openslx.bwlp.thrift.iface.TransferInformation;
-import org.openslx.bwlp.thrift.iface.UploadStatus;
+import org.openslx.bwlp.thrift.iface.TransferStatus;
import org.openslx.bwlp.thrift.iface.UserInfo;
import org.openslx.bwlp.thrift.iface.Virtualizer;
import org.openslx.sat.thrift.version.Version;
@@ -82,7 +82,7 @@ public class ServerHandler implements SatelliteServer.Iface {
}
@Override
- public UploadStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException {
+ public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException {
// TODO Auto-generated method stub
return null;
}
@@ -140,8 +140,9 @@ public class ServerHandler implements SatelliteServer.Iface {
@Override
public List<ImageSummaryRead> getImageList(String userToken, List<String> tagSearch, int page)
throws TAuthorizationException, TInternalServerError {
- UserInfo user = SessionManager.getOrFail(userToken);
- User.canListImagesOrFail(user);
+ //UserInfo user = SessionManager.getOrFail(userToken);
+ //User.canListImagesOrFail(user);
+ UserInfo user = new UserInfo("bla", "bla", "bla", "bla", "bla");
try {
return DbImage.getAllVisible(user, tagSearch, page);
} catch (SQLException e) {