taylor      01/09/20 22:07:02

  Modified:    src/java/org/apache/jetspeed/services/profiler
                        JetspeedProfilerService.java
  Log:
  - fixed bug where named pages for groups were not being correctly located by 
profiler i.e. /jetspeed/portal/group/apache/page/news
  
  Revision  Changes    Path
  1.15      +21 -20    
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
  
  Index: JetspeedProfilerService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- JetspeedProfilerService.java      2001/09/04 12:09:30     1.14
  +++ JetspeedProfilerService.java      2001/09/21 05:07:02     1.15
  @@ -131,7 +131,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
  - * @version $Id: JetspeedProfilerService.java,v 1.14 2001/09/04 12:09:30 sgala Exp $
  + * @version $Id: JetspeedProfilerService.java,v 1.15 2001/09/21 05:07:02 taylor Exp 
$
    */
   
   public class JetspeedProfilerService  extends TurbineBaseService
  @@ -276,27 +276,28 @@
                           }
                       }
                   }
  -     
  -                // get resource name
  -                StringBuffer resource = new StringBuffer();
  -                param = rundata.getParameters().getString( Profiler.PARAM_PAGE );
  -                if (null == param) {
  -                   // the default resource
  -                    resource.append( resourceDefault );
  +            }     
  +
  +            // get resource name
  +            StringBuffer resource = new StringBuffer();
  +            param = rundata.getParameters().getString( Profiler.PARAM_PAGE );
  +            if (null == param) {
  +               // the default resource
  +                resource.append( resourceDefault );
  +                resource.append( resourceExt );
  +            }
  +            else
  +            {   // a specific resource
  +                resource.append( param );
  +                if ( -1 == param.indexOf( PATH_EXTENSION_DELIMITER ) )
                       resource.append( resourceExt );
  -                }
  -                else
  -                {   // a specific resource
  -                    resource.append( param );
  -                    if ( -1 == param.indexOf( PATH_EXTENSION_DELIMITER ) )
  -                        resource.append( resourceExt );
  -                }
  -                profile.setName( resource.toString() );
  -     
  -                // LANGUAGE
  -                if (useLanguage && rundata != null)
  -                    getLanguageSettings(profile, rundata);
               }
  +            profile.setName( resource.toString() );
  + 
  +            // LANGUAGE
  +            if (useLanguage && rundata != null)
  +                getLanguageSettings(profile, rundata);
  +
        
               PSMLDocument doc = fallback( profile, rundata );
               if (null != doc)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to