roller/src/org/roller/presentation RollerRequest.java,1.42,1.43

Update of /cvsroot/roller/roller/src/org/roller/presentation
In directory sc8-pr-cvs1:/tmp/cvs-serv21380/src/org/roller/presentation

Modified Files:
        RollerRequest.java 
Log Message:
Ongoing dev - Hibernate impl

Index: RollerRequest.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/RollerRequest.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** RollerRequest.java  1 Mar 2003 23:45:22 -0000       1.42
--- RollerRequest.java  24 Mar 2003 04:56:29 -0000      1.43
***************
*** 75,79 ****
      private WeblogEntryData    mWeblogEntry;
      private WeblogCategoryData mWeblogCategory;
!     private WebsiteData        mWebsite;
      private boolean           mIsDateSpecified = false;
      
--- 75,79 ----
      private WeblogEntryData    mWeblogEntry;
      private WeblogCategoryData mWeblogCategory;
!     //private WebsiteData        mWebsite;
      private boolean           mIsDateSpecified = false;
      
***************
*** 173,177 ****
              if (mUser != null)
              {
!                 mWebsite = userMgr.getWebsite(mUser.getUserName());
                  if ( pathInfo.length == 1 )
                  {
--- 173,177 ----
              if (mUser != null)
              {
!                 WebsiteData website = userMgr.getWebsite(mUser.getUserName());
                  if ( pathInfo.length == 1 )
                  {
***************
*** 179,183 ****
                      mDate = new Date();
                      mDateString = DateUtil.format8chars(mDate);
!                     mPage = userMgr.retrievePage(mWebsite.getDefaultPageId());
                  }
                  else if ( pathInfo.length == 2 )
--- 179,183 ----
                      mDate = new Date();
                      mDateString = DateUtil.format8chars(mDate);
!                     mPage = userMgr.retrievePage(website.getDefaultPageId());
                  }
                  else if ( pathInfo.length == 2 )
***************
*** 198,202 ****
                          // we have the /username/datestring form of URL
                          mDateString = pathInfo[1];
!                         mPage = 
userMgr.retrievePage(mWebsite.getDefaultPageId());
                          mIsDateSpecified = true;
                      }               
--- 198,202 ----
                          // we have the /username/datestring form of URL
                          mDateString = pathInfo[1];
!                         mPage = 
userMgr.retrievePage(website.getDefaultPageId());
                          mIsDateSpecified = true;
                      }               
***************
*** 242,249 ****
              }
              
              if ( userName != null )
              {
                  mUser = userMgr.getUser(userName);
!                 mWebsite = userMgr.getWebsite(userName);
              }
              
--- 242,250 ----
              }
              
+             WebsiteData wd = null;
              if ( userName != null )
              {
                  mUser = userMgr.getUser(userName);
!                 wd = userMgr.getWebsite(userName);
              }
              
***************
*** 258,263 ****
                  if ( mUser == null )
                  {
!                     mWebsite = userMgr.retrieveWebsite(mPage.getWebsiteId());
!                     mUser = userMgr.retrieveUser(mWebsite.getUserId());
                  }                    
              }
--- 259,264 ----
                  if ( mUser == null )
                  {
!                     wd = mPage.getWebsite();
!                     mUser = userMgr.retrieveUser(wd.getUser().getId());
                  }                    
              }
***************
*** 703,707 ****
      public WebsiteData getWebsite( )
      {
!         return mWebsite;
      }
  
--- 704,721 ----
      public WebsiteData getWebsite( )
      {
!         WebsiteData wd = null;
!         try
!         {
!             if ( mUser!=null )
!             {
!                 UserManager userMgr = getRoller().getUserManager();   
!                 wd = userMgr.getWebsite(mUser.getUserName());
!             }
!         }
!         catch (Exception e)
!         {
!             mLogger.error("Getting weblog entry",e);
!         }
!         return wd;
      }
  
***************
*** 745,751 ****
                      if ( mWeblogEntry != null && mUser == null )
                      {
!                         mWebsite = userMgr.retrieveWebsite(
!                             mWeblogEntry.getWebsiteId());
!                         mUser = userMgr.retrieveUser(mWebsite.getUserId());
                      }
                  } 
--- 759,765 ----
                      if ( mWeblogEntry != null && mUser == null )
                      {
!                         WebsiteData wd = getWebsite();
!                         wd = mWeblogEntry.getWebsite();
!                         mUser = userMgr.retrieveUser(wd.getUser().getId());
                      }
                  } 




-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en