[jboss-svn-commits] JBL Code SVN: r26939 - labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-06-12 06:26:17 -0400 (Fri, 12 Jun 2009)
New Revision: 26939

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
Log:
fixed forums/category mapping

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-12 09:05:07 UTC (rev 26938)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2009-06-12 10:26:17 UTC (rev 26939)
@@ -445,13 +445,21 @@
       // and /index.html?module=bb&op=viewforum&f=165
       if (("main".equalsIgnoreCase(op) && c != null)
           || ("viewforum".equalsIgnoreCase(op) && f != null)) {
-        Long communityID = getCategoryMappings().get(c);
+
+        Long communityID = null;
+        if (("main".equalsIgnoreCase(op) && c != null)) {
+          // view category
+          communityID = getCategoryMappings().get(c);
+        } else if ("viewforum".equalsIgnoreCase(op) && f != null) {
+          // view forum
+          communityID = getForumMappings().get(f);
+        }
+
         if (communityID == null) {
           return null;
         }
-        Community community;
         try {
-          community = communityManager.getCommunity(communityID);
+          Community community = communityManager.getCommunity(communityID);
           String communityURL = JiveResourceResolver
               .getJiveObjectURL(community)
               + "?view=discussions";
@@ -460,6 +468,7 @@
           return null;
         }
       }
+
       // case: /index.html?module=bb&op=viewtopic&t=150889
       if ("viewtopic".equals(op) && t != null) {
         Long threadID = getThreadID(t);
@@ -486,7 +495,7 @@
 
     if (threadID == null) {
       try {
-      threadID = nukesForumsMappingDAO.getTopicMapping(topicID);
+        threadID = nukesForumsMappingDAO.getTopicMapping(topicID);
       } catch (EmptyResultDataAccessException e) {
         return null;
       }