hammant 01/11/22 09:41:41
Modified: apps/db/src/java/org/apache/avalon/db/basic/actions
SimpleWhereClause.java
Log:
attempt at correcting jaavascript for iterative row matching
Revision Changes Path
1.5 +13 -9
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/SimpleWhereClause.java
Index: SimpleWhereClause.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/basic/actions/SimpleWhereClause.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleWhereClause.java 2001/11/20 16:43:46 1.4
+++ SimpleWhereClause.java 2001/11/22 17:41:41 1.5
@@ -31,7 +31,7 @@
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class SimpleWhereClause extends AbstractLogEnabled {
private String mWhereClause;
@@ -95,14 +95,18 @@
rh.addBean("testHelper",testHelper);
//getLogger().debug("mWhereClause" + mWhereClause.toString());
String js =
- "while(iterator.hasNext()) {" +
- "var row = it.next();" +
- "if ( " + mWhereClause + " ) {" +
- "callBack.rowMatches(row, true);" +
- "} else {" +
- "callBack.rowMatches(row, false);" +
- "}" +
- "}";
+ "var more = iterator.hasNext();\n" +
+ "if (more) {\n" +
+ "do {\n" +
+ "var row = iterator.next();\n" +
+ "if ( " + mWhereClause + " ) {\n" +
+ "callBack.rowMatches(row, true);\n" +
+ "} else {\n" +
+ "callBack.rowMatches(row, false);\n" +
+ "}\n" +
+ "} while(iterator.hasNext())\n" +
+ "}\n";
+ System.out.println("js::" + js);
rh.executeScript(js);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
