Revision: 4007
Author: seba.wagner
Date: Tue Jul 26 10:30:16 2011
Log: some improvements to Import
http://code.google.com/p/openmeetings/source/detail?r=4007
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Sat Jul 23 04:37:43 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Tue Jul 26 10:30:16 2011
@@ -229,7 +229,7 @@
return room;
}
else{
- log.error("Could not find room " + rooms_id);
+ log.info("Could not find room " + rooms_id);
}
} catch (Exception ex2) {
log.error("[getRoomById] ", ex2);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Sat Jul 23 04:37:43 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
Tue Jul 26 10:30:16 2011
@@ -223,7 +223,7 @@
}
public FileExplorerItem getFileExplorerItemsById(Long
fileExplorerItemId) {
- log.debug(".getFileExplorerItemsById() started");
+ //log.debug(".getFileExplorerItemsById() started");
try {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sat Jul 23 04:37:43 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Tue Jul 26 10:30:16 2011
@@ -48,11 +48,12 @@
/**
*
* @author swagner
- *
+ *
*/
public class Usermanagement {
- private static final Logger log =
Red5LoggerFactory.getLogger(Usermanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ Usermanagement.class,
ScopeApplicationAdapter.webAppRootKey);
private static Usermanagement instance = null;
@@ -65,9 +66,10 @@
}
return instance;
}
-
+
/**
* query for a list of users
+ *
* @param users_id
* @param user_level
* @param start
@@ -75,14 +77,16 @@
* @param orderby
* @return
*/
- public SearchResult getUsersList(long user_level, int start, int max,
String orderby, boolean asc){
+ public SearchResult getUsersList(long user_level, int start, int max,
+ String orderby, boolean asc) {
try {
- if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
+ if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)) {
SearchResult sresult = new SearchResult();
sresult.setObjectName(Users.class.getName());
-
sresult.setRecords(UsersDaoImpl.getInstance().selectMaxFromUsers());
-
- //get all users
+ sresult.setRecords(UsersDaoImpl.getInstance()
+ .selectMaxFromUsers());
+
+ // get all users
Object idf =
PersistenceSessionUtil.createSession();
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
@@ -93,7 +97,7 @@
Predicate condition = cb.equal(c.get("deleted"),
"false");
cq.where(condition);
cq.distinct(asc);
- if (asc){
+ if (asc) {
cq.orderBy(cb.asc(c.get(orderby)));
} else {
cq.orderBy(cb.desc(c.get(orderby)));
@@ -104,240 +108,242 @@
List<Users> ll = q.getResultList();
tx.commit();
PersistenceSessionUtil.closeSession(idf);
- return sresult;
+ return sresult;
}
} catch (Exception ex2) {
- log.error("[getUsersList] "+ex2);
+ log.error("[getUsersList] " + ex2);
}
return null;
}
-
-
-
-
-
- public SearchResult getAllUserByRange(String search, int start, int max,
String orderby, boolean asc){
+
+ public SearchResult getAllUserByRange(String search, int start, int max,
+ String orderby, boolean asc) {
try {
- SearchResult sresult = new SearchResult();
- sresult.setObjectName(Users.class.getName());
-
sresult.setRecords(UsersDaoImpl.getInstance().getAllUserMax(search));
-
- String[] searchItems = search.split(" ");
-
-
- log.debug("getUserContactsBySearch: "+ search);
- //log.debug("getUserContactsBySearch: "+
userId);
-
- String hql = "select u from Users u "+
- "WHERE u.deleted =
'false' ";
-
-
- hql += "AND ( ";
- for(int i=0;i<searchItems.length; i++){
- if (i != 0) {
- hql += " OR ";
- }
- hql += "( " +
- "lower(u.lastname) LIKE '" +
StringUtils.lowerCase("%"+searchItems[i]+"%") + "' " +
- "OR lower(u.firstname) LIKE '" +
StringUtils.lowerCase("%"+searchItems[i]+"%") + "' " +
- "OR lower(u.login) LIKE '" +
StringUtils.lowerCase("%"+searchItems[i]+"%") + "' " +
- "OR lower(u.adresses.email) LIKE '" +
StringUtils.lowerCase("%"+searchItems[i]+"%") + "' " +
- ") ";
-
- }
-
- hql += " ) ";
- if (orderby != null && orderby.length() > 0){
- hql += "ORDER BY " + orderby;
- }
-
- if (asc) {
- hql += " ASC ";
- } else {
- hql += " DESC ";
- }
-
- log.debug("Show HQL: "+hql);
-
- Object idf =
PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- Query query = session.createQuery(hql);
- //query.setParameter("macomUserId", userId);
-
- //query
- //if (asc) ((Criteria)
query).addOrder(Order.asc(orderby));
- //else ((Criteria)
query).addOrder(Order.desc(orderby));
- query.setFirstResult(start);
- query.setMaxResults(max);
- List<Users> ll = query.getResultList();
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
-
- sresult.setResult(ll);
-
- return sresult;
+ SearchResult sresult = new SearchResult();
+ sresult.setObjectName(Users.class.getName());
+
sresult.setRecords(UsersDaoImpl.getInstance().getAllUserMax(search));
+
+ String[] searchItems = search.split(" ");
+
+ log.debug("getUserContactsBySearch: " + search);
+ // log.debug("getUserContactsBySearch: "+ userId);
+
+ String hql = "select u from Users u "
+ + "WHERE u.deleted = 'false' ";
+
+ hql += "AND ( ";
+ for (int i = 0; i < searchItems.length; i++) {
+ if (i != 0) {
+ hql += " OR ";
+ }
+ hql += "( " + "lower(u.lastname) LIKE '"
+ + StringUtils.lowerCase("%" +
searchItems[i] + "%")
+ + "' " + "OR lower(u.firstname) LIKE
'"
+ + StringUtils.lowerCase("%" +
searchItems[i] + "%")
+ + "' " + "OR lower(u.login) LIKE
'"
+ + StringUtils.lowerCase("%" +
searchItems[i] + "%")
+ + "' " + "OR lower(u.adresses.email)
LIKE '"
+ + StringUtils.lowerCase("%" +
searchItems[i] + "%")
+ + "' " + ") ";
+
+ }
+
+ hql += " ) ";
+ if (orderby != null && orderby.length() > 0) {
+ hql += "ORDER BY " + orderby;
+ }
+
+ if (asc) {
+ hql += " ASC ";
+ } else {
+ hql += " DESC ";
+ }
+
+ log.debug("Show HQL: " + hql);
+
+ Object idf = PersistenceSessionUtil.createSession();
+ EntityManager session =
PersistenceSessionUtil.getSession();
+ EntityTransaction tx = session.getTransaction();
+ tx.begin();
+ Query query = session.createQuery(hql);
+ // query.setParameter("macomUserId", userId);
+
+ // query
+ // if (asc) ((Criteria)
query).addOrder(Order.asc(orderby));
+ // else ((Criteria)
query).addOrder(Order.desc(orderby));
+ query.setFirstResult(start);
+ query.setMaxResults(max);
+ List<Users> ll = query.getResultList();
+ tx.commit();
+ PersistenceSessionUtil.closeSession(idf);
+
+ sresult.setResult(ll);
+
+ return sresult;
} catch (Exception ex2) {
- log.error("[getAllUserByRange] ",ex2);
+ log.error("[getAllUserByRange] ", ex2);
ex2.printStackTrace();
}
return null;
}
-
-
-
-
+
/**
*
* @param user_level
* @param user_id
* @return
*/
- public Users checkAdmingetUserById(long user_level, long user_id){
- //FIXME: We have to check here for the User only cause the Org-Moderator
otherwise cannot access it
+ public Users checkAdmingetUserById(long user_level, long user_id) {
+ // FIXME: We have to check here for the User only cause the
+ // Org-Moderator otherwise cannot access it
if
(AuthLevelmanagement.getInstance().checkUserLevel(user_level)) {
return UsersDaoImpl.getInstance().getUser(user_id);
}
return null;
}
-
- public List getUserByMod(Long user_level, long user_id){
+
+ public List getUserByMod(Long user_level, long user_id) {
return null;
}
-
-
/**
* login logic
+ *
* @param SID
* @param Username
* @param Userpass
* @return
*/
- public Object loginUser(String SID, String userOrEmail, String userpass,
RoomClient currentClient,
- Boolean storePermanent, Long language_id) {
+ public Object loginUser(String SID, String userOrEmail, String userpass,
+ RoomClient currentClient, Boolean storePermanent, Long
language_id) {
try {
- log.debug("Login user SID : " +SID + " Stored Permanent :" +
storePermanent);
- String hql = "SELECT c from Users AS c " +
- "WHERE " +
- "(c.login LIKE :userOrEmail OR c.adresses.email LIKE :userOrEmail
) " +
- "AND c.deleted <> :deleted";
-
+ log.debug("Login user SID : " + SID + " Stored Permanent
:"
+ + storePermanent);
+ String hql = "SELECT c from Users AS c "
+ + "WHERE "
+ + "(c.login LIKE :userOrEmail OR c.adresses.email LIKE :userOrEmail
) "
+ + "AND c.deleted <> :deleted";
+
Object idf = PersistenceSessionUtil.createSession();
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
-
+
Query query = session.createQuery(hql);
query.setParameter("userOrEmail", userOrEmail);
query.setParameter("deleted", "true");
-
+
List<Users> ll = query.getResultList();
-
+
tx.commit();
PersistenceSessionUtil.closeSession(idf);
log.debug("debug SIZE: " + ll.size());
-
- if (ll.size()==0) {
+
+ if (ll.size() == 0) {
return new Long(-10);
} else {
Users users = (Users) ll.get(0);
-
- //Refresh User Object
+
+ // Refresh User Object
users = this.refreshUserObject(users);
-
- if
(ManageCryptStyle.getInstance().getInstanceOfCrypt().verifyPassword(userpass,
users.getPassword())) {
- log.info("chsum OK: "+
users.getUser_id());
- Boolean bool = Sessionmanagement.getInstance().updateUser(SID,
users.getUser_id(),storePermanent, language_id);
- if (bool==null){
- //Exception
+
+ if
(ManageCryptStyle.getInstance().getInstanceOfCrypt()
+ .verifyPassword(userpass,
users.getPassword())) {
+ log.info("chsum OK: " +
users.getUser_id());
+ Boolean bool =
Sessionmanagement.getInstance().updateUser(
+ SID,
users.getUser_id(), storePermanent,
+ language_id);
+ if (bool == null) {
+ // Exception
return new Long(-1);
} else if (!bool) {
- //invalid Session-Object
+ // invalid Session-Object
return new Long(-35);
}
-
- //Check if activated
- if (users.getStatus() != null &&
users.getStatus().equals(0)) {
+
+ // Check if activated
+ if (users.getStatus() != null
+ &&
users.getStatus().equals(0)) {
return -41L;
}
-
-
users.setUserlevel(getUserLevel(users.getLevel_id()));
+
+
users.setUserlevel(getUserLevel(users.getLevel_id()));
updateLastLogin(users);
- //If invoked via SOAP this is NULL
- if (currentClient!=null){
+ // If invoked via SOAP this is NULL
+ if (currentClient != null) {
currentClient.setUser_id(users.getUser_id());
}
-
-// System.out.println("loginUser
"+users.getOrganisation_users());
-// if (users.getOrganisation_users() !=
null) {
-// System.out.println("loginUser
size "+users.getOrganisation_users().size());
-// }
-
+
+ // System.out.println("loginUser
"+users.getOrganisation_users());
+ // if (users.getOrganisation_users() !=
null) {
+ // System.out.println("loginUser
size "+users.getOrganisation_users().size());
+ // }
+
return users;
} else {
return new Long(-11);
}
}
-
+
} catch (Exception ex2) {
- log.error("[loginUser]: ",ex2);
+ log.error("[loginUser]: ", ex2);
}
return new Long(-1);
}
-
+
public Users refreshUserObject(Users us) {
try {
-
+
Object idf = PersistenceSessionUtil.createSession();
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
-
+
us = session.merge(us);
session.refresh(us);
-
+
tx.commit();
PersistenceSessionUtil.closeSession(idf);
-
+
return us;
} catch (Exception ex2) {
- log.error("[loginUser]: ",ex2);
+ log.error("[loginUser]: ", ex2);
}
return null;
}
-
+
public Users loginUserByRemoteHash(String SID, String remoteHash) {
try {
-
- Sessiondata sessionData =
Sessionmanagement.getInstance().getSessionByHash(remoteHash);
-
-
+
+ Sessiondata sessionData =
Sessionmanagement.getInstance()
+ .getSessionByHash(remoteHash);
+
if (sessionData != null) {
-
- Users u =
Usermanagement.getInstance().getUserById(sessionData.getUser_id());
-
- Sessionmanagement.getInstance().updateUserWithoutSession(SID,
u.getUser_id());
-
+
+ Users u =
Usermanagement.getInstance().getUserById(
+ sessionData.getUser_id());
+
+
Sessionmanagement.getInstance().updateUserWithoutSession(SID,
+ u.getUser_id());
+
return u;
-
+
} else {
-
+
return null;
-
- }
-
+
+ }
+
} catch (Exception ex2) {
- log.error("[loginUserByRemoteHash]: ",ex2);
+ log.error("[loginUserByRemoteHash]: ", ex2);
}
return null;
}
public Long logout(String SID, long USER_ID) {
- Sessionmanagement.getInstance().updateUser(SID, 0, false,null);
+ Sessionmanagement.getInstance().updateUser(SID, 0, false, null);
return new Long(-12);
}
@@ -350,27 +356,29 @@
tx.begin();
if (us.getUser_id() == null) {
session.persist(us);
- } else {
- if (!session.contains(us)) {
- session.merge(us);
- }
+ } else {
+ if (!session.contains(us)) {
+ session.merge(us);
+ }
}
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("updateLastLogin",ex2);
+ log.error("updateLastLogin", ex2);
}
}
/**
* suche eines Bentzers
+ *
* @param user_level
* @param searchstring
* @param max
* @param start
* @return
*/
- public List searchUser(long user_level, String searchcriteria, String
searchstring, int max, int start, String orderby, boolean asc) {
+ public List searchUser(long user_level, String searchcriteria,
+ String searchstring, int max, int start, String
orderby, boolean asc) {
if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)) {
try {
Object idf =
PersistenceSessionUtil.createSession();
@@ -380,14 +388,16 @@
CriteriaBuilder cb =
session.getCriteriaBuilder();
CriteriaQuery<Users> cq =
cb.createQuery(Users.class);
Root<Users> c = cq.from(Users.class);
- Expression<String> literal = cb.literal((String) "%" + searchstring
+ "%");
- //crit.add(Restrictions.ilike(searchcriteria, "%" + searchstring
+ "%"));
+ Expression<String> literal = cb.literal((String)
"%"
+ + searchstring + "%");
+ // crit.add(Restrictions.ilike(searchcriteria,
"%" +
+ // searchstring + "%"));
Path<String> path = c.get(searchcriteria);
Predicate predicate = cb.like(path, literal);
Predicate condition = cb.notEqual(c.get("deleted"),
"true");
cq.where(condition, predicate);
cq.distinct(asc);
- if (asc){
+ if (asc) {
cq.orderBy(cb.asc(c.get(orderby)));
} else {
cq.orderBy(cb.desc(c.get(orderby)));
@@ -400,7 +410,7 @@
PersistenceSessionUtil.closeSession(idf);
return contactsZ;
} catch (Exception ex2) {
- log.error("searchUser",ex2);
+ log.error("searchUser", ex2);
}
}
return null;
@@ -413,7 +423,8 @@
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
- Query query = session.createQuery("select c from Userdata as c where
c.user_id = :user_id AND c.deleted <> :deleted");
+ Query query = session
+ .createQuery("select c from Userdata as c where c.user_id = :user_id
AND c.deleted <> :deleted");
query.setParameter("user_id",
user_id.longValue());
query.setParameter("deleted", "true");
List ll = query.getResultList();
@@ -421,7 +432,7 @@
PersistenceSessionUtil.closeSession(idf);
return ll;
} catch (Exception ex2) {
- log.error("getUserdataDashBoard",ex2);
+ log.error("getUserdataDashBoard", ex2);
}
}
return null;
@@ -435,7 +446,8 @@
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
- Query query = session.createQuery("select c from Userdata as c where
c.user_id = :user_id AND c.data_key = :data_key AND c.deleted <> :deleted");
+ Query query = session
+ .createQuery("select c from Userdata as c where c.user_id = :user_id
AND c.data_key = :data_key AND c.deleted <> :deleted");
query.setParameter("user_id",
USER_ID.longValue());
query.setParameter("data_key", DATA_KEY);
query.setParameter("deleted", "true");
@@ -443,7 +455,7 @@
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("getUserdataNoByKey",ex2);
+ log.error("getUserdataNoByKey", ex2);
}
} else {
System.out.println("Error: No USER_ID given");
@@ -459,17 +471,19 @@
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
- Query query = session.createQuery("select c from Userdata as c where
c.user_id = :user_id AND c.data_key = :data_key AND c.deleted <> :deleted");
+ Query query = session
+ .createQuery("select c from Userdata as c where c.user_id = :user_id
AND c.data_key = :data_key AND c.deleted <> :deleted");
query.setParameter("user_id",
user_id.longValue());
query.setParameter("data_key", DATA_KEY);
query.setParameter("deleted", "true");
- for (Iterator it2 =
query.getResultList().iterator(); it2.hasNext();) {
+ for (Iterator it2 =
query.getResultList().iterator(); it2
+ .hasNext();) {
userdata = (Userdata) it2.next();
}
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("getUserdataByKey",ex2);
+ log.error("getUserdataByKey", ex2);
}
} else {
userdata.setComment("Error: No USER_ID given");
@@ -479,43 +493,50 @@
public Long updateUser(long user_level, Long user_id, Long level_id,
String login, String password, String lastname, String
firstname,
- Date age, String street, String additionalname, String zip, long
states_id, String town,
- int availible, String telefon, String fax,
- String mobil, String email, String comment, int status, List
organisations,
- int title_id, String phone, String sip_user, String sip_pass, String
sip_auth,
- Boolean generateSipUserData, String jNameTimeZone, Boolean
forceTimeZoneCheck,
- String userOffers, String userSearchs, Boolean showContactData, Boolean
showContactDataToContacts) {
-
- if (AuthLevelmanagement.getInstance().checkUserLevel(user_level) &&
user_id != 0) {
+ Date age, String street, String additionalname, String
zip,
+ long states_id, String town, int availible, String
telefon,
+ String fax, String mobil, String email, String comment,
int status,
+ List organisations, int title_id, String phone, String
sip_user,
+ String sip_pass, String sip_auth, Boolean
generateSipUserData,
+ String jNameTimeZone, Boolean forceTimeZoneCheck,
+ String userOffers, String userSearchs, Boolean
showContactData,
+ Boolean showContactDataToContacts) {
+
+ if (AuthLevelmanagement.getInstance().checkUserLevel(user_level)
+ && user_id != 0) {
try {
Users us =
UsersDaoImpl.getInstance().getUser(user_id);
-
+
// Check for duplicates
boolean checkName = true;
-
- if (!login.equals(us.getLogin())){
- checkName =
UsersDaoImpl.getInstance().checkUserLogin(login);
+
+ if (!login.equals(us.getLogin())) {
+ checkName = UsersDaoImpl.getInstance()
+ .checkUserLogin(login);
}
boolean checkEmail = true;
-
+
// Compare old address with new address
- if (!email.equals(us.getAdresses().getEmail())){
-
- // Its a new one - check, whether another user already uses that
one...
- checkEmail =
Emailmanagement.getInstance().checkUserEMail(email);
- }
-
+ if (!email.equals(us.getAdresses().getEmail()))
{
+
+ // Its a new one - check, whether
another user already uses
+ // that one...
+ checkEmail =
Emailmanagement.getInstance().checkUserEMail(
+ email);
+ }
+
if (generateSipUserData) {
-
+
if (password.length() == 0) {
- //Cannot perform a SIP Creation
without password re-enter
+ // Cannot perform a SIP
Creation without password
+ // re-enter
return new Long(-43);
}
}
-
+
if (checkName && checkEmail) {
-// log.info("user_id " + user_id);
-
+ // log.info("user_id " + user_id);
+
us.setLastname(lastname);
us.setFirstname(firstname);
us.setAge(age);
@@ -524,76 +545,99 @@
us.setAvailible(availible);
us.setStatus(status);
us.setTitle_id(title_id);
-
us.setOmTimeZone(OmTimeZoneDaoImpl.getInstance().getOmTimeZone(jNameTimeZone));
+
us.setOmTimeZone(OmTimeZoneDaoImpl.getInstance()
+
.getOmTimeZone(jNameTimeZone));
us.setForceTimeZoneCheck(forceTimeZoneCheck);
-
+
us.setUserOffers(userOffers);
us.setUserSearchs(userSearchs);
us.setShowContactData(showContactData);
us.setShowContactDataToContacts(showContactDataToContacts);
-
+
if (level_id != 0)
us.setLevel_id(new
Long(level_id));
if (password.length() != 0) {
- if (password.length()>=6){
-
us.setPassword(ManageCryptStyle.getInstance().getInstanceOfCrypt().createPassPhrase(password));
+ if (password.length() >= 6) {
+
us.setPassword(ManageCryptStyle.getInstance()
+
.getInstanceOfCrypt()
+
.createPassPhrase(password));
} else {
return new Long(-7);
}
- }
-
-
-
Addressmanagement.getInstance().updateAdress(us.getAdresses().getAdresses_id(),
street, zip, town, states_id, additionalname, comment, fax, email, phone);
-
//Emailmanagement.getInstance().updateUserEmail(mail.getMail().getMail_id(),user_id,
email);
-
- //add or delete organisations from this
user
- if (organisations!=null){
-
Organisationmanagement.getInstance().updateUserOrganisationsByUser(us,
organisations);
- }
-
+ }
+
+
Addressmanagement.getInstance().updateAdress(
+
us.getAdresses().getAdresses_id(), street, zip,
+ town, states_id,
additionalname, comment, fax,
+ email, phone);
+ //
Emailmanagement.getInstance().updateUserEmail(mail.getMail().getMail_id(),user_id,
+ // email);
+
+ // add or delete organisations from
this user
+ if (organisations != null) {
+
Organisationmanagement.getInstance()
+
.updateUserOrganisationsByUser(us,
+
organisations);
+ }
+
if (generateSipUserData) {
-
- UserSipData userSipData =
OpenXGHttpClient.getInstance().openSIPgUserCreateUser(firstname, "",
lastname, us.getAdresses().getEmail(), password, login);
-
+
+ UserSipData userSipData =
OpenXGHttpClient
+
.getInstance().openSIPgUserCreateUser(
+
firstname, "", lastname,
+
us.getAdresses().getEmail(), password,
+
login);
+
if (us.getUserSipData() ==
null) {
- Long userSipDataId =
UserSipDataDaoImpl.getInstance().addUserSipData(userSipData);
-
-
us.setUserSipData(UserSipDataDaoImpl.getInstance().getUserSipDataById(userSipDataId));
+ Long userSipDataId =
UserSipDataDaoImpl
+
.getInstance().addUserSipData(userSipData);
+
+
us.setUserSipData(UserSipDataDaoImpl.getInstance()
+
.getUserSipDataById(userSipDataId));
} else {
-
-
us.getUserSipData().setUsername(userSipData.getUsername());
-
us.getUserSipData().setUserpass(userSipData.getUserpass());
-
us.getUserSipData().setAuthId(userSipData.getAuthId());
-
-
UserSipDataDaoImpl.getInstance().updateUserSipData(us.getUserSipData());
- }
-
+
+
us.getUserSipData().setUsername(
+
userSipData.getUsername());
+
us.getUserSipData().setUserpass(
+
userSipData.getUserpass());
+
us.getUserSipData().setAuthId(
+
userSipData.getAuthId());
+
+
UserSipDataDaoImpl.getInstance().updateUserSipData(
+
us.getUserSipData());
+ }
+
} else if (us.getUserSipData() == null)
{
UserSipData userSipData = new
UserSipData();
-
+
userSipData.setUsername(sip_user);
userSipData.setUserpass(sip_pass);
userSipData.setAuthId(sip_auth);
-
- Long userSipDataId =
UserSipDataDaoImpl.getInstance().addUserSipData(userSipData);
-
-
us.setUserSipData(UserSipDataDaoImpl.getInstance().getUserSipDataById(userSipDataId));
-
+
+ Long userSipDataId =
UserSipDataDaoImpl.getInstance()
+
.addUserSipData(userSipData);
+
+
us.setUserSipData(UserSipDataDaoImpl.getInstance()
+
.getUserSipDataById(userSipDataId));
+
} else {
-
- UserSipData userSipData =
UserSipDataDaoImpl.getInstance().getUserSipDataById(us.getUserSipData().getUserSipDataId());
-
+
+ UserSipData userSipData =
UserSipDataDaoImpl
+
.getInstance().getUserSipDataById(
+
us.getUserSipData().getUserSipDataId());
+
userSipData.setUsername(sip_user);
userSipData.setUserpass(sip_pass);
userSipData.setAuthId(sip_auth);
-
-
UserSipDataDaoImpl.getInstance().updateUserSipData(userSipData);
-
+
+
UserSipDataDaoImpl.getInstance().updateUserSipData(
+ userSipData);
+
us.setUserSipData(userSipData);
-
- }
-
- //log.info("USER " + us.getLastname());
+
+ }
+
+ // log.info("USER " + us.getLastname());
Object idf =
PersistenceSessionUtil.createSession();
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx =
session.getTransaction();
@@ -601,17 +645,17 @@
if (us.getUser_id() == null) {
session.persist(us);
- } else {
- if (!session.contains(us)) {
- session.merge(us);
- }
- }
-
+ } else {
+ if (!session.contains(us)) {
+ session.merge(us);
+ }
+ }
+
tx.commit();
PersistenceSessionUtil.closeSession(idf);
-
+
return us.getUser_id();
-
+
} else {
if (!checkName) {
return new Long(-15);
@@ -620,7 +664,7 @@
}
}
} catch (Exception ex2) {
- log.error("[updateUser]",ex2);
+ log.error("[updateUser]", ex2);
}
} else {
log.error("Error: Permission denied");
@@ -638,16 +682,18 @@
EntityTransaction tx = session.getTransaction();
tx.begin();
String hqlUpdate = "update userdata set DATA_KEY= :DATA_KEY, USER_ID
= :USER_ID, DATA = :DATA, updatetime = :updatetime, comment = :Comment
where DATA_ID= :DATA_ID";
- int updatedEntities =
session.createQuery(hqlUpdate).setParameter(
- "DATA_KEY", DATA_KEY).setParameter("USER_ID", USER_ID)
- .setParameter("DATA",
DATA).setParameter("updatetime", new Long(-1))
- .setParameter("Comment",
Comment).setParameter("DATA_ID",
- DATA_ID).executeUpdate();
+ int updatedEntities = session.createQuery(hqlUpdate)
+ .setParameter("DATA_KEY", DATA_KEY)
+ .setParameter("USER_ID", USER_ID)
+ .setParameter("DATA", DATA)
+ .setParameter("updatetime", new
Long(-1))
+ .setParameter("Comment", Comment)
+ .setParameter("DATA_ID",
DATA_ID).executeUpdate();
res = "Success" + updatedEntities;
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("updateUserdata",ex2);
+ log.error("updateUserdata", ex2);
}
return res;
}
@@ -662,16 +708,17 @@
tx.begin();
String hqlUpdate = "update Userdata set data = :data, updatetime
= :updatetime, "
+ "comment = :comment where user_id= :user_id AND data_key
= :data_key";
- int updatedEntities =
session.createQuery(hqlUpdate).setParameter(
- "data", DATA).setParameter("updatetime",
- new Long(-1)).setParameter(
- "comment", Comment).setParameter("user_id",
USER_ID.longValue())
+ int updatedEntities = session.createQuery(hqlUpdate)
+ .setParameter("data", DATA)
+ .setParameter("updatetime", new
Long(-1))
+ .setParameter("comment", Comment)
+ .setParameter("user_id",
USER_ID.longValue())
.setParameter("data_key",
DATA_KEY).executeUpdate();
res = "Success" + updatedEntities;
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("updateUserdataByKey",ex2);
+ log.error("updateUserdataByKey", ex2);
}
return res;
}
@@ -684,12 +731,13 @@
EntityTransaction tx = session.getTransaction();
tx.begin();
String hqlUpdate = "delete userdata where DATA_ID=
:DATA_ID";
- int updatedEntities =
session.createQuery(hqlUpdate).setParameter("DATA_ID",
DATA_ID).executeUpdate();
+ int updatedEntities = session.createQuery(hqlUpdate)
+ .setParameter("DATA_ID",
DATA_ID).executeUpdate();
res = "Success" + updatedEntities;
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("deleteUserdata",ex2);
+ log.error("deleteUserdata", ex2);
}
return res;
}
@@ -702,14 +750,14 @@
EntityTransaction tx = session.getTransaction();
tx.begin();
String hqlUpdate = "delete userdata where users_id= :users_id AND
DATA_KEY = :DATA_KEY";
- int updatedEntities =
session.createQuery(hqlUpdate).setParameter(
- "users_id", users_id).setParameter("DATA_KEY",
DATA_KEY)
- .executeUpdate();
+ int updatedEntities = session.createQuery(hqlUpdate)
+ .setParameter("users_id", users_id)
+ .setParameter("DATA_KEY",
DATA_KEY).executeUpdate();
res = "Success" + updatedEntities;
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("deleteUserdataByUserAndKey",ex2);
+ log.error("deleteUserdataByUserAndKey", ex2);
}
return res;
}
@@ -737,7 +785,7 @@
PersistenceSessionUtil.closeSession(idf);
ret = "success";
} catch (Exception ex2) {
- log.error("addUserdata",ex2);
+ log.error("addUserdata", ex2);
}
return ret;
}
@@ -749,7 +797,8 @@
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
- Query query = session.createQuery("select c from Userlevel as c where
c.level_id = :level_id AND c.deleted <> :deleted");
+ Query query = session
+ .createQuery("select c from Userlevel as c where c.level_id
= :level_id AND c.deleted <> :deleted");
query.setParameter("level_id", level_id.longValue());
query.setParameter("deleted", "true");
for (Iterator it2 = query.getResultList().iterator();
it2.hasNext();) {
@@ -758,94 +807,100 @@
tx.commit();
PersistenceSessionUtil.closeSession(idf);
} catch (Exception ex2) {
- log.error("[getUserLevel]" ,ex2);
+ log.error("[getUserLevel]", ex2);
}
return userlevel;
}
/**
- * get user-role
- * 1 - user
- * 2 - moderator
- * 3 - admin
+ * get user-role 1 - user 2 - moderator 3 - admin
+ *
* @param user_id
* @return
*/
public Long getUserLevelByID(Long user_id) {
-
+
try {
- if (user_id==null) return new Long(0);
- //For direct access of linked users
- if (user_id==-1){
+ if (user_id == null)
+ return new Long(0);
+ // For direct access of linked users
+ if (user_id == -1) {
return new Long(1);
}
-
+
Object idf = PersistenceSessionUtil.createSession();
EntityManager session =
PersistenceSessionUtil.getSession();
EntityTransaction tx = session.getTransaction();
tx.begin();
-
- Query query = session.createQuery("select c from Users as c where
c.user_id = :user_id AND c.deleted <> 'true'");
+
+ Query query = session
+ .createQuery("select c from Users as c where c.user_id = :user_id AND
c.deleted <> 'true'");
query.setParameter("user_id", user_id);
- Users us = null;
- try {
- us = (Users)query.getSingleResult();
- } catch (NoResultException e) {
- //u=null}
- }
-
+ Users us = null;
+ try {
+ us = (Users) query.getSingleResult();
+ } catch (NoResultException e) {
+ // u=null}
+ }
+
tx.commit();
PersistenceSessionUtil.closeSession(idf);
-
- if (us!=null){
+
+ if (us != null) {
return us.getLevel_id();
} else {
return -1L;
}
} catch (Exception ex2) {
- log.error("[getUserLevelByID]" ,ex2);
+ log.error("[getUserLevelByID]", ex2);
}
return null;
}
***The diff for this file has been truncated for email.***
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
Sat Jul 23 04:37:43 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
Tue Jul 26 10:30:16 2011
@@ -76,7 +76,7 @@
log.error("getUser",ex2);
}
} else {
- log.error("[getUser] "+"Error: No USER_ID given");
+ log.info("[getUser] "+"Error: No USER_ID given");
}
return null;
}
@@ -102,7 +102,7 @@
log.error("[updateUser] ",ex2);
}
} else {
- log.error("[updateUser] "+"Error: No USER_ID given");
+ log.info("[updateUser] "+"Error: No USER_ID given");
}
}
@@ -167,7 +167,7 @@
log.info("selectMaxFromUsers"+(Long)ll.get(0));
return (Long)ll.get(0);
} catch (Exception ex2) {
- log.error("[selectMaxFromUsers] "+ex2);
+ log.error("[selectMaxFromUsers] ", ex2);
}
return null;
}
@@ -193,7 +193,7 @@
return ll;
} catch (Exception ex2) {
- log.error("[getAllUsers] "+ex2);
+ log.error("[getAllUsers] ", ex2);
}
return null;
}
@@ -219,7 +219,7 @@
return ll;
} catch (Exception ex2) {
- log.error("[getAllUsers] "+ex2);
+ log.error("[getAllUsers] ", ex2);
}
return null;
}
@@ -276,7 +276,7 @@
return new Long(i);
} catch (Exception ex2) {
- log.error("[getAllUserMax]: " + ex2);
+ log.error("[getAllUserMax]: " , ex2);
}
return null;
}
@@ -438,7 +438,7 @@
log.info("selectMaxFromUsers"+(Long)ll.get(0));
return (Long)ll.get(0);
} catch (Exception ex2) {
- log.error("[selectMaxFromUsers] "+ex2);
+ log.error("[selectMaxFromUsers] ",ex2);
}
return null;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sat Jul 23 04:28:08 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Tue Jul 26 10:30:16 2011
@@ -778,27 +778,36 @@
}
- Users storedUser =
Usermanagement.getInstance().getUserById(us.getUser_id());
-
- if (storedUser == null) {
-
- log.debug("Add User ID
"+us.getUser_id());
- us.setUser_id(null);
- us.setStarttime(new Date());
- Long actualNewUserId =
Usermanagement.getInstance().addUserBackup(us);
- usersMap.put(us.getUser_id(),
actualNewUserId);
-
- for (Iterator<Organisation_Users> orgUserIterator =
orgUsers.iterator();orgUserIterator.hasNext();) {
-
- Organisation_Users organisationUsers =
orgUserIterator.next();
-
-
organisationUsers.setUser_id(actualNewUserId);
-
-
Organisationmanagement.getInstance().addOrganisationUserObj(organisationUsers);
-
- }
-
- }
+ //check if login does already exists
+ Users storedUser =
Usermanagement.getInstance().getUserByLoginOrEmail(us.getLogin());
+
+ if (storedUser != null) {
+ log.info("A user with the given login does already
exist "+us.getLogin());
+ return;
+ }
+
+ storedUser =
Usermanagement.getInstance().getUserByLoginOrEmail(email);
+
+ if (storedUser != null) {
+ log.info("A user with the given email as login does already
exist "+email);
+ return;
+ }
+
+ log.debug("Import User ID
"+us.getUser_id());
+ us.setUser_id(null);
+ us.setStarttime(new Date());
+ Long actualNewUserId =
Usermanagement.getInstance().addUserBackup(us);
+ usersMap.put(us.getUser_id(),
actualNewUserId);
+
+ for (Iterator<Organisation_Users> orgUserIterator =
orgUsers.iterator();orgUserIterator.hasNext();) {
+
+ Organisation_Users
organisationUsers = orgUserIterator.next();
+
+
organisationUsers.setUser_id(actualNewUserId);
+
+
Organisationmanagement.getInstance().addOrganisationUserObj(organisationUsers);
+
+ }
}
@@ -1182,13 +1191,10 @@
for (Organisation org : orgList) {
Long orgId = org.getOrganisation_id();
- Organisation orgStored =
Organisationmanagement.getInstance().getOrganisationByIdAndDeleted(orgId);
-
- if (orgStored == null) {
- org.setOrganisation_id(null);
- Long newOrgID =
Organisationmanagement.getInstance().addOrganisationObj(org);
- organisationsMap.put(orgId, newOrgID);
- }
+
+ org.setOrganisation_id(null);
+ Long newOrgID =
Organisationmanagement.getInstance().addOrganisationObj(org);
+ organisationsMap.put(orgId, newOrgID);
}
@@ -1377,16 +1383,12 @@
for (Appointment appointment : appointmentList) {
Long appId = appointment.getAppointmentId();
- Appointment appointmentStored =
AppointmentDaoImpl.getInstance().getAppointmentById(appId);
-
- if (appointmentStored == null) {
-
- //We need to reset this as openJPA reject to
store them otherwise
- appointment.setAppointmentId(null);
-
- Long newAppId =
AppointmentDaoImpl.getInstance().addAppointmentObj(appointment);
- appointmentsMap.put(appId, newAppId);
- }
+
+ //We need to reset this as openJPA reject to store them
otherwise
+ appointment.setAppointmentId(null);
+
+ Long newAppId =
AppointmentDaoImpl.getInstance().addAppointmentObj(appointment);
+ appointmentsMap.put(appId, newAppId);
}
@@ -1477,17 +1479,11 @@
for (Rooms_Organisation rooms_Organisation :roomOrgList) {
- Rooms_Organisation roomsOrganisationStored =
Roommanagement.getInstance().getRoomsOrganisationById(rooms_Organisation.getRooms_organisation_id());
-
- if (roomsOrganisationStored == null) {
-
- //We need to reset this as openJPA reject to
store them otherwise
-
rooms_Organisation.setRooms_organisation_id(null);
-
-
Roommanagement.getInstance().addRoomOrganisation(rooms_Organisation);
-
- }
-
+ //We need to reset this as openJPA reject to store them
otherwise
+ rooms_Organisation.setRooms_organisation_id(null);
+
+
Roommanagement.getInstance().addRoomOrganisation(rooms_Organisation);
+
}
}
@@ -1640,15 +1636,12 @@
room.setAllowRecording(allowRecording);
Long roomId = room.getRooms_id();
- Rooms roomStored =
Roommanagement.getInstance().getRoomById(roomId);
-
- if (roomStored == null) {
- //We need to reset this as openJPA reject to store them
otherwise
- room.setRooms_id(null);
-
- Long newRoomId =
Roommanagement.getInstance().addRoom(room);
- roomsMap.put(roomId, newRoomId);
- }
+
+ //We need to reset this as openJPA reject to store them
otherwise
+ room.setRooms_id(null);
+
+ Long newRoomId =
Roommanagement.getInstance().addRoom(room);
+ roomsMap.put(roomId, newRoomId);
for (Iterator<Element> iterMods =
roomObject.elementIterator( "room_moderators" ); iterMods.hasNext(); ) {
@@ -1668,13 +1661,8 @@
roomModerators.setUser(Usermanagement.getInstance().getUserById(user_id));
roomModerators.setIsSuperModerator(is_supermoderator);
- List<RoomModerators> roomModeratorsStored =
RoomModeratorsDaoImpl.getInstance().getRoomModeratorByUserAndRoomId(roomModerators.getRoomId(),
roomModerators.getUser().getUser_id());
-
- if (roomModeratorsStored == null ||
roomModeratorsStored.size() == 0) {
-
-
RoomModeratorsDaoImpl.getInstance().addRoomModeratorByObj(roomModerators);
-
- }
+
RoomModeratorsDaoImpl.getInstance().addRoomModeratorByObj(roomModerators);
+
}
}
@@ -1698,12 +1686,10 @@
//We need to reset this as openJPA reject to store them
otherwise
long itemId = fileExplorerItem.getFileExplorerItemId();
- FileExplorerItem storedItem =
FileExplorerItemDaoImpl.getInstance().getFileExplorerItemsById(itemId);
- if (storedItem == null){
- fileExplorerItem.setFileExplorerItemId(0);
- long newItemId =
FileExplorerItemDaoImpl.getInstance().addFileExplorerItem(fileExplorerItem);
- fileExplorerItemsMap.put(itemId, newItemId);
- }
+
+ fileExplorerItem.setFileExplorerItemId(0);
+ long newItemId =
FileExplorerItemDaoImpl.getInstance().addFileExplorerItem(fileExplorerItem);
+ fileExplorerItemsMap.put(itemId, newItemId);
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
