diff options
| author | Tobias Spitzer | 2014-08-21 11:03:00 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-08-21 11:03:00 +0200 |
| commit | e6a9445d56c676dbf55efd2100b8a07774f4c7e3 (patch) | |
| tree | a61bd4402e48892e664d73f5d960f290403df724 /Dozentenmodulserver | |
| parent | HS Reutlingen bei Permission-Filter hinzugefügt (diff) | |
| download | tutor-module-e6a9445d56c676dbf55efd2100b8a07774f4c7e3.tar.gz tutor-module-e6a9445d56c676dbf55efd2100b8a07774f4c7e3.tar.xz tutor-module-e6a9445d56c676dbf55efd2100b8a07774f4c7e3.zip | |
Beschreibung
Diffstat (limited to 'Dozentenmodulserver')
20 files changed, 406 insertions, 194 deletions
diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class Binary files differindex 9afb3914..3261808f 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class Binary files differindex 8c45803b..2f574090 100644 --- a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class Binary files differindex 57529c4a..2d3d703d 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class Binary files differindex d7836899..91624182 100644 --- a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class Binary files differindex fda3d893..a4b34646 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class Binary files differindex 694e908d..853d2099 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class Binary files differindex 94cacf3a..f2ed7cfe 100644 --- a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class Binary files differindex 57cdfdef..17baed51 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class Binary files differindex d9de4abc..5e5cf714 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class Binary files differindex 14277ca9..0d47dbff 100644 --- a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class +++ b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class Binary files differindex b4a13535..43b8e28f 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class Binary files differindex dd4c5cb9..815473a7 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class Binary files differindex 169c86e2..39ac7076 100644 --- a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class +++ b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class Binary files differindex 4866c551..8e955829 100644 --- a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class +++ b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class Binary files differindex d48de5c6..89adccb1 100644 --- a/Dozentenmodulserver/bin/sql/SQL.class +++ b/Dozentenmodulserver/bin/sql/SQL.class diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class Binary files differindex 6d7673fb..04ba5197 100644 --- a/Dozentenmodulserver/bin/util/XMLCreator.class +++ b/Dozentenmodulserver/bin/util/XMLCreator.class diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 43bdd515..9ea479eb 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -42,7 +42,7 @@ public class Server { public String getPathOfImage(String image_id, String version) throws org.apache.thrift.TException; - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException; + public boolean writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException; public List<Image> getImageList() throws org.apache.thrift.TException; @@ -62,7 +62,7 @@ public class Server { public Map<String,String> getLectureData(String lectureid) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException; public boolean deleteImageData(String id, String version) throws org.apache.thrift.TException; @@ -84,7 +84,7 @@ public class Server { public void getPathOfImage(String image_id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getImageList(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -104,7 +104,7 @@ public class Server { public void getLectureData(String lectureid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void deleteImageData(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -207,16 +207,17 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPathOfImage failed: unknown result"); } - public boolean writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException + public boolean writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException { - send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os); + send_writeVLdata(imagename, desc, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException + public void send_writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); + args.setDesc(desc); args.setLogin(login); args.setFirstname(firstname); args.setLastname(lastname); @@ -464,17 +465,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureData failed: unknown result"); } - public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException { - send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os); + send_updateImageData(name, newName, desc, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setDesc(desc); args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); @@ -748,15 +750,16 @@ public class Server { } } - public void writeVLdata(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeVLdata(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, desc, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, isTemplate, filesize, shareMode, os, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class writeVLdata_call extends org.apache.thrift.async.TAsyncMethodCall { private String imagename; + private String desc; private String login; private String firstname; private String lastname; @@ -773,9 +776,10 @@ public class Server { private long filesize; private long shareMode; private String os; - public writeVLdata_call(String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public writeVLdata_call(String imagename, String desc, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.imagename = imagename; + this.desc = desc; this.login = login; this.firstname = firstname; this.lastname = lastname; @@ -798,6 +802,7 @@ public class Server { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("writeVLdata", org.apache.thrift.protocol.TMessageType.CALL, 0)); writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); + args.setDesc(desc); args.setLogin(login); args.setFirstname(firstname); args.setLastname(lastname); @@ -1149,9 +1154,9 @@ public class Server { } } - public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, desc, image_path, license, internet, ram, cpu, id, version, isTemplate, filesize, shareMode, os, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1159,6 +1164,7 @@ public class Server { public static class updateImageData_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private String newName; + private String desc; private String image_path; private boolean license; private boolean internet; @@ -1170,10 +1176,11 @@ public class Server { private long filesize; private long shareMode; private String os; - public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public updateImageData_call(String name, String newName, String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; + this.desc = desc; this.image_path = image_path; this.license = license; this.internet = internet; @@ -1192,6 +1199,7 @@ public class Server { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setDesc(desc); args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); @@ -1548,7 +1556,7 @@ public class Server { public writeVLdata_result getResult(I iface, writeVLdata_args args) throws org.apache.thrift.TException { writeVLdata_result result = new writeVLdata_result(); - result.success = iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os); + result.success = iface.writeVLdata(args.imagename, args.desc, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os); result.setSuccessIsSet(true); return result; } @@ -1751,7 +1759,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os); + result.success = iface.updateImageData(args.name, args.newName, args.desc, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os); result.setSuccessIsSet(true); return result; } @@ -2099,7 +2107,7 @@ public class Server { } public void start(I iface, writeVLdata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeVLdata(args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os,resultHandler); + iface.writeVLdata(args.imagename, args.desc, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath, args.isTemplate, args.filesize, args.shareMode, args.os,resultHandler); } } @@ -2612,7 +2620,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os,resultHandler); + iface.updateImageData(args.name, args.newName, args.desc, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version, args.isTemplate, args.filesize, args.shareMode, args.os,resultHandler); } } @@ -5003,22 +5011,23 @@ public class Server { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("writeVLdata_args"); private static final org.apache.thrift.protocol.TField IMAGENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imagename", org.apache.thrift.protocol.TType.STRING, (short)-1); - private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)-4); - private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-5); - private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)-6); - private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-9); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-10); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-11); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-12); - private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-13); - private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-14); - private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-15); - private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-16); - private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)-17); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-2); + private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)-4); + private static final org.apache.thrift.protocol.TField LASTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastname", org.apache.thrift.protocol.TType.STRING, (short)-5); + private static final org.apache.thrift.protocol.TField UNIVERSITY_FIELD_DESC = new org.apache.thrift.protocol.TField("university", org.apache.thrift.protocol.TType.STRING, (short)-6); + private static final org.apache.thrift.protocol.TField MAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("Mail", org.apache.thrift.protocol.TType.STRING, (short)-7); + private static final org.apache.thrift.protocol.TField TEL_FIELD_DESC = new org.apache.thrift.protocol.TField("Tel", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField FAK_FIELD_DESC = new org.apache.thrift.protocol.TField("Fak", org.apache.thrift.protocol.TType.STRING, (short)-9); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-10); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-11); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-12); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-13); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("imagePath", org.apache.thrift.protocol.TType.STRING, (short)-14); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-15); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-16); + private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-17); + private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)-18); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -5027,6 +5036,7 @@ public class Server { } public String imagename; // required + public String desc; // required public String login; // required public String firstname; // required public String lastname; // required @@ -5047,22 +5057,23 @@ public class Server { /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { IMAGENAME((short)-1, "imagename"), - LOGIN((short)-2, "login"), - FIRSTNAME((short)-3, "firstname"), - LASTNAME((short)-4, "lastname"), - UNIVERSITY((short)-5, "university"), - MAIL((short)-6, "Mail"), - TEL((short)-7, "Tel"), - FAK((short)-8, "Fak"), - LICENSE((short)-9, "license"), - INTERNET((short)-10, "internet"), - RAM((short)-11, "ram"), - CPU((short)-12, "cpu"), - IMAGE_PATH((short)-13, "imagePath"), - IS_TEMPLATE((short)-14, "isTemplate"), - FILESIZE((short)-15, "filesize"), - SHARE_MODE((short)-16, "shareMode"), - OS((short)-17, "os"); + DESC((short)-2, "desc"), + LOGIN((short)-3, "login"), + FIRSTNAME((short)-4, "firstname"), + LASTNAME((short)-5, "lastname"), + UNIVERSITY((short)-6, "university"), + MAIL((short)-7, "Mail"), + TEL((short)-8, "Tel"), + FAK((short)-9, "Fak"), + LICENSE((short)-10, "license"), + INTERNET((short)-11, "internet"), + RAM((short)-12, "ram"), + CPU((short)-13, "cpu"), + IMAGE_PATH((short)-14, "imagePath"), + IS_TEMPLATE((short)-15, "isTemplate"), + FILESIZE((short)-16, "filesize"), + SHARE_MODE((short)-17, "shareMode"), + OS((short)-18, "os"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -5079,37 +5090,39 @@ public class Server { switch(fieldId) { case -1: // IMAGENAME return IMAGENAME; - case -2: // LOGIN + case -2: // DESC + return DESC; + case -3: // LOGIN return LOGIN; - case -3: // FIRSTNAME + case -4: // FIRSTNAME return FIRSTNAME; - case -4: // LASTNAME + case -5: // LASTNAME return LASTNAME; - case -5: // UNIVERSITY + case -6: // UNIVERSITY return UNIVERSITY; - case -6: // MAIL + case -7: // MAIL return MAIL; - case -7: // TEL + case -8: // TEL return TEL; - case -8: // FAK + case -9: // FAK return FAK; - case -9: // LICENSE + case -10: // LICENSE return LICENSE; - case -10: // INTERNET + case -11: // INTERNET return INTERNET; - case -11: // RAM + case -12: // RAM return RAM; - case -12: // CPU + case -13: // CPU return CPU; - case -13: // IMAGE_PATH + case -14: // IMAGE_PATH return IMAGE_PATH; - case -14: // IS_TEMPLATE + case -15: // IS_TEMPLATE return IS_TEMPLATE; - case -15: // FILESIZE + case -16: // FILESIZE return FILESIZE; - case -16: // SHARE_MODE + case -17: // SHARE_MODE return SHARE_MODE; - case -17: // OS + case -18: // OS return OS; default: return null; @@ -5164,6 +5177,8 @@ public class Server { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.IMAGENAME, new org.apache.thrift.meta_data.FieldMetaData("imagename", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.DESC, new org.apache.thrift.meta_data.FieldMetaData("desc", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LOGIN, new org.apache.thrift.meta_data.FieldMetaData("login", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.FIRSTNAME, new org.apache.thrift.meta_data.FieldMetaData("firstname", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -5205,6 +5220,7 @@ public class Server { public writeVLdata_args( String imagename, + String desc, String login, String firstname, String lastname, @@ -5224,6 +5240,7 @@ public class Server { { this(); this.imagename = imagename; + this.desc = desc; this.login = login; this.firstname = firstname; this.lastname = lastname; @@ -5257,6 +5274,9 @@ public class Server { if (other.isSetImagename()) { this.imagename = other.imagename; } + if (other.isSetDesc()) { + this.desc = other.desc; + } if (other.isSetLogin()) { this.login = other.login; } @@ -5300,6 +5320,7 @@ public class Server { @Override public void clear() { this.imagename = null; + this.desc = null; this.login = null; this.firstname = null; this.lastname = null; @@ -5349,6 +5370,30 @@ public class Server { } } + public String getDesc() { + return this.desc; + } + + public writeVLdata_args setDesc(String desc) { + this.desc = desc; + return this; + } + + public void unsetDesc() { + this.desc = null; + } + + /** Returns true if field desc is set (has been assigned a value) and false otherwise */ + public boolean isSetDesc() { + return this.desc != null; + } + + public void setDescIsSet(boolean value) { + if (!value) { + this.desc = null; + } + } + public String getLogin() { return this.login; } @@ -5736,6 +5781,14 @@ public class Server { } break; + case DESC: + if (value == null) { + unsetDesc(); + } else { + setDesc((String)value); + } + break; + case LOGIN: if (value == null) { unsetLogin(); @@ -5872,6 +5925,9 @@ public class Server { case IMAGENAME: return getImagename(); + case DESC: + return getDesc(); + case LOGIN: return getLogin(); @@ -5933,6 +5989,8 @@ public class Server { switch (field) { case IMAGENAME: return isSetImagename(); + case DESC: + return isSetDesc(); case LOGIN: return isSetLogin(); case FIRSTNAME: @@ -5991,6 +6049,15 @@ public class Server { return false; } + boolean this_present_desc = true && this.isSetDesc(); + boolean that_present_desc = true && that.isSetDesc(); + if (this_present_desc || that_present_desc) { + if (!(this_present_desc && that_present_desc)) + return false; + if (!this.desc.equals(that.desc)) + return false; + } + boolean this_present_login = true && this.isSetLogin(); boolean that_present_login = true && that.isSetLogin(); if (this_present_login || that_present_login) { @@ -6161,6 +6228,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetDesc()).compareTo(other.isSetDesc()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDesc()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.desc, other.desc); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); if (lastComparison != 0) { return lastComparison; @@ -6349,6 +6426,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("desc:"); + if (this.desc == null) { + sb.append("null"); + } else { + sb.append(this.desc); + } + first = false; + if (!first) sb.append(", "); sb.append("login:"); if (this.login == null) { sb.append("null"); @@ -6501,7 +6586,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // LOGIN + case -2: // DESC + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.desc = iprot.readString(); + struct.setDescIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -3: // LOGIN if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.login = iprot.readString(); struct.setLoginIsSet(true); @@ -6509,7 +6602,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // FIRSTNAME + case -4: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -6517,7 +6610,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // LASTNAME + case -5: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -6525,7 +6618,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // UNIVERSITY + case -6: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -6533,7 +6626,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // MAIL + case -7: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -6541,7 +6634,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // TEL + case -8: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -6549,7 +6642,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // FAK + case -9: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -6557,7 +6650,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // LICENSE + case -10: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -6565,7 +6658,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // INTERNET + case -11: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -6573,7 +6666,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // RAM + case -12: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -6581,7 +6674,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // CPU + case -13: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -6589,7 +6682,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // IMAGE_PATH + case -14: // IMAGE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); @@ -6597,7 +6690,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -14: // IS_TEMPLATE + case -15: // IS_TEMPLATE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); @@ -6605,7 +6698,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -15: // FILESIZE + case -16: // FILESIZE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); @@ -6613,7 +6706,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -16: // SHARE_MODE + case -17: // SHARE_MODE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); @@ -6621,7 +6714,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -17: // OS + case -18: // OS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.os = iprot.readString(); struct.setOsIsSet(true); @@ -6710,6 +6803,11 @@ public class Server { oprot.writeString(struct.login); oprot.writeFieldEnd(); } + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); + oprot.writeFieldEnd(); + } if (struct.imagename != null) { oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); oprot.writeString(struct.imagename); @@ -6736,58 +6834,64 @@ public class Server { if (struct.isSetImagename()) { optionals.set(0); } - if (struct.isSetLogin()) { + if (struct.isSetDesc()) { optionals.set(1); } - if (struct.isSetFirstname()) { + if (struct.isSetLogin()) { optionals.set(2); } - if (struct.isSetLastname()) { + if (struct.isSetFirstname()) { optionals.set(3); } - if (struct.isSetUniversity()) { + if (struct.isSetLastname()) { optionals.set(4); } - if (struct.isSetMail()) { + if (struct.isSetUniversity()) { optionals.set(5); } - if (struct.isSetTel()) { + if (struct.isSetMail()) { optionals.set(6); } - if (struct.isSetFak()) { + if (struct.isSetTel()) { optionals.set(7); } - if (struct.isSetLicense()) { + if (struct.isSetFak()) { optionals.set(8); } - if (struct.isSetInternet()) { + if (struct.isSetLicense()) { optionals.set(9); } - if (struct.isSetRam()) { + if (struct.isSetInternet()) { optionals.set(10); } - if (struct.isSetCpu()) { + if (struct.isSetRam()) { optionals.set(11); } - if (struct.isSetImagePath()) { + if (struct.isSetCpu()) { optionals.set(12); } - if (struct.isSetIsTemplate()) { + if (struct.isSetImagePath()) { optionals.set(13); } - if (struct.isSetFilesize()) { + if (struct.isSetIsTemplate()) { optionals.set(14); } - if (struct.isSetShareMode()) { + if (struct.isSetFilesize()) { optionals.set(15); } - if (struct.isSetOs()) { + if (struct.isSetShareMode()) { optionals.set(16); } - oprot.writeBitSet(optionals, 17); + if (struct.isSetOs()) { + optionals.set(17); + } + oprot.writeBitSet(optionals, 18); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } + if (struct.isSetDesc()) { + oprot.writeString(struct.desc); + } if (struct.isSetLogin()) { oprot.writeString(struct.login); } @@ -6841,72 +6945,76 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeVLdata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(17); + BitSet incoming = iprot.readBitSet(18); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); } if (incoming.get(1)) { + struct.desc = iprot.readString(); + struct.setDescIsSet(true); + } + if (incoming.get(2)) { struct.login = iprot.readString(); struct.setLoginIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(11)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(12)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(12)) { + if (incoming.get(13)) { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); } - if (incoming.get(13)) { + if (incoming.get(14)) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); } - if (incoming.get(14)) { + if (incoming.get(15)) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); } - if (incoming.get(15)) { + if (incoming.get(16)) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); } - if (incoming.get(16)) { + if (incoming.get(17)) { struct.os = iprot.readString(); struct.setOsIsSet(true); } @@ -15074,17 +15182,18 @@ public class Server { private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)-3); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-4); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-5); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-6); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-7); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-8); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-9); - private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-10); - private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-11); - private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-12); - private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)-13); + private static final org.apache.thrift.protocol.TField DESC_FIELD_DESC = new org.apache.thrift.protocol.TField("desc", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)-4); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-5); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-6); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-7); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-8); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-9); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-10); + private static final org.apache.thrift.protocol.TField IS_TEMPLATE_FIELD_DESC = new org.apache.thrift.protocol.TField("isTemplate", org.apache.thrift.protocol.TType.BOOL, (short)-11); + private static final org.apache.thrift.protocol.TField FILESIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("filesize", org.apache.thrift.protocol.TType.I64, (short)-12); + private static final org.apache.thrift.protocol.TField SHARE_MODE_FIELD_DESC = new org.apache.thrift.protocol.TField("shareMode", org.apache.thrift.protocol.TType.I64, (short)-13); + private static final org.apache.thrift.protocol.TField OS_FIELD_DESC = new org.apache.thrift.protocol.TField("os", org.apache.thrift.protocol.TType.STRING, (short)-14); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -15094,6 +15203,7 @@ public class Server { public String name; // required public String newName; // required + public String desc; // required public String image_path; // required public boolean license; // required public boolean internet; // required @@ -15110,17 +15220,18 @@ public class Server { public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)-1, "name"), NEW_NAME((short)-2, "newName"), - IMAGE_PATH((short)-3, "image_path"), - LICENSE((short)-4, "license"), - INTERNET((short)-5, "internet"), - RAM((short)-6, "ram"), - CPU((short)-7, "cpu"), - ID((short)-8, "id"), - VERSION((short)-9, "version"), - IS_TEMPLATE((short)-10, "isTemplate"), - FILESIZE((short)-11, "filesize"), - SHARE_MODE((short)-12, "shareMode"), - OS((short)-13, "os"); + DESC((short)-3, "desc"), + IMAGE_PATH((short)-4, "image_path"), + LICENSE((short)-5, "license"), + INTERNET((short)-6, "internet"), + RAM((short)-7, "ram"), + CPU((short)-8, "cpu"), + ID((short)-9, "id"), + VERSION((short)-10, "version"), + IS_TEMPLATE((short)-11, "isTemplate"), + FILESIZE((short)-12, "filesize"), + SHARE_MODE((short)-13, "shareMode"), + OS((short)-14, "os"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -15139,27 +15250,29 @@ public class Server { return NAME; case -2: // NEW_NAME return NEW_NAME; - case -3: // IMAGE_PATH + case -3: // DESC + return DESC; + case -4: // IMAGE_PATH return IMAGE_PATH; - case -4: // LICENSE + case -5: // LICENSE return LICENSE; - case -5: // INTERNET + case -6: // INTERNET return INTERNET; - case -6: // RAM + case -7: // RAM return RAM; - case -7: // CPU + case -8: // CPU return CPU; - case -8: // ID + case -9: // ID return ID; - case -9: // VERSION + case -10: // VERSION return VERSION; - case -10: // IS_TEMPLATE + case -11: // IS_TEMPLATE return IS_TEMPLATE; - case -11: // FILESIZE + case -12: // FILESIZE return FILESIZE; - case -12: // SHARE_MODE + case -13: // SHARE_MODE return SHARE_MODE; - case -13: // OS + case -14: // OS return OS; default: return null; @@ -15216,6 +15329,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.NEW_NAME, new org.apache.thrift.meta_data.FieldMetaData("newName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.DESC, new org.apache.thrift.meta_data.FieldMetaData("desc", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("image_path", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LICENSE, new org.apache.thrift.meta_data.FieldMetaData("license", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -15248,6 +15363,7 @@ public class Server { public updateImageData_args( String name, String newName, + String desc, String image_path, boolean license, boolean internet, @@ -15263,6 +15379,7 @@ public class Server { this(); this.name = name; this.newName = newName; + this.desc = desc; this.image_path = image_path; this.license = license; setLicenseIsSet(true); @@ -15294,6 +15411,9 @@ public class Server { if (other.isSetNewName()) { this.newName = other.newName; } + if (other.isSetDesc()) { + this.desc = other.desc; + } if (other.isSetImage_path()) { this.image_path = other.image_path; } @@ -15323,6 +15443,7 @@ public class Server { public void clear() { this.name = null; this.newName = null; + this.desc = null; this.image_path = null; setLicenseIsSet(false); this.license = false; @@ -15391,6 +15512,30 @@ public class Server { } } + public String getDesc() { + return this.desc; + } + + public updateImageData_args setDesc(String desc) { + this.desc = desc; + return this; + } + + public void unsetDesc() { + this.desc = null; + } + + /** Returns true if field desc is set (has been assigned a value) and false otherwise */ + public boolean isSetDesc() { + return this.desc != null; + } + + public void setDescIsSet(boolean value) { + if (!value) { + this.desc = null; + } + } + public String getImage_path() { return this.image_path; } @@ -15666,6 +15811,14 @@ public class Server { } break; + case DESC: + if (value == null) { + unsetDesc(); + } else { + setDesc((String)value); + } + break; + case IMAGE_PATH: if (value == null) { unsetImage_path(); @@ -15765,6 +15918,9 @@ public class Server { case NEW_NAME: return getNewName(); + case DESC: + return getDesc(); + case IMAGE_PATH: return getImage_path(); @@ -15813,6 +15969,8 @@ public class Server { return isSetName(); case NEW_NAME: return isSetNewName(); + case DESC: + return isSetDesc(); case IMAGE_PATH: return isSetImage_path(); case LICENSE: @@ -15870,6 +16028,15 @@ public class Server { return false; } + boolean this_present_desc = true && this.isSetDesc(); + boolean that_present_desc = true && that.isSetDesc(); + if (this_present_desc || that_present_desc) { + if (!(this_present_desc && that_present_desc)) + return false; + if (!this.desc.equals(that.desc)) + return false; + } + boolean this_present_image_path = true && this.isSetImage_path(); boolean that_present_image_path = true && that.isSetImage_path(); if (this_present_image_path || that_present_image_path) { @@ -16005,6 +16172,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetDesc()).compareTo(other.isSetDesc()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetDesc()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.desc, other.desc); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetImage_path()).compareTo(other.isSetImage_path()); if (lastComparison != 0) { return lastComparison; @@ -16151,6 +16328,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("desc:"); + if (this.desc == null) { + sb.append("null"); + } else { + sb.append(this.desc); + } + first = false; + if (!first) sb.append(", "); sb.append("image_path:"); if (this.image_path == null) { sb.append("null"); @@ -16271,7 +16456,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // IMAGE_PATH + case -3: // DESC + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.desc = iprot.readString(); + struct.setDescIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -4: // IMAGE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.image_path = iprot.readString(); struct.setImage_pathIsSet(true); @@ -16279,7 +16472,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // LICENSE + case -5: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -16287,7 +16480,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // INTERNET + case -6: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -16295,7 +16488,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // RAM + case -7: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -16303,7 +16496,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // CPU + case -8: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -16311,7 +16504,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // ID + case -9: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -16319,7 +16512,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // VERSION + case -10: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -16327,7 +16520,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // IS_TEMPLATE + case -11: // IS_TEMPLATE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); @@ -16335,7 +16528,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // FILESIZE + case -12: // FILESIZE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); @@ -16343,7 +16536,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // SHARE_MODE + case -13: // SHARE_MODE if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); @@ -16351,7 +16544,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // OS + case -14: // OS if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.os = iprot.readString(); struct.setOsIsSet(true); @@ -16415,6 +16608,11 @@ public class Server { oprot.writeString(struct.image_path); oprot.writeFieldEnd(); } + if (struct.desc != null) { + oprot.writeFieldBegin(DESC_FIELD_DESC); + oprot.writeString(struct.desc); + oprot.writeFieldEnd(); + } if (struct.newName != null) { oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); oprot.writeString(struct.newName); @@ -16449,46 +16647,52 @@ public class Server { if (struct.isSetNewName()) { optionals.set(1); } - if (struct.isSetImage_path()) { + if (struct.isSetDesc()) { optionals.set(2); } - if (struct.isSetLicense()) { + if (struct.isSetImage_path()) { optionals.set(3); } - if (struct.isSetInternet()) { + if (struct.isSetLicense()) { optionals.set(4); } - if (struct.isSetRam()) { + if (struct.isSetInternet()) { optionals.set(5); } - if (struct.isSetCpu()) { + if (struct.isSetRam()) { optionals.set(6); } - if (struct.isSetId()) { + if (struct.isSetCpu()) { optionals.set(7); } - if (struct.isSetVersion()) { + if (struct.isSetId()) { optionals.set(8); } - if (struct.isSetIsTemplate()) { + if (struct.isSetVersion()) { optionals.set(9); } - if (struct.isSetFilesize()) { + if (struct.isSetIsTemplate()) { optionals.set(10); } - if (struct.isSetShareMode()) { + if (struct.isSetFilesize()) { optionals.set(11); } - if (struct.isSetOs()) { + if (struct.isSetShareMode()) { optionals.set(12); } - oprot.writeBitSet(optionals, 13); + if (struct.isSetOs()) { + optionals.set(13); + } + oprot.writeBitSet(optionals, 14); if (struct.isSetName()) { oprot.writeString(struct.name); } if (struct.isSetNewName()) { oprot.writeString(struct.newName); } + if (struct.isSetDesc()) { + oprot.writeString(struct.desc); + } if (struct.isSetImage_path()) { oprot.writeString(struct.image_path); } @@ -16527,7 +16731,7 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(13); + BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -16537,46 +16741,50 @@ public class Server { struct.setNewNameIsSet(true); } if (incoming.get(2)) { + struct.desc = iprot.readString(); + struct.setDescIsSet(true); + } + if (incoming.get(3)) { struct.image_path = iprot.readString(); struct.setImage_pathIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.version = iprot.readString(); struct.setVersionIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { struct.isTemplate = iprot.readBool(); struct.setIsTemplateIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(11)) { struct.filesize = iprot.readI64(); struct.setFilesizeIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(12)) { struct.shareMode = iprot.readI64(); struct.setShareModeIsSet(true); } - if (incoming.get(12)) { + if (incoming.get(13)) { struct.os = iprot.readString(); struct.setOsIsSet(true); } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 906fba3c..276ee619 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -159,7 +159,7 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean writeVLdata(String imagename, String login, + public boolean writeVLdata(String imagename, String desc ,String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, boolean isTemplate, @@ -184,7 +184,7 @@ public class ServerHandler implements Server.Iface { String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", "")); - sql.setImageData(pk_person, license, internet, cpu, ram, imagename, + sql.setImageData(pk_person, license, internet, cpu, ram, imagename,desc, imagePath, isTemplate, filesize,mode,pk_os); log.info(new Date() + " - written VLdata"); @@ -283,7 +283,7 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean updateImageData(String name, String newName, + public boolean updateImageData(String name, String newName,String desc, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, boolean isTemplate, long filesize, long shareMode, String os) throws TException { @@ -297,7 +297,7 @@ public class ServerHandler implements Server.Iface { mode="to_be_published"; } String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", "")); - sql.UpdateImageData(name, newName, image_path, license, internet, cpu, + sql.UpdateImageData(name, newName,desc ,image_path, license, internet, cpu, ram, id, version, isTemplate, filesize,mode,pk_os); return false; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 461a372b..36038e4a 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -232,7 +232,7 @@ public class SQL { }
public boolean setImageData(String pk_person, boolean license,
- boolean internet, long cpu, long ram, String imagename,
+ boolean internet, long cpu, long ram, String imagename,String desc,
String imagePath, boolean isTemplate, long filesize, String shareMode, String pk_os) {
DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
@@ -251,10 +251,11 @@ public class SQL { Statement stm = con.createStatement();
String uid = UUID.randomUUID().toString();
- stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"
+ stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_description`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`,`image_isTemplate`,`image_filesize`,`image_syncMode`)VALUES('"
+ uid // GUID_imageID
+ "',1,'" // imageVersion
+ imagename // image_name
+ + "','" +desc //image_description
+ "','" + imagePath // image_path
+ "','" + formatter.format(new Date()) // image_lastCall
+ "','" + formatter.format(new Date()) // image_create_time
@@ -490,7 +491,7 @@ public class SQL { Connection con=getConnection();
Statement stm = con.createStatement();
ResultSet data=stm
- .executeQuery("SELECT i.image_name,i.image_update_time,i.cond_hasInternetRestriction,i.cond_hasLicenseRestriction, i.cond_minCPUs,i.cond_minRAM, i.image_syncMode,i.image_filesize,i.image_path, i.image_isTemplate,os.GuestOS, concat(u.Nachname,' ',u.Vorname) as Owner FROM bwLehrpool.m_VLData_imageInfo i,bwLehrpool.m_user u,bwLehrpool.m_operatingSystem os where i.image_owner=u.userID and i.content_operatingSystem=os.operatingSystemID and GUID_imageID = '" + id + "' and imageVersion = '" + version + "' ;");
+ .executeQuery("SELECT i.image_name,i.image_description,i.image_update_time,i.cond_hasInternetRestriction,i.cond_hasLicenseRestriction, i.cond_minCPUs,i.cond_minRAM, i.image_syncMode,i.image_filesize,i.image_path, i.image_isTemplate,os.GuestOS, concat(u.Nachname,' ',u.Vorname) as Owner FROM bwLehrpool.m_VLData_imageInfo i,bwLehrpool.m_user u,bwLehrpool.m_operatingSystem os where i.image_owner=u.userID and i.content_operatingSystem=os.operatingSystemID and GUID_imageID = '" + id + "' and imageVersion = '" + version + "' ;");
while (data.next()) {
map.put("name", data.getString("image_name"));
map.put("internet",
@@ -505,6 +506,7 @@ public class SQL { map.put("os",data.getString("GuestOS"));
map.put("owner", data.getString("Owner"));
map.put("lastupdate", data.getString("image_update_time"));
+ map.put("desc", data.getString("image_description"));
}
con.close();
@@ -517,7 +519,7 @@ public class SQL { return null;
}
- public int UpdateImageData(String name, String newName,String image_path,
+ public int UpdateImageData(String name, String newName,String desc,String image_path,
boolean license, boolean internet, long cpu, long ram, String id,
String version, boolean isTemplate, long filesize, String shareMode,String ospk) {
try {
@@ -540,6 +542,8 @@ public class SQL { + newVersion
+ "',`image_name` = '"
+ newName
+ + "',`image_description` = '"
+ + desc
+ "',`image_path` = '"
+ image_path
+ "',`image_update_time` = '"
diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 571a32ac..9f24bfea 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -38,7 +38,7 @@ service Server{ User getFtpUser(), int DeleteFtpUser(string user), string getPathOfImage(string image_id,string version), - bool writeVLdata(string imagename, string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize, int shareMode, string os), + bool writeVLdata(string imagename, string desc ,string login ,string firstname, string lastname,string university, string Mail, string Tel, string Fak, bool license, bool internet, int ram, int cpu, string imagePath, bool isTemplate ,i64 filesize, int shareMode, string os), list<Image> getImageList(), list<Lecture> getLectureList(), list<string> getAllOS(), @@ -48,7 +48,7 @@ service Server{ bool startFileCopy(string file), map<string,string> getImageData(string imageid, string imageversion), map<string,string> getLectureData(string lectureid), - bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize, int shareMode, string os), + bool updateImageData(string name, string newName,string desc,string image_path,bool license, bool internet, int ram,int cpu, string id, string version,bool isTemplate ,i64 filesize, int shareMode, string os), bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imageid, string imageversion,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), bool deleteImageServer(string id, string version), |