X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=datadb%2Fcompbio%2Fcassandra%2FCassandraUserManager.java;fp=datadb%2Fcompbio%2Fcassandra%2FCassandraUserManager.java;h=f8101072f6a5cd0460200528e2703c360d54df41;hb=9bb6ee99ca7f738fac1087190b5481b8fe6e8d9f;hp=4bcd4b979a2f9a0ca66064020cb315850c6caf7a;hpb=2e3f6b76be585306f1003d849831840c0adb3360;p=proteocache.git

diff --git a/datadb/compbio/cassandra/CassandraUserManager.java b/datadb/compbio/cassandra/CassandraUserManager.java
index 4bcd4b9..f810107 100644
--- a/datadb/compbio/cassandra/CassandraUserManager.java
+++ b/datadb/compbio/cassandra/CassandraUserManager.java
@@ -37,7 +37,7 @@ public class CassandraUserManager implements UserManager {
 			if (0 < users.all().size()) {
 				throw new DataIntegrityViolationException("A user with email " + user.getEmail() + " exists");
 			}
-			
+
 		} catch (QueryExecutionException e) {
 			String mess = "CassandraUserManagerImpl.addUser: query execution exception...";
 			System.out.println(mess);
@@ -58,13 +58,14 @@ public class CassandraUserManager implements UserManager {
 			try {
 				ResultSet values = session.execute(com);
 				List<Row> list = values.all();
-				/*
-				if (1 != list.size()) {
-					return false;
+				if (0 < list.size()) {
+					String test = list.get(0).getString("Value");
+					id = Long.parseLong(test, 10);
+				} else {
+					// if the MaxUserId parameter does not exist it is inserted
+					// with id = 1
+					id = 0;
 				}
-				*/
-				String test = list.get(0).getString("Value");
-				id = Long.parseLong(test, 10);
 				id++;
 				com = "INSERT INTO MainParameters (name,value) VALUES ('MaxUserId','" + id + "');";
 				session.execute(com);
@@ -82,11 +83,10 @@ public class CassandraUserManager implements UserManager {
 				return false;
 			}
 		}
-		
+
 		String incom = "INSERT INTO Users (name, id, email, password, organisation, position, signedtolist, registrationdate) VALUES ('"
-				+ user.getFullName() + "'," + id + ",'" + user.getEmail() + "','" + user.getPassword() + "','"
-				+ user.getOrganisation() + "','" + user.getPosition() + "'," + user.isUpdateByEmail() + ","
-				+ user.getRegistrationDate().getTime() + ");";
+				+ user.getFullName() + "'," + id + ",'" + user.getEmail() + "','" + user.getPassword() + "','" + user.getOrganisation()
+				+ "','" + user.getPosition() + "'," + user.isUpdateByEmail() + "," + user.getRegistrationDate().getTime() + ");";
 		try {
 			session.execute(incom);
 		} catch (QueryExecutionException e) {