You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sa...@apache.org on 2002/06/25 19:05:38 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util Util.java
santiagopg 2002/06/25 10:05:38
Modified: java/src/org/apache/xalan/xsltc/compiler
FunctionAvailableCall.java
java/src/org/apache/xalan/xsltc/compiler/util Util.java
Log:
Fix for function-available() needed to handle XSLTC's extension functions.
Revision Changes Path
1.8 +3 -2 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
Index: FunctionAvailableCall.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionAvailableCall.java 25 Jun 2002 13:31:05 -0000 1.7
+++ FunctionAvailableCall.java 25 Jun 2002 17:05:38 -0000 1.8
@@ -231,7 +231,8 @@
_namespaceOfFunct.equals(TRANSLET_URI))
{
final Parser parser = getParser();
- _isFunctionAvailable = parser.functionSupported(_nameOfFunct);
+ _isFunctionAvailable =
+ parser.functionSupported(Util.getLocalName(_nameOfFunct));
}
return _isFunctionAvailable;
}
1.9 +12 -1 xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Util.java
Index: Util.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/Util.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Util.java 30 Apr 2002 17:16:51 -0000 1.8
+++ Util.java 25 Jun 2002 17:05:38 -0000 1.9
@@ -66,6 +66,7 @@
import org.apache.bcel.generic.Type;
import org.apache.bcel.generic.*;
import org.apache.xalan.xsltc.compiler.Parser;
+import org.apache.xalan.xsltc.compiler.Constants;
public final class Util {
static public char filesep;
@@ -186,5 +187,15 @@
new String[] { "$dot$", "$dash$", "$slash$", "$colon$" });
}
+ public static String getLocalName(String qname) {
+ final int index = qname.lastIndexOf(":");
+ return (index > 0) ? qname.substring(index + 1) : qname;
+ }
+
+ public static String getPrefix(String qname) {
+ final int index = qname.lastIndexOf(":");
+ return (index > 0) ? qname.substring(0, index) :
+ Constants.EMPTYSTRING;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org