bloritsch 01/03/26 11:40:45
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractDatabaseAction.java OraAddAction.java
src/org/apache/cocoon/components/language/markup/xsp Tag:
xml-cocoon2 XSPRequestHelper.java
Log:
Some more request fixes
Revision Changes Path
No revision
No revision
1.1.2.23 +6 -2
xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- AbstractDatabaseAction.java 2001/03/19 21:20:10 1.1.2.22
+++ AbstractDatabaseAction.java 2001/03/26 19:40:41 1.1.2.23
@@ -174,7 +174,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/03/19 21:20:10 $
+ * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/26 19:40:41 $
*/
public abstract class AbstractDatabaseAction extends
AbstractComplimentaryConfigurableAction implements Configurable {
protected Map files = new HashMap();
@@ -320,8 +320,11 @@
}
String attribute = entry.getAttribute("param", "");
- Object value = request.get(attribute);
+ Object value = request.getParameter(attribute);
+ if (value == null) value = request.getAttribute(attribute);
+ if (value == null) value = request.get(attribute);
+
if (value instanceof String) {
value = ((String) value).trim();
}
@@ -340,6 +343,7 @@
break;
case Types.CLOB:
case Types.VARCHAR:
+ case Types.OTHER:
break;
default:
statement.setNull(position, typeObject.intValue());
1.1.2.12 +24 -12
xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java
Index: OraAddAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/OraAddAction.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- OraAddAction.java 2001/03/19 21:20:14 1.1.2.11
+++ OraAddAction.java 2001/03/26 19:40:42 1.1.2.12
@@ -19,6 +19,7 @@
import java.util.Map;
import java.util.HashMap;
+import java.util.ArrayList;
import java.io.File;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -42,7 +43,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/19 21:20:14 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/26 19:40:42 $
*/
public class OraAddAction extends DatabaseAddAction {
private static final Map selectLOBStatements = new HashMap();
@@ -251,19 +252,17 @@
for (int i = 0; i < keys.length; i++) {
String mode = keys[i].getAttribute("mode", "automatic");
- if ("manual".equals(mode) || "form".equals(mode)) {
- if (numKeys > 0) {
- queryBuffer.append(", ");
- }
-
- queryBuffer.append(keys[i].getAttribute("dbcol"));
+ if (numKeys > 0) {
+ queryBuffer.append(", ");
+ }
- if ("manual".equals(mode)) {
- this.setSelectQuery(table.getAttribute("name"),
keys[i]);
- }
+ queryBuffer.append(keys[i].getAttribute("dbcol"));
- numKeys++;
+ if ("manual".equals(mode)) {
+ this.setSelectQuery(table.getAttribute("name"),
keys[i]);
}
+
+ numKeys++;
}
for (int i = 0; i < values.length; i++) {
@@ -277,10 +276,23 @@
queryBuffer.append(") VALUES (");
numKeys = 0;
+ ArrayList sequences = new ArrayList();
for (int i = 0; i < keys.length; i++) {
if (numKeys > 0) queryBuffer.append(", ");
- if ("automatic".equals(keys[i].getAttribute("mode",
"automatic")) == false) {
+ if ("automatic".equals(keys[i].getAttribute("mode",
"automatic"))) {
+ String sequence = keys[i].getAttribute("sequence",
"");
+ queryBuffer.append(sequence);
+
+ if (sequences.contains(sequence)) {
+ queryBuffer.append(".CURRVAL");
+ } else {
+ sequences.add(sequence);
+ queryBuffer.append(".NEXTVAL");
+ }
+
+ numKeys++;
+ } else {
queryBuffer.append("?");
numKeys++;
}
No revision
No revision
1.1.2.12 +32 -3
xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/Attic/XSPRequestHelper.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- XSPRequestHelper.java 2001/03/26 16:24:53 1.1.2.11
+++ XSPRequestHelper.java 2001/03/26 19:40:44 1.1.2.12
@@ -24,7 +24,7 @@
* The <code>HttpServletRequest</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/26 16:24:53 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/26 19:40:44 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -277,10 +277,10 @@
HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
HttpSession session = request.getSession(false);
- String value = null;
+ Object value = null;
if (session != null) {
- value = (String) session.getAttribute(name);
+ value = session.getAttribute(name);
}
if (value == null) {
@@ -302,6 +302,35 @@
HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
request.removeAttribute(name);
+ }
+
+ /**
+ * Get the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ */
+ public static Object getAttribute(
+ Map objectModel,
+ String name) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ return request.getAttribute(name);
+ }
+
+ /**
+ * Set the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ */
+ public static void setAttribute(
+ Map objectModel,
+ String name,
+ Object value) {
+
+ HttpRequest request =
(HttpRequest)objectModel.get(Constants.REQUEST_OBJECT);
+ request.setAttribute(name, value);
}
/**
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
