diff options
| author | unknown | 2014-04-24 09:16:49 +0200 |
|---|---|---|
| committer | unknown | 2014-04-24 09:16:49 +0200 |
| commit | cd1d124dda6d4000a05fcfc22e39f4399c1955f7 (patch) | |
| tree | 8302b781652546b0acb0acd70c0310c2447199e8 /Dozentenmodulserver/src | |
| parent | fds (diff) | |
| download | tutor-module-cd1d124dda6d4000a05fcfc22e39f4399c1955f7.tar.gz tutor-module-cd1d124dda6d4000a05fcfc22e39f4399c1955f7.tar.xz tutor-module-cd1d124dda6d4000a05fcfc22e39f4399c1955f7.zip | |
Loginname wurde angepasst
Diffstat (limited to 'Dozentenmodulserver/src')
| -rw-r--r-- | Dozentenmodulserver/src/server/Server.java | 456 | ||||
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 8 | ||||
| -rw-r--r-- | Dozentenmodulserver/src/sql/SQL.java | 4 |
3 files changed, 339 insertions, 129 deletions
diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index fac89b2c..88003fa2 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 firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) 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) throws org.apache.thrift.TException; public List<Image> getImageList() throws org.apache.thrift.TException; @@ -52,7 +52,7 @@ public class Server { public Map<String,String> getPersonData(String Vorname, String Nachname) throws org.apache.thrift.TException; - public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws org.apache.thrift.TException; + public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws org.apache.thrift.TException; public boolean startFileCopy(String file) throws org.apache.thrift.TException; @@ -82,7 +82,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 firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, 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, 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; @@ -92,7 +92,7 @@ public class Server { public void getPersonData(String Vorname, String Nachname, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void startFileCopy(String file, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -203,16 +203,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 firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) 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) throws org.apache.thrift.TException { - send_writeVLdata(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath); + send_writeVLdata(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath); return recv_writeVLdata(); } - public void send_writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws org.apache.thrift.TException + 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) throws org.apache.thrift.TException { writeVLdata_args args = new writeVLdata_args(); args.setImagename(imagename); + args.setLogin(login); args.setFirstname(firstname); args.setLastname(lastname); args.setUniversity(university); @@ -327,13 +328,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPersonData failed: unknown result"); } - public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws org.apache.thrift.TException + public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws org.apache.thrift.TException { - send_writeLecturedata(name, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak); + send_writeLecturedata(name, shortdesc, desc, startDate, endDate, isActive, imagename, login, firstname, lastname, university, Mail, Tel, Fak); return recv_writeLecturedata(); } - public void send_writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws org.apache.thrift.TException + public void send_writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws org.apache.thrift.TException { writeLecturedata_args args = new writeLecturedata_args(); args.setName(name); @@ -343,6 +344,7 @@ public class Server { args.setEndDate(endDate); args.setIsActive(isActive); args.setImagename(imagename); + args.setLogin(login); args.setFirstname(firstname); args.setLastname(lastname); args.setUniversity(university); @@ -708,15 +710,16 @@ public class Server { } } - public void writeVLdata(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, 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, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeVLdata_call method_call = new writeVLdata_call(imagename, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, resultHandler, this, ___protocolFactory, ___transport); + writeVLdata_call method_call = new writeVLdata_call(imagename, login, firstname, lastname, university, Mail, Tel, Fak, license, internet, ram, cpu, imagePath, 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 login; private String firstname; private String lastname; private String university; @@ -728,9 +731,10 @@ public class Server { private long ram; private long cpu; private String imagePath; - public writeVLdata_call(String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, 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 login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath, 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.login = login; this.firstname = firstname; this.lastname = lastname; this.university = university; @@ -748,6 +752,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.setLogin(login); args.setFirstname(firstname); args.setLastname(lastname); args.setUniversity(university); @@ -895,9 +900,9 @@ public class Server { } } - public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - writeLecturedata_call method_call = new writeLecturedata_call(name, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, resultHandler, this, ___protocolFactory, ___transport); + writeLecturedata_call method_call = new writeLecturedata_call(name, shortdesc, desc, startDate, endDate, isActive, imagename, login, firstname, lastname, university, Mail, Tel, Fak, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -910,13 +915,14 @@ public class Server { private String endDate; private boolean isActive; private String imagename; + private String login; private String firstname; private String lastname; private String university; private String Mail; private String Tel; private String Fak; - public writeLecturedata_call(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, 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 writeLecturedata_call(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak, 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.shortdesc = shortdesc; @@ -925,6 +931,7 @@ public class Server { this.endDate = endDate; this.isActive = isActive; this.imagename = imagename; + this.login = login; this.firstname = firstname; this.lastname = lastname; this.university = university; @@ -943,6 +950,7 @@ public class Server { args.setEndDate(endDate); args.setIsActive(isActive); args.setImagename(imagename); + args.setLogin(login); args.setFirstname(firstname); args.setLastname(lastname); args.setUniversity(university); @@ -1436,7 +1444,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.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath); + 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); result.setSuccessIsSet(true); return result; } @@ -1537,7 +1545,7 @@ public class Server { public writeLecturedata_result getResult(I iface, writeLecturedata_args args) throws org.apache.thrift.TException { writeLecturedata_result result = new writeLecturedata_result(); - result.success = iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak); + result.success = iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak); result.setSuccessIsSet(true); return result; } @@ -1966,7 +1974,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.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.license, args.internet, args.ram, args.cpu, args.imagePath,resultHandler); + 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,resultHandler); } } @@ -2222,7 +2230,7 @@ public class Server { } public void start(I iface, writeLecturedata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak,resultHandler); + iface.writeLecturedata(args.name, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.login, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak,resultHandler); } } @@ -4819,17 +4827,18 @@ 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 FIRSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("firstname", org.apache.thrift.protocol.TType.STRING, (short)-2); - 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)-3); - 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)-4); - 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)-5); - 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)-6); - 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)-7); - 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)-8); - 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)-9); - 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)-10); - 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)-11); - 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)-12); + 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -4838,6 +4847,7 @@ public class Server { } public String imagename; // required + public String login; // required public String firstname; // required public String lastname; // required public String university; // required @@ -4853,17 +4863,18 @@ 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"), - FIRSTNAME((short)-2, "firstname"), - LASTNAME((short)-3, "lastname"), - UNIVERSITY((short)-4, "university"), - MAIL((short)-5, "Mail"), - TEL((short)-6, "Tel"), - FAK((short)-7, "Fak"), - LICENSE((short)-8, "license"), - INTERNET((short)-9, "internet"), - RAM((short)-10, "ram"), - CPU((short)-11, "cpu"), - IMAGE_PATH((short)-12, "imagePath"); + 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"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -4880,27 +4891,29 @@ public class Server { switch(fieldId) { case -1: // IMAGENAME return IMAGENAME; - case -2: // FIRSTNAME + case -2: // LOGIN + return LOGIN; + case -3: // FIRSTNAME return FIRSTNAME; - case -3: // LASTNAME + case -4: // LASTNAME return LASTNAME; - case -4: // UNIVERSITY + case -5: // UNIVERSITY return UNIVERSITY; - case -5: // MAIL + case -6: // MAIL return MAIL; - case -6: // TEL + case -7: // TEL return TEL; - case -7: // FAK + case -8: // FAK return FAK; - case -8: // LICENSE + case -9: // LICENSE return LICENSE; - case -9: // INTERNET + case -10: // INTERNET return INTERNET; - case -10: // RAM + case -11: // RAM return RAM; - case -11: // CPU + case -12: // CPU return CPU; - case -12: // IMAGE_PATH + case -13: // IMAGE_PATH return IMAGE_PATH; default: return null; @@ -4952,6 +4965,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.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, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LASTNAME, new org.apache.thrift.meta_data.FieldMetaData("lastname", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -4983,6 +4998,7 @@ public class Server { public writeVLdata_args( String imagename, + String login, String firstname, String lastname, String university, @@ -4997,6 +5013,7 @@ public class Server { { this(); this.imagename = imagename; + this.login = login; this.firstname = firstname; this.lastname = lastname; this.university = university; @@ -5022,6 +5039,9 @@ public class Server { if (other.isSetImagename()) { this.imagename = other.imagename; } + if (other.isSetLogin()) { + this.login = other.login; + } if (other.isSetFirstname()) { this.firstname = other.firstname; } @@ -5056,6 +5076,7 @@ public class Server { @Override public void clear() { this.imagename = null; + this.login = null; this.firstname = null; this.lastname = null; this.university = null; @@ -5097,6 +5118,30 @@ public class Server { } } + public String getLogin() { + return this.login; + } + + public writeVLdata_args setLogin(String login) { + this.login = login; + return this; + } + + public void unsetLogin() { + this.login = null; + } + + /** Returns true if field login is set (has been assigned a value) and false otherwise */ + public boolean isSetLogin() { + return this.login != null; + } + + public void setLoginIsSet(boolean value) { + if (!value) { + this.login = null; + } + } + public String getFirstname() { return this.firstname; } @@ -5367,6 +5412,14 @@ public class Server { } break; + case LOGIN: + if (value == null) { + unsetLogin(); + } else { + setLogin((String)value); + } + break; + case FIRSTNAME: if (value == null) { unsetFirstname(); @@ -5463,6 +5516,9 @@ public class Server { case IMAGENAME: return getImagename(); + case LOGIN: + return getLogin(); + case FIRSTNAME: return getFirstname(); @@ -5509,6 +5565,8 @@ public class Server { switch (field) { case IMAGENAME: return isSetImagename(); + case LOGIN: + return isSetLogin(); case FIRSTNAME: return isSetFirstname(); case LASTNAME: @@ -5557,6 +5615,15 @@ public class Server { return false; } + boolean this_present_login = true && this.isSetLogin(); + boolean that_present_login = true && that.isSetLogin(); + if (this_present_login || that_present_login) { + if (!(this_present_login && that_present_login)) + return false; + if (!this.login.equals(that.login)) + return false; + } + boolean this_present_firstname = true && this.isSetFirstname(); boolean that_present_firstname = true && that.isSetFirstname(); if (this_present_firstname || that_present_firstname) { @@ -5682,6 +5749,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLogin()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetFirstname()).compareTo(other.isSetFirstname()); if (lastComparison != 0) { return lastComparison; @@ -5820,6 +5897,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("login:"); + if (this.login == null) { + sb.append("null"); + } else { + sb.append(this.login); + } + first = false; + if (!first) sb.append(", "); sb.append("firstname:"); if (this.firstname == null) { sb.append("null"); @@ -5944,7 +6029,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -2: // FIRSTNAME + case -2: // LOGIN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.login = iprot.readString(); + struct.setLoginIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -3: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -5952,7 +6045,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LASTNAME + case -4: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -5960,7 +6053,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // UNIVERSITY + case -5: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -5968,7 +6061,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // MAIL + case -6: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -5976,7 +6069,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // TEL + case -7: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -5984,7 +6077,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // FAK + case -8: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -5992,7 +6085,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // LICENSE + case -9: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -6000,7 +6093,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // INTERNET + case -10: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -6008,7 +6101,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // RAM + case -11: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -6016,7 +6109,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // CPU + case -12: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -6024,7 +6117,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // IMAGE_PATH + case -13: // IMAGE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); @@ -6094,6 +6187,11 @@ public class Server { oprot.writeString(struct.firstname); oprot.writeFieldEnd(); } + if (struct.login != null) { + oprot.writeFieldBegin(LOGIN_FIELD_DESC); + oprot.writeString(struct.login); + oprot.writeFieldEnd(); + } if (struct.imagename != null) { oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); oprot.writeString(struct.imagename); @@ -6120,43 +6218,49 @@ public class Server { if (struct.isSetImagename()) { optionals.set(0); } - if (struct.isSetFirstname()) { + if (struct.isSetLogin()) { optionals.set(1); } - if (struct.isSetLastname()) { + if (struct.isSetFirstname()) { optionals.set(2); } - if (struct.isSetUniversity()) { + if (struct.isSetLastname()) { optionals.set(3); } - if (struct.isSetMail()) { + if (struct.isSetUniversity()) { optionals.set(4); } - if (struct.isSetTel()) { + if (struct.isSetMail()) { optionals.set(5); } - if (struct.isSetFak()) { + if (struct.isSetTel()) { optionals.set(6); } - if (struct.isSetLicense()) { + if (struct.isSetFak()) { optionals.set(7); } - if (struct.isSetInternet()) { + if (struct.isSetLicense()) { optionals.set(8); } - if (struct.isSetRam()) { + if (struct.isSetInternet()) { optionals.set(9); } - if (struct.isSetCpu()) { + if (struct.isSetRam()) { optionals.set(10); } - if (struct.isSetImagePath()) { + if (struct.isSetCpu()) { optionals.set(11); } - oprot.writeBitSet(optionals, 12); + if (struct.isSetImagePath()) { + optionals.set(12); + } + oprot.writeBitSet(optionals, 13); if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } + if (struct.isSetLogin()) { + oprot.writeString(struct.login); + } if (struct.isSetFirstname()) { oprot.writeString(struct.firstname); } @@ -6195,52 +6299,56 @@ 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(12); + BitSet incoming = iprot.readBitSet(13); if (incoming.get(0)) { struct.imagename = iprot.readString(); struct.setImagenameIsSet(true); } if (incoming.get(1)) { + struct.login = iprot.readString(); + struct.setLoginIsSet(true); + } + if (incoming.get(2)) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(11)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(12)) { struct.imagePath = iprot.readString(); struct.setImagePathIsSet(true); } @@ -9430,12 +9538,13 @@ public class Server { private static final org.apache.thrift.protocol.TField END_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("endDate", org.apache.thrift.protocol.TType.STRING, (short)-5); private static final org.apache.thrift.protocol.TField IS_ACTIVE_FIELD_DESC = new org.apache.thrift.protocol.TField("isActive", org.apache.thrift.protocol.TType.BOOL, (short)-6); 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)-7); - 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)-8); - 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)-9); - 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)-10); - 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)-11); - 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)-12); - 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)-13); + 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)-8); + 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)-9); + 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)-10); + 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)-11); + 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)-12); + 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)-13); + 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)-14); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -9450,6 +9559,7 @@ public class Server { public String endDate; // required public boolean isActive; // required public String imagename; // required + public String login; // required public String firstname; // required public String lastname; // required public String university; // required @@ -9466,12 +9576,13 @@ public class Server { END_DATE((short)-5, "endDate"), IS_ACTIVE((short)-6, "isActive"), IMAGENAME((short)-7, "imagename"), - FIRSTNAME((short)-8, "firstname"), - LASTNAME((short)-9, "lastname"), - UNIVERSITY((short)-10, "university"), - MAIL((short)-11, "Mail"), - TEL((short)-12, "Tel"), - FAK((short)-13, "Fak"); + LOGIN((short)-8, "login"), + FIRSTNAME((short)-9, "firstname"), + LASTNAME((short)-10, "lastname"), + UNIVERSITY((short)-11, "university"), + MAIL((short)-12, "Mail"), + TEL((short)-13, "Tel"), + FAK((short)-14, "Fak"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -9500,17 +9611,19 @@ public class Server { return IS_ACTIVE; case -7: // IMAGENAME return IMAGENAME; - case -8: // FIRSTNAME + case -8: // LOGIN + return LOGIN; + case -9: // FIRSTNAME return FIRSTNAME; - case -9: // LASTNAME + case -10: // LASTNAME return LASTNAME; - case -10: // UNIVERSITY + case -11: // UNIVERSITY return UNIVERSITY; - case -11: // MAIL + case -12: // MAIL return MAIL; - case -12: // TEL + case -13: // TEL return TEL; - case -13: // FAK + case -14: // FAK return FAK; default: return null; @@ -9571,6 +9684,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); 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.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, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LASTNAME, new org.apache.thrift.meta_data.FieldMetaData("lastname", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -9598,6 +9713,7 @@ public class Server { String endDate, boolean isActive, String imagename, + String login, String firstname, String lastname, String university, @@ -9614,6 +9730,7 @@ public class Server { this.isActive = isActive; setIsActiveIsSet(true); this.imagename = imagename; + this.login = login; this.firstname = firstname; this.lastname = lastname; this.university = university; @@ -9646,6 +9763,9 @@ public class Server { if (other.isSetImagename()) { this.imagename = other.imagename; } + if (other.isSetLogin()) { + this.login = other.login; + } if (other.isSetFirstname()) { this.firstname = other.firstname; } @@ -9680,6 +9800,7 @@ public class Server { setIsActiveIsSet(false); this.isActive = false; this.imagename = null; + this.login = null; this.firstname = null; this.lastname = null; this.university = null; @@ -9855,6 +9976,30 @@ public class Server { } } + public String getLogin() { + return this.login; + } + + public writeLecturedata_args setLogin(String login) { + this.login = login; + return this; + } + + public void unsetLogin() { + this.login = null; + } + + /** Returns true if field login is set (has been assigned a value) and false otherwise */ + public boolean isSetLogin() { + return this.login != null; + } + + public void setLoginIsSet(boolean value) { + if (!value) { + this.login = null; + } + } + public String getFirstname() { return this.firstname; } @@ -10057,6 +10202,14 @@ public class Server { } break; + case LOGIN: + if (value == null) { + unsetLogin(); + } else { + setLogin((String)value); + } + break; + case FIRSTNAME: if (value == null) { unsetFirstname(); @@ -10131,6 +10284,9 @@ public class Server { case IMAGENAME: return getImagename(); + case LOGIN: + return getLogin(); + case FIRSTNAME: return getFirstname(); @@ -10174,6 +10330,8 @@ public class Server { return isSetIsActive(); case IMAGENAME: return isSetImagename(); + case LOGIN: + return isSetLogin(); case FIRSTNAME: return isSetFirstname(); case LASTNAME: @@ -10266,6 +10424,15 @@ public class Server { return false; } + boolean this_present_login = true && this.isSetLogin(); + boolean that_present_login = true && that.isSetLogin(); + if (this_present_login || that_present_login) { + if (!(this_present_login && that_present_login)) + return false; + if (!this.login.equals(that.login)) + return false; + } + boolean this_present_firstname = true && this.isSetFirstname(); boolean that_present_firstname = true && that.isSetFirstname(); if (this_present_firstname || that_present_firstname) { @@ -10406,6 +10573,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLogin()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetFirstname()).compareTo(other.isSetFirstname()); if (lastComparison != 0) { return lastComparison; @@ -10538,6 +10715,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("login:"); + if (this.login == null) { + sb.append("null"); + } else { + sb.append(this.login); + } + first = false; + if (!first) sb.append(", "); sb.append("firstname:"); if (this.firstname == null) { sb.append("null"); @@ -10686,7 +10871,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // FIRSTNAME + case -8: // LOGIN + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.login = iprot.readString(); + struct.setLoginIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -9: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -10694,7 +10887,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // LASTNAME + case -10: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -10702,7 +10895,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // UNIVERSITY + case -11: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -10710,7 +10903,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // MAIL + case -12: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -10718,7 +10911,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // TEL + case -13: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -10726,7 +10919,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // FAK + case -14: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -10779,6 +10972,11 @@ public class Server { oprot.writeString(struct.firstname); oprot.writeFieldEnd(); } + if (struct.login != null) { + oprot.writeFieldBegin(LOGIN_FIELD_DESC); + oprot.writeString(struct.login); + oprot.writeFieldEnd(); + } if (struct.imagename != null) { oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); oprot.writeString(struct.imagename); @@ -10851,25 +11049,28 @@ public class Server { if (struct.isSetImagename()) { optionals.set(6); } - if (struct.isSetFirstname()) { + if (struct.isSetLogin()) { optionals.set(7); } - if (struct.isSetLastname()) { + if (struct.isSetFirstname()) { optionals.set(8); } - if (struct.isSetUniversity()) { + if (struct.isSetLastname()) { optionals.set(9); } - if (struct.isSetMail()) { + if (struct.isSetUniversity()) { optionals.set(10); } - if (struct.isSetTel()) { + if (struct.isSetMail()) { optionals.set(11); } - if (struct.isSetFak()) { + if (struct.isSetTel()) { optionals.set(12); } - oprot.writeBitSet(optionals, 13); + if (struct.isSetFak()) { + optionals.set(13); + } + oprot.writeBitSet(optionals, 14); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -10891,6 +11092,9 @@ public class Server { if (struct.isSetImagename()) { oprot.writeString(struct.imagename); } + if (struct.isSetLogin()) { + oprot.writeString(struct.login); + } if (struct.isSetFirstname()) { oprot.writeString(struct.firstname); } @@ -10914,7 +11118,7 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, writeLecturedata_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); @@ -10944,26 +11148,30 @@ public class Server { struct.setImagenameIsSet(true); } if (incoming.get(7)) { + struct.login = iprot.readString(); + struct.setLoginIsSet(true); + } + if (incoming.get(8)) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(9)) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(11)) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(12)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(12)) { + if (incoming.get(13)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index daf8f4d0..d8099b7b 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -98,11 +98,11 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean writeVLdata(String imagename, String firstname, + 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) throws TException { - String login = "tete"; + int pk_institution = sql.setInstitution(con, university); @@ -193,11 +193,11 @@ public class ServerHandler implements Server.Iface { @Override public boolean writeLecturedata(String name, String shortdesc, String desc, String startDate, String endDate, boolean isActive, - String imagename, String firstname, String lastname, + String imagename, String login ,String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws TException { int pk_image = 0; - String login = "tete"; + int imageversion = 0; int pk_institution = sql.setInstitution(con, university); int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 5c5b0ec6..decdbf89 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -158,7 +158,9 @@ public class SQL { int id = rand.nextInt();
stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('"
+ id
- + "','Platzhalter','"
+ + "','"
+ +login
+ +"','"
+ lastname
+ "','"
+ firstname
|
