jvanzyl 01/06/30 06:07:28
Modified: src/java/org/apache/turbine/services/upload
BaseUploadService.java DefaultFileItem.java
FileItem.java TurbineUploadService.java
Log:
- fix for a bug that i introduced: i put some incorrect code in
multipart parser that didn't deal with normal form fields correctly.
this should fix it. john, i'll be back later today if there is something
wrong. i can't currently test anything because i'm in the middle
of making the unified template service and convert the pull service
to work with all the templating systems.
Revision Changes Path
1.6 +3 -3
jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java
Index: BaseUploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/BaseUploadService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseUploadService.java 2001/06/27 18:53:53 1.5
+++ BaseUploadService.java 2001/06/30 13:07:28 1.6
@@ -68,7 +68,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: BaseUploadService.java,v 1.5 2001/06/27 18:53:53 jvanzyl Exp $
+ * @version $Id: BaseUploadService.java,v 1.6 2001/06/30 13:07:28 jvanzyl Exp $
*/
public abstract class BaseUploadService
extends BaseService
@@ -139,8 +139,8 @@
* @exception TurbineException If there are problems reading/parsing
* the request or storing files.
*/
- public abstract ArrayList parseRequest( HttpServletRequest req,
- String path )
+ public abstract ArrayList parseRequest(HttpServletRequest req,
+ String path )
throws TurbineException;
/**
1.3 +13 -1
jakarta-turbine/src/java/org/apache/turbine/services/upload/DefaultFileItem.java
Index: DefaultFileItem.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/DefaultFileItem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultFileItem.java 2001/06/27 18:53:53 1.2
+++ DefaultFileItem.java 2001/06/30 13:07:28 1.3
@@ -91,7 +91,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: DefaultFileItem.java,v 1.2 2001/06/27 18:53:53 jvanzyl Exp $
+ * @version $Id: DefaultFileItem.java,v 1.3 2001/06/30 13:07:28 jvanzyl Exp $
*/
public class DefaultFileItem implements FileItem
{
@@ -115,6 +115,8 @@
protected String fieldName;
+ protected boolean isFormField;
+
/**
* Default constructor.
*/
@@ -434,4 +436,14 @@
throw new Exception("Cannot write uploaded file to disk!");
}
}
+
+ public void setIsFormField(boolean state)
+ {
+ isFormField = state;
+ }
+
+ public boolean isFormField()
+ {
+ return isFormField;
+ }
}
1.2 +4 -1
jakarta-turbine/src/java/org/apache/turbine/services/upload/FileItem.java
Index: FileItem.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/FileItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileItem.java 2001/06/25 04:56:38 1.1
+++ FileItem.java 2001/06/30 13:07:28 1.2
@@ -85,7 +85,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: FileItem.java,v 1.1 2001/06/25 04:56:38 jvanzyl Exp $
+ * @version $Id: FileItem.java,v 1.2 2001/06/30 13:07:28 jvanzyl Exp $
*/
public interface FileItem
extends DataSource
@@ -222,4 +222,7 @@
public String getFieldName();
public void setFieldName(String name);
+
+ public boolean isFormField();
+ public void setIsFormField(boolean state);
}
1.19 +3 -6
jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java
Index: TurbineUploadService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/TurbineUploadService.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TurbineUploadService.java 2001/06/25 04:55:48 1.18
+++ TurbineUploadService.java 2001/06/30 13:07:28 1.19
@@ -88,7 +88,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TurbineUploadService.java,v 1.18 2001/06/25 04:55:48 jvanzyl Exp $
+ * @version $Id: TurbineUploadService.java,v 1.19 2001/06/30 13:07:28 jvanzyl Exp $
*/
public class TurbineUploadService
extends BaseUploadService
@@ -105,7 +105,7 @@
* the request or storing files.
*/
public ArrayList parseRequest( HttpServletRequest req,
- String path )
+ String path )
throws TurbineException
{
ArrayList items = new ArrayList();
@@ -172,7 +172,6 @@
{
os.close();
}
- //params.append(getFieldName(headers), item);
item.setFieldName(getFieldName(headers));
items.add(item);
}
@@ -202,7 +201,6 @@
{
os.close();
}
- //params.append(getFieldName(headers), item);
item.setFieldName(getFieldName(headers));
items.add(item);
}
@@ -220,9 +218,8 @@
{
os.close();
}
- //params.append(getFieldName(headers),
- // new String(item.get()));
item.setFieldName(getFieldName(headers));
+ item.setIsFormField(true);
items.add(item);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
