morten 01/11/29 01:49:36
Modified: java/src/org/apache/xalan/xsltc/compiler Sort.java
java/src/org/apache/xalan/xsltc/dom NodeSortRecord.java
Log:
A fix for multilevel sort-keys. If a set of translets (representing different
stylesheets) are running one the same JVM, and two or more of these translets
use NodeSortRecord objects to represent <xsl:sort/> elements, then the number
of sort keys would be set in the NodeSortRecord _class_ constructor instead of
being set locally for each occurance of <xsl:sort/>.
PR: bugzilla 4755
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.13 +3 -1 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java
Index: Sort.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Sort.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Sort.java 2001/11/21 10:52:54 1.12
+++ Sort.java 2001/11/29 09:49:35 1.13
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Sort.java,v 1.12 2001/11/21 10:52:54 morten Exp $
+ * @(#)$Id: Sort.java,v 1.13 2001/11/29 09:49:35 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -370,9 +370,11 @@
final int levels = sortObjects.size();
+ /*
final int levelsField = cpg.addFieldref(className, "_levels", "I");
il.append(new PUSH(cpg, levels));
il.append(new PUTSTATIC(levelsField));
+ */
// Compile code that initializes the locale
String language = null;
1.8 +3 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
Index: NodeSortRecord.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NodeSortRecord.java 2001/11/05 15:47:35 1.7
+++ NodeSortRecord.java 2001/11/29 09:49:35 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: NodeSortRecord.java,v 1.7 2001/11/05 15:47:35 morten Exp $
+ * @(#)$Id: NodeSortRecord.java,v 1.8 2001/11/29 09:49:35 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -83,7 +83,7 @@
protected static Collator _collator = Collator.getInstance();
- protected static int _levels = 1;
+ protected int _levels = 1;
protected int[] _compareType;
protected int[] _sortOrder;
@@ -123,6 +123,7 @@
_translet = translet;
_scanned = 0;
+ _levels = order.length;
_sortOrder = order;
_compareType = type;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
