[jboss-svn-commits] JBL Code SVN: r26874 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm: dao and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 8 07:43:07 EDT 2009
Author: lkrzyzanek
Date: 2009-06-08 07:43:07 -0400 (Mon, 08 Jun 2009)
New Revision: 26874
Modified:
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsPostBean.java
Log:
added email to post bean.
modified finding users - used usertemplate with username and email
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java 2009-06-08 10:45:58 UTC (rev 26873)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java 2009-06-08 11:43:07 UTC (rev 26874)
@@ -44,6 +44,7 @@
import com.jivesoftware.base.User;
import com.jivesoftware.base.UserManager;
import com.jivesoftware.base.UserNotFoundException;
+import com.jivesoftware.base.UserTemplate;
import com.jivesoftware.base.wiki.WikiContentHelper;
import com.jivesoftware.community.Community;
import com.jivesoftware.community.CommunityManager;
@@ -211,18 +212,20 @@
}
}
- User rootMessageUser = null;
- try {
- rootMessageUser = userManager.getUser(topicPost.getPosterUsername());
- } catch (UserNotFoundException e) {
- log.error("Unknkown user for topic_id: " + topic.getTopicID()
- + " username: '" + topicPost.getPosterUsername() + "'");
+ User rootMessageUser = findUser(topicPost.getPosterUsername(),
+ topicPost.getPosterEmail());
+
+ if (rootMessageUser == null) {
+ // should never happen.
try {
rootMessageUser = userManager.getUser(unknownMigrationUser);
} catch (UserNotFoundException e1) {
throw new RuntimeException("User: " + unknownMigrationUser
+ " doesn't exists.");
}
+
+ log.error("Unknkown user for topic_id: " + topic.getTopicID()
+ + " username: '" + topicPost.getPosterUsername() + "'");
}
ForumMessage rootMessage = forumManager.createMessage(community,
@@ -257,18 +260,18 @@
throw new RuntimeException(e);
}
- // log.trace("Migrate replies");
+ log.trace("Migrate replies");
List<NukesForumsPostBean> replies = nukesForumsDAO
.getAllPostsByTopicID(topic.getTopicID(), topicPost.getPostID());
for (NukesForumsPostBean reply : replies) {
- User replyUser = null;
- try {
- replyUser = userManager.getUser(reply.getPosterUsername());
- } catch (UserNotFoundException e) {
+ User replyUser = findUser(reply.getPosterUsername(), reply
+ .getPosterEmail());
+ if (replyUser == null) {
log.error("Unknkown user for reply_id: " + reply.getPostID()
+ " username: '" + reply.getPosterUsername() + "'");
+ // should never happen.
try {
- rootMessageUser = userManager.getUser(unknownMigrationUser);
+ replyUser = userManager.getUser(unknownMigrationUser);
} catch (UserNotFoundException e1) {
throw new RuntimeException("User: " + unknownMigrationUser
+ " doesn't exists.");
@@ -282,9 +285,9 @@
Date replyDate = reply.getTime();
if (replyDate == null || replyDate.after(now)) {
replyDate = new Date(topicPost.getTime().getTime() + 1);
- log.warn("Correcting reply date. Original date: " + reply.getTime()
- + ". New date: " + replyDate + ". Reply post_id: "
- + reply.getPostID());
+ log.error("Correcting reply date. Original date: "
+ + reply.getTime() + ". New date: " + replyDate
+ + ". Reply post_id: " + reply.getPostID());
}
replyMessage.setCreationDate(replyDate);
replyMessage.setModificationDate(replyDate);
@@ -329,6 +332,13 @@
return result;
}
+ private User findUser(String username, String email) {
+ UserTemplate userTemplate = new UserTemplate(username);
+ userTemplate.setEmail(email);
+
+ return userManager.getUser(userTemplate);
+ }
+
private void migrateForumWatches(Long forumID, Community community) {
List<String> users = nukesForumsDAO.getForumWatchingUses(forumID);
for (String username : users) {
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java 2009-06-08 10:45:58 UTC (rev 26873)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java 2009-06-08 11:43:07 UTC (rev 26874)
@@ -46,8 +46,8 @@
private static final String SELECT_TOPICS_BY_FORUMID = "SELECT topic_id, topic_title, topic_poster, CASE WHEN topic_time = \"0000-00-00 00:00:00\" THEN null ELSE topic_time END as topic_time, topic_status, topic_first_post_id, topic_views"
+ " FROM phpbb_topics WHERE forum_id = ?";
- private static final String SELECT_FROM_POST = "SELECT p.post_id, p.topic_id, p.forum_id, nu.pn_uname, CASE WHEN post_time = \"0000-00-00 00:00:00\" THEN null ELSE post_time END as post_time, post_subject, post_text " +
- "FROM phpbb_posts p join nuke_users nu on p.poster_id = nu.pn_uid";
+ private static final String SELECT_FROM_POST = "SELECT p.post_id, p.topic_id, p.forum_id, nu.pn_uname, nu.pn_email, CASE WHEN post_time = \"0000-00-00 00:00:00\" THEN null ELSE post_time END as post_time, post_subject, post_text "
+ + "FROM phpbb_posts p join nuke_users nu on p.poster_id = nu.pn_uid";
private static final String SELECT_POST_BY_ID = SELECT_FROM_POST
+ " WHERE post_id = ?";
@@ -106,6 +106,7 @@
bean.setTopicID(rs.getLong("topic_id"));
bean.setForumID(rs.getLong("forum_id"));
bean.setPosterUsername(rs.getString("pn_uname"));
+ bean.setPosterEmail(rs.getString("pn_email"));
bean.setTime(rs.getTimestamp("post_time"));
bean.setSubject(rs.getString("post_subject"));
bean.setBody(rs.getString("post_text"));
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsPostBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsPostBean.java 2009-06-08 10:45:58 UTC (rev 26873)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsPostBean.java 2009-06-08 11:43:07 UTC (rev 26874)
@@ -41,6 +41,8 @@
private String posterUsername;
+ private String posterEmail;
+
private Date time;
private String subject;
@@ -108,4 +110,12 @@
this.body = body;
}
+ public void setPosterEmail(String posterEmail) {
+ this.posterEmail = posterEmail;
+ }
+
+ public String getPosterEmail() {
+ return posterEmail;
+ }
+
}
More information about the jboss-svn-commits
mailing list