|
From: Thomas J. <fa...@ap...> - 2002-11-05 00:58:24
|
Update of /var/lib/cvs/bWF2/src/de/bchat/database
In directory apollo:/tmp/cvs-serv28111
Modified Files:
bchatDatabase.java
Log Message:
the fields in the db have changed a bit. ICQ->IM, skin_defs is gone, skin -> theme, now string, not int.
Index: bchatDatabase.java
===================================================================
RCS file: /var/lib/cvs/bWF2/src/de/bchat/database/bchatDatabase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- bchatDatabase.java 4 Nov 2002 23:48:43 -0000 1.13
+++ bchatDatabase.java 5 Nov 2002 00:58:17 -0000 1.14
@@ -76,10 +76,9 @@
try {
Statement stmt = con.createStatement();
- ResultSet rs = stmt.executeQuery("SELECT * FROM udata LEFT JOIN skin_defs ON udata.skin = skin_defs.ID " +
- "WHERE udata.ID='" + user.getUserID() + "'");
+ ResultSet rs = stmt.executeQuery("SELECT * FROM udata WHERE udata.ID='" + user.getUserID() + "'");
if(rs.next()) {
- user.setIM(rs.getString("ICQ"));
+ user.setIM(rs.getString("IM"));
user.setAlias(rs.getString("Alias"));
user.setBanned(rs.getBoolean("banned"));
user.setEmail(rs.getString("Email"));
@@ -94,8 +93,7 @@
user.setPublic(rs.getBoolean("pub"));
user.setRealName(rs.getString("realname"));
user.setAdmin(rs.getBoolean("right_table"));
- user.setSkin(rs.getInt("skin"));
- user.setSkinName(rs.getString("name"));
+ user.setTheme(rs.getString("theme"));
user.setWhisperWindow(rs.getBoolean("whisperwin"));
if (rs.getString("locale") != null) {
user.setLocale(new Locale(rs.getString("locale"),""));
@@ -180,7 +178,7 @@
boolean ret = false;
String upd = "UPDATE udata SET " +
- " icq='" + user.getIM() + "', " +
+ " im='" + user.getIM() + "', " +
" alias='" + user.getAlias() + "', " +
" banned='" + ( user.getBanned() ? "1" : "0" ) + "', " +
" email='" + user.getEmail() + "', " +
@@ -194,13 +192,12 @@
" logout_text='" + user.getLogoutText() + "', " +
" pub='" + ( user.getPublic() ? "yes" : "no" ) + "', " +
" realname='" + user.getRealName() + "', " +
+ " theme='" + user.getTheme() + "', " +
" whisperwin='" + ( user.getWhisperWindow() ? "1" : "0" ) + "', " +
" right_table='" + ( user.getAdmin() ? "1" : "0" ) + "', " +
" locale='" + user.getLocale().toString() +"'"+
" WHERE ID = '" + user.getUserID() + "'";
-
- //user.setSkin(rs.getString("skin"));
try {
Statement stmt = con.createStatement();
|