vgritsenko 02/03/20 20:31:35
Modified: src/java/org/apache/cocoon/generation HTMLGenerator.java
Log:
Fix bug #6712
Revision Changes Path
1.14 +6 -19
xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java
Index: HTMLGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/HTMLGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HTMLGenerator.java 13 Mar 2002 16:28:02 -0000 1.13
+++ HTMLGenerator.java 21 Mar 2002 04:31:35 -0000 1.14
@@ -51,11 +51,9 @@
package org.apache.cocoon.generation;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.caching.CacheValidity;
@@ -89,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
- * @version CVS $Id: HTMLGenerator.java,v 1.13 2002/03/13 16:28:02 cziegeler Exp $
+ * @version CVS $Id: HTMLGenerator.java,v 1.14 2002/03/21 04:31:35 vgritsenko Exp $
*/
public class HTMLGenerator extends ComposerGenerator
implements Cacheable, Disposable {
@@ -140,22 +138,11 @@
xpath = par.getParameter("xpath",null);
// append the request parameter to the URL if necessary
- if (par.getParameterAsBoolean( "copy-parameters", false )) {
- final StringBuffer query = new StringBuffer( super.source );
- char separator = (super.source.indexOf("?") == -1 ? '?' : '&');
- Enumeration params = request.getParameterNames();
- while (params.hasMoreElements()) {
- String name = (String)params.nextElement();
- String[] values = request.getParameterValues( name );
-
- for (int i = 0; i < values.length; i++) {
- query.append( separator )
- .append( name )
- .append( "=" )
- .append( values[i] );
- separator = '&';
- }
- }
+ if (par.getParameterAsBoolean("copy-parameters", false)
+ && request.getQueryString() != null) {
+ StringBuffer query = new StringBuffer(super.source);
+ query.append(super.source.indexOf("?") == -1 ? '?' : '&');
+ query.append(request.getQueryString());
super.source = query.toString();
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
