diff options
| author | Tobias Spitzer | 2014-08-20 11:20:24 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-08-20 11:20:24 +0200 |
| commit | 515e5b984f573d8ff2f5d3253a1ffc2b8b450ce3 (patch) | |
| tree | 67d1eef820ed1e3a83a590620a597081aedd6a5b /Dozentenmodulserver/src/server | |
| parent | update build date (diff) | |
| download | tutor-module-515e5b984f573d8ff2f5d3253a1ffc2b8b450ce3.tar.gz tutor-module-515e5b984f573d8ff2f5d3253a1ffc2b8b450ce3.tar.xz tutor-module-515e5b984f573d8ff2f5d3253a1ffc2b8b450ce3.zip | |
Neueste Version
Diffstat (limited to 'Dozentenmodulserver/src/server')
| -rw-r--r-- | Dozentenmodulserver/src/server/Server.java | 320 | ||||
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 9 |
2 files changed, 214 insertions, 115 deletions
diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 568ef600..43bdd515 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -66,7 +66,7 @@ public class Server { public boolean deleteImageData(String id, String version) throws org.apache.thrift.TException; - public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException; + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException; public boolean deleteImageServer(String id, String version) throws org.apache.thrift.TException; @@ -108,7 +108,7 @@ public class Server { public void deleteImageData(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void deleteImageServer(String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -523,13 +523,13 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteImageData failed: unknown result"); } - public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException + public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException { - send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id); + send_updateLecturedata(name, newName, shortdesc, desc, startDate, endDate, isActive, imageid, imageversion, firstname, lastname, university, Mail, Tel, Fak, id); return recv_updateLecturedata(); } - public void send_updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException + public void send_updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws org.apache.thrift.TException { updateLecturedata_args args = new updateLecturedata_args(); args.setName(name); @@ -539,7 +539,8 @@ public class Server { args.setStartDate(startDate); args.setEndDate(endDate); args.setIsActive(isActive); - args.setImagename(imagename); + args.setImageid(imageid); + args.setImageversion(imageversion); args.setFirstname(firstname); args.setLastname(lastname); args.setUniversity(university); @@ -1251,9 +1252,9 @@ public class Server { } } - public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateLecturedata_call method_call = new updateLecturedata_call(name, newName, shortdesc, desc, startDate, endDate, isActive, imagename, firstname, lastname, university, Mail, Tel, Fak, id, resultHandler, this, ___protocolFactory, ___transport); + updateLecturedata_call method_call = new updateLecturedata_call(name, newName, shortdesc, desc, startDate, endDate, isActive, imageid, imageversion, firstname, lastname, university, Mail, Tel, Fak, id, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1266,7 +1267,8 @@ public class Server { private String startDate; private String endDate; private boolean isActive; - private String imagename; + private String imageid; + private String imageversion; private String firstname; private String lastname; private String university; @@ -1274,7 +1276,7 @@ public class Server { private String Tel; private String Fak; private String id; - public updateLecturedata_call(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imagename, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, 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 updateLecturedata_call(String name, String newName, String shortdesc, String desc, String startDate, String endDate, boolean isActive, String imageid, String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id, 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; @@ -1283,7 +1285,8 @@ public class Server { this.startDate = startDate; this.endDate = endDate; this.isActive = isActive; - this.imagename = imagename; + this.imageid = imageid; + this.imageversion = imageversion; this.firstname = firstname; this.lastname = lastname; this.university = university; @@ -1303,7 +1306,8 @@ public class Server { args.setStartDate(startDate); args.setEndDate(endDate); args.setIsActive(isActive); - args.setImagename(imagename); + args.setImageid(imageid); + args.setImageversion(imageversion); args.setFirstname(firstname); args.setLastname(lastname); args.setUniversity(university); @@ -1789,7 +1793,7 @@ public class Server { public updateLecturedata_result getResult(I iface, updateLecturedata_args args) throws org.apache.thrift.TException { updateLecturedata_result result = new updateLecturedata_result(); - result.success = iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.id); + result.success = iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imageid, args.imageversion, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.id); result.setSuccessIsSet(true); return result; } @@ -2712,7 +2716,7 @@ public class Server { } public void start(I iface, updateLecturedata_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException { - iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imagename, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.id,resultHandler); + iface.updateLecturedata(args.name, args.newName, args.shortdesc, args.desc, args.startDate, args.endDate, args.isActive, args.imageid, args.imageversion, args.firstname, args.lastname, args.university, args.Mail, args.Tel, args.Fak, args.id,resultHandler); } } @@ -17753,14 +17757,15 @@ public class Server { private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.STRING, (short)-5); 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)-6); 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)-7); - 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)-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 org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-15); + private static final org.apache.thrift.protocol.TField IMAGEID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageid", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField IMAGEVERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageversion", org.apache.thrift.protocol.TType.STRING, (short)-9); + 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)-10); + 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)-11); + 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)-12); + 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)-13); + 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)-14); + 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)-15); + 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)-16); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -17775,7 +17780,8 @@ public class Server { public String startDate; // required public String endDate; // required public boolean isActive; // required - public String imagename; // required + public String imageid; // required + public String imageversion; // required public String firstname; // required public String lastname; // required public String university; // required @@ -17793,14 +17799,15 @@ public class Server { START_DATE((short)-5, "startDate"), END_DATE((short)-6, "endDate"), IS_ACTIVE((short)-7, "isActive"), - IMAGENAME((short)-8, "imagename"), - FIRSTNAME((short)-9, "firstname"), - LASTNAME((short)-10, "lastname"), - UNIVERSITY((short)-11, "university"), - MAIL((short)-12, "Mail"), - TEL((short)-13, "Tel"), - FAK((short)-14, "Fak"), - ID((short)-15, "id"); + IMAGEID((short)-8, "imageid"), + IMAGEVERSION((short)-9, "imageversion"), + FIRSTNAME((short)-10, "firstname"), + LASTNAME((short)-11, "lastname"), + UNIVERSITY((short)-12, "university"), + MAIL((short)-13, "Mail"), + TEL((short)-14, "Tel"), + FAK((short)-15, "Fak"), + ID((short)-16, "id"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -17829,21 +17836,23 @@ public class Server { return END_DATE; case -7: // IS_ACTIVE return IS_ACTIVE; - case -8: // IMAGENAME - return IMAGENAME; - case -9: // FIRSTNAME + case -8: // IMAGEID + return IMAGEID; + case -9: // IMAGEVERSION + return IMAGEVERSION; + case -10: // FIRSTNAME return FIRSTNAME; - case -10: // LASTNAME + case -11: // LASTNAME return LASTNAME; - case -11: // UNIVERSITY + case -12: // UNIVERSITY return UNIVERSITY; - case -12: // MAIL + case -13: // MAIL return MAIL; - case -13: // TEL + case -14: // TEL return TEL; - case -14: // FAK + case -15: // FAK return FAK; - case -15: // ID + case -16: // ID return ID; default: return null; @@ -17904,7 +17913,9 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.IS_ACTIVE, new org.apache.thrift.meta_data.FieldMetaData("isActive", org.apache.thrift.TFieldRequirementType.DEFAULT, 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, + tmpMap.put(_Fields.IMAGEID, new org.apache.thrift.meta_data.FieldMetaData("imageid", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IMAGEVERSION, new org.apache.thrift.meta_data.FieldMetaData("imageversion", 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))); @@ -17935,7 +17946,8 @@ public class Server { String startDate, String endDate, boolean isActive, - String imagename, + String imageid, + String imageversion, String firstname, String lastname, String university, @@ -17953,7 +17965,8 @@ public class Server { this.endDate = endDate; this.isActive = isActive; setIsActiveIsSet(true); - this.imagename = imagename; + this.imageid = imageid; + this.imageversion = imageversion; this.firstname = firstname; this.lastname = lastname; this.university = university; @@ -17987,8 +18000,11 @@ public class Server { this.endDate = other.endDate; } this.isActive = other.isActive; - if (other.isSetImagename()) { - this.imagename = other.imagename; + if (other.isSetImageid()) { + this.imageid = other.imageid; + } + if (other.isSetImageversion()) { + this.imageversion = other.imageversion; } if (other.isSetFirstname()) { this.firstname = other.firstname; @@ -18027,7 +18043,8 @@ public class Server { this.endDate = null; setIsActiveIsSet(false); this.isActive = false; - this.imagename = null; + this.imageid = null; + this.imageversion = null; this.firstname = null; this.lastname = null; this.university = null; @@ -18204,27 +18221,51 @@ public class Server { __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISACTIVE_ISSET_ID, value); } - public String getImagename() { - return this.imagename; + public String getImageid() { + return this.imageid; } - public updateLecturedata_args setImagename(String imagename) { - this.imagename = imagename; + public updateLecturedata_args setImageid(String imageid) { + this.imageid = imageid; return this; } - public void unsetImagename() { - this.imagename = null; + public void unsetImageid() { + this.imageid = null; } - /** Returns true if field imagename is set (has been assigned a value) and false otherwise */ - public boolean isSetImagename() { - return this.imagename != null; + /** Returns true if field imageid is set (has been assigned a value) and false otherwise */ + public boolean isSetImageid() { + return this.imageid != null; } - public void setImagenameIsSet(boolean value) { + public void setImageidIsSet(boolean value) { if (!value) { - this.imagename = null; + this.imageid = null; + } + } + + public String getImageversion() { + return this.imageversion; + } + + public updateLecturedata_args setImageversion(String imageversion) { + this.imageversion = imageversion; + return this; + } + + public void unsetImageversion() { + this.imageversion = null; + } + + /** Returns true if field imageversion is set (has been assigned a value) and false otherwise */ + public boolean isSetImageversion() { + return this.imageversion != null; + } + + public void setImageversionIsSet(boolean value) { + if (!value) { + this.imageversion = null; } } @@ -18454,11 +18495,19 @@ public class Server { } break; - case IMAGENAME: + case IMAGEID: if (value == null) { - unsetImagename(); + unsetImageid(); } else { - setImagename((String)value); + setImageid((String)value); + } + break; + + case IMAGEVERSION: + if (value == null) { + unsetImageversion(); + } else { + setImageversion((String)value); } break; @@ -18544,8 +18593,11 @@ public class Server { case IS_ACTIVE: return Boolean.valueOf(isIsActive()); - case IMAGENAME: - return getImagename(); + case IMAGEID: + return getImageid(); + + case IMAGEVERSION: + return getImageversion(); case FIRSTNAME: return getFirstname(); @@ -18593,8 +18645,10 @@ public class Server { return isSetEndDate(); case IS_ACTIVE: return isSetIsActive(); - case IMAGENAME: - return isSetImagename(); + case IMAGEID: + return isSetImageid(); + case IMAGEVERSION: + return isSetImageversion(); case FIRSTNAME: return isSetFirstname(); case LASTNAME: @@ -18689,12 +18743,21 @@ public class Server { return false; } - boolean this_present_imagename = true && this.isSetImagename(); - boolean that_present_imagename = true && that.isSetImagename(); - if (this_present_imagename || that_present_imagename) { - if (!(this_present_imagename && that_present_imagename)) + boolean this_present_imageid = true && this.isSetImageid(); + boolean that_present_imageid = true && that.isSetImageid(); + if (this_present_imageid || that_present_imageid) { + if (!(this_present_imageid && that_present_imageid)) return false; - if (!this.imagename.equals(that.imagename)) + if (!this.imageid.equals(that.imageid)) + return false; + } + + boolean this_present_imageversion = true && this.isSetImageversion(); + boolean that_present_imageversion = true && that.isSetImageversion(); + if (this_present_imageversion || that_present_imageversion) { + if (!(this_present_imageversion && that_present_imageversion)) + return false; + if (!this.imageversion.equals(that.imageversion)) return false; } @@ -18847,12 +18910,22 @@ public class Server { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetImagename()).compareTo(other.isSetImagename()); + lastComparison = Boolean.valueOf(isSetImageid()).compareTo(other.isSetImageid()); if (lastComparison != 0) { return lastComparison; } - if (isSetImagename()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imagename, other.imagename); + if (isSetImageid()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageid, other.imageid); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetImageversion()).compareTo(other.isSetImageversion()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetImageversion()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageversion, other.imageversion); if (lastComparison != 0) { return lastComparison; } @@ -18999,11 +19072,19 @@ public class Server { sb.append(this.isActive); first = false; if (!first) sb.append(", "); - sb.append("imagename:"); - if (this.imagename == null) { + sb.append("imageid:"); + if (this.imageid == null) { sb.append("null"); } else { - sb.append(this.imagename); + sb.append(this.imageid); + } + first = false; + if (!first) sb.append(", "); + sb.append("imageversion:"); + if (this.imageversion == null) { + sb.append("null"); + } else { + sb.append(this.imageversion); } first = false; if (!first) sb.append(", "); @@ -19163,15 +19244,23 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // IMAGENAME + case -8: // IMAGEID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.imagename = iprot.readString(); - struct.setImagenameIsSet(true); + struct.imageid = iprot.readString(); + struct.setImageidIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -9: // FIRSTNAME + case -9: // IMAGEVERSION + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.imageversion = iprot.readString(); + struct.setImageversionIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -10: // FIRSTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); @@ -19179,7 +19268,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -10: // LASTNAME + case -11: // LASTNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); @@ -19187,7 +19276,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -11: // UNIVERSITY + case -12: // UNIVERSITY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); @@ -19195,7 +19284,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -12: // MAIL + case -13: // MAIL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); @@ -19203,7 +19292,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -13: // TEL + case -14: // TEL if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); @@ -19211,7 +19300,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -14: // FAK + case -15: // FAK if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); @@ -19219,7 +19308,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -15: // ID + case -16: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -19277,9 +19366,14 @@ public class Server { oprot.writeString(struct.firstname); oprot.writeFieldEnd(); } - if (struct.imagename != null) { - oprot.writeFieldBegin(IMAGENAME_FIELD_DESC); - oprot.writeString(struct.imagename); + if (struct.imageversion != null) { + oprot.writeFieldBegin(IMAGEVERSION_FIELD_DESC); + oprot.writeString(struct.imageversion); + oprot.writeFieldEnd(); + } + if (struct.imageid != null) { + oprot.writeFieldBegin(IMAGEID_FIELD_DESC); + oprot.writeString(struct.imageid); oprot.writeFieldEnd(); } oprot.writeFieldBegin(IS_ACTIVE_FIELD_DESC); @@ -19354,31 +19448,34 @@ public class Server { if (struct.isSetIsActive()) { optionals.set(6); } - if (struct.isSetImagename()) { + if (struct.isSetImageid()) { optionals.set(7); } - if (struct.isSetFirstname()) { + if (struct.isSetImageversion()) { optionals.set(8); } - if (struct.isSetLastname()) { + if (struct.isSetFirstname()) { optionals.set(9); } - if (struct.isSetUniversity()) { + if (struct.isSetLastname()) { optionals.set(10); } - if (struct.isSetMail()) { + if (struct.isSetUniversity()) { optionals.set(11); } - if (struct.isSetTel()) { + if (struct.isSetMail()) { optionals.set(12); } - if (struct.isSetFak()) { + if (struct.isSetTel()) { optionals.set(13); } - if (struct.isSetId()) { + if (struct.isSetFak()) { optionals.set(14); } - oprot.writeBitSet(optionals, 15); + if (struct.isSetId()) { + optionals.set(15); + } + oprot.writeBitSet(optionals, 16); if (struct.isSetName()) { oprot.writeString(struct.name); } @@ -19400,8 +19497,11 @@ public class Server { if (struct.isSetIsActive()) { oprot.writeBool(struct.isActive); } - if (struct.isSetImagename()) { - oprot.writeString(struct.imagename); + if (struct.isSetImageid()) { + oprot.writeString(struct.imageid); + } + if (struct.isSetImageversion()) { + oprot.writeString(struct.imageversion); } if (struct.isSetFirstname()) { oprot.writeString(struct.firstname); @@ -19429,7 +19529,7 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateLecturedata_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(15); + BitSet incoming = iprot.readBitSet(16); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -19459,34 +19559,38 @@ public class Server { struct.setIsActiveIsSet(true); } if (incoming.get(7)) { - struct.imagename = iprot.readString(); - struct.setImagenameIsSet(true); + struct.imageid = iprot.readString(); + struct.setImageidIsSet(true); } if (incoming.get(8)) { + struct.imageversion = iprot.readString(); + struct.setImageversionIsSet(true); + } + if (incoming.get(9)) { struct.firstname = iprot.readString(); struct.setFirstnameIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(10)) { struct.lastname = iprot.readString(); struct.setLastnameIsSet(true); } - if (incoming.get(10)) { + if (incoming.get(11)) { struct.university = iprot.readString(); struct.setUniversityIsSet(true); } - if (incoming.get(11)) { + if (incoming.get(12)) { struct.Mail = iprot.readString(); struct.setMailIsSet(true); } - if (incoming.get(12)) { + if (incoming.get(13)) { struct.Tel = iprot.readString(); struct.setTelIsSet(true); } - if (incoming.get(13)) { + if (incoming.get(14)) { struct.Fak = iprot.readString(); struct.setFakIsSet(true); } - if (incoming.get(14)) { + if (incoming.get(15)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 0ba4d08c..906fba3c 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -319,16 +319,11 @@ public class ServerHandler implements Server.Iface { @Override public boolean updateLecturedata(String name, String newName, String shortdesc, String desc, String startDate, String endDate, - boolean isActive, String imagename, String firstname, + boolean isActive, String imageid,String imageversion, String firstname, String lastname, String university, String Mail, String Tel, String Fak, String id) throws TException { - String pk_image = ""; - int imageversion = 0; - Map<String, String> image = sql.getImageIDandVersion(imagename); - pk_image = image.get("GUID"); - imageversion = Integer.parseInt(image.get("version")); - sql.updateLectureData(pk_image, imageversion, lastname, newName, desc, + sql.updateLectureData(imageid, imageversion, lastname, newName, desc, shortdesc, startDate, endDate, isActive, id); XMLCreator xml = new XMLCreator(sql.getConnection(), newName); |
