dims 01/07/10 07:04:24
Modified: src/org/apache/cocoon Roles.java
src/org/apache/cocoon/components/language/markup/xsp/java
esql.xsl
Log:
Sync with stuff from 2.0
Revision Changes Path
1.3 +1 -33 xml-cocoon2/src/org/apache/cocoon/Roles.java
Index: Roles.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Roles.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Roles.java 2001/07/04 07:56:39 1.2
+++ Roles.java 2001/07/10 14:03:58 1.3
@@ -12,43 +12,11 @@
* Created this interface to specify the Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/07/04 07:56:39 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/07/10 14:03:58 $
*/
public interface Roles {
- String BROWSER = "org.apache.cocoon.components.browser.Browser";
- String PARSER = "org.apache.cocoon.components.parser.Parser";
- String PROCESSOR = "org.apache.cocoon.Processor";
- String STORE = "org.apache.cocoon.components.store.Store";
- String REPOSITORY = "org.apache.cocoon.components.store.Repository";
- String SERVERPAGES =
"org.apache.cocoon.components.language.generator.ServerPagesSelector";
-
- String MARKUP_LANGUAGE =
"org.apache.cocoon.components.language.markup.MarkupLanguageSelector";
- String PROGRAMMING_LANGUAGE =
"org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector";
- String PROGRAM_GENERATOR =
"org.apache.cocoon.components.language.generator.ProgramGenerator";
- String CLASS_LOADER =
"org.apache.cocoon.components.classloader.ClassLoaderManager";
- String POOL_CONTROLLER = "org.apache.avalon.excalibur.pool.PoolController";
- String SAX_CONNECTOR =
"org.apache.cocoon.components.saxconnector.SAXConnector";
- String IMAGE_ENCODER =
"org.apache.cocoon.components.image.ImageEncoderSelector";
String DB_CONNECTION =
"org.apache.avalon.excalibur.datasource.DataSourceComponentSelector";
- String URL_FACTORY = "org.apache.cocoon.components.url.URLFactory";
- String SOURCE_HANDLER =
"org.apache.cocoon.components.source.SourceHandler";
-
- String ACTIONS = "org.apache.cocoon.acting.ActionSelector";
- String SELECTORS = "org.apache.cocoon.selection.SelectorSelector";
- String MATCHERS = "org.apache.cocoon.matching.MatcherSelector";
- String GENERATORS = "org.apache.cocoon.generation.GeneratorSelector";
- String TRANSFORMERS =
"org.apache.cocoon.transformation.TransformerSelector";
- String SERIALIZERS =
"org.apache.cocoon.serialization.SerializerSelector";
- String READERS = "org.apache.cocoon.reading.ReaderSelector";
-
- String EVENT_PIPELINE =
"org.apache.cocoon.components.pipeline.EventPipeline";
- String STREAM_PIPELINE =
"org.apache.cocoon.components.pipeline.StreamPipeline";
-
- String XML_SERIALIZER = "org.apache.cocoon.components.sax.XMLSerializer";
- String XML_DESERIALIZER =
"org.apache.cocoon.components.sax.XMLDeserializer";
- String EVENT_CACHE = "org.apache.cocoon.caching.EventCache";
- String STREAM_CACHE = "org.apache.cocoon.caching.StreamCache";
}
1.11 +20 -25
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- esql.xsl 2001/07/07 18:47:53 1.10
+++ esql.xsl 2001/07/10 14:04:15 1.11
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.10 2001/07/07 18:47:53 giacomo Exp $-->
+<!-- $Id: esql.xsl,v 1.11 2001/07/10 14:04:15 dims Exp $-->
<!--
============================================================================
@@ -502,28 +502,20 @@
</xsl:otherwise>
</xsl:choose>
if (_esql_query.results) {
- do {
- _esql_query.resultset = _esql_query.statement.getResultSet();
- _esql_query.resultset_metadata = _esql_query.resultset.getMetaData();
- _esql_query.position = 0;
- if (_esql_connection.use_limit_clause == 0 &&
_esql_query.skip_rows > 0) {
- while (_esql_query.resultset.next()) {
- _esql_query.position++;
- if (_esql_query.position == _esql_query.skip_rows) {
- break;
- }
+ _esql_query.resultset = _esql_query.statement.getResultSet();
+ _esql_query.resultset_metadata = _esql_query.resultset.getMetaData();
+ _esql_query.position = 0;
+ if (_esql_connection.use_limit_clause == 0 && _esql_query.skip_rows
> 0) {
+ while (_esql_query.resultset.next()) {
+ _esql_query.position++;
+ if (_esql_query.position == _esql_query.skip_rows) {
+ break;
}
- }
-
- if (_esql_query.resultset.next()) { /* desire */
- <xsl:apply-templates select="esql:results"/>
- }
- else {
- <xsl:apply-templates select="esql:no-results"/>
}
-
- _esql_query.resultset.close();
- } while(_esql_query.statement.getMoreResults());
+ }
+ <xsl:apply-templates select="esql:results"/>
+ <xsl:apply-templates select="esql:no-results"/>
+ _esql_query.resultset.close();
} else {
_esql_query.position = _esql_query.statement.getUpdateCount();
if (_esql_query.position >= 0) {
@@ -570,7 +562,11 @@
</xsl:template>
<xsl:template match="esql:execute-query//esql:no-results">
- <xsl:apply-templates/>
+ <xsp:logic>
+ if (_esql_query.position == _esql_query.skip_rows) {
+ <xsl:apply-templates/>
+ }
+ </xsp:logic>
</xsl:template>
<xsl:template match="esql:update-results//esql:get-update-count">
@@ -579,15 +575,14 @@
<xsl:template match="esql:results//esql:row-results">
<xsp:logic>
- do {
+ while (_esql_query.resultset.next()) {
<xsl:apply-templates/>
if (_esql_connection.use_limit_clause == 0 && _esql_query.max_rows !=
-1 && _esql_query.position - _esql_query.skip_rows == _esql_query.max_rows-1) {
_esql_query.position++;
break;
}
_esql_query.position++;
- } while (_esql_query.resultset.next());
-
+ }
if (_esql_query.resultset.next()) {
<xsl:apply-templates select="following-sibling::esql:more-results"
mode="more"/>
_esql_query.position++;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
