You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by gi...@apache.org on 2003/04/11 14:29:37 UTC

cvs commit: xml-xindice/java/src/org/apache/xindice/core/query XPathQueryResolver.java

gianugo     2003/04/11 05:29:37

  Modified:    java/src/org/apache/xindice/core/query
                        XPathQueryResolver.java
  Log:
  This should make Gump happy. So far all my tests have been succesful
  so i don't expect that anything breaks, but you never know so feedback
  is much appreciated, given also the level of undocumented black magic
  that this class has.
  
  NOTE: this doesn't mean that we can upgrade Xalan, since Xupdate would break
  with 2.4.1 (hope to fix that soon)
  
  Revision  Changes    Path
  1.11      +2 -2      xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java
  
  Index: XPathQueryResolver.java
  ===================================================================
  RCS file: /home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XPathQueryResolver.java	27 Mar 2003 07:05:32 -0000	1.10
  +++ XPathQueryResolver.java	11 Apr 2003 12:29:37 -0000	1.11
  @@ -538,7 +538,7 @@
         private Object evalFunction(String owner, int pos) throws Exception {
            int idx = Compiler.getFirstChildPos(pos);
            int id = cmp.getOp(idx);
  -         int endFunc = pos + cmp.getOpMap()[pos+1] - 1;
  +         int endFunc = cmp.getOp(pos +1) - 1;
   
            List args = new ArrayList();
            int lp = idx+1;
  
  
  

Re: cvs commit: xml-xindice/java/src/org/apache/xindice/core/query XPathQueryResolver.java

Posted by Gianugo Rabellino <gi...@apache.org>.
Dave Viner wrote:
> looks like this made gump happy about that line, but now there are 100
> errors in the java/tests/ directory.  It looks like most (if not all) are
> just import errors.

Yes, I'm taking care of it. Gump used to stop since Ant was giving an 
error during the src build, so we didn't notice those. Now it goes on 
and it found plenty of problems (mostly dependencies) in the test build. 
Hope to have it working in the next few days.

Ciao,

-- 
Gianugo Rabellino
Pro-netics s.r.l.
http://www.pro-netics.com


RE: cvs commit: xml-xindice/java/src/org/apache/xindice/core/query XPathQueryResolver.java

Posted by Dave Viner <dv...@yahoo-inc.com>.
looks like this made gump happy about that line, but now there are 100
errors in the java/tests/ directory.  It looks like most (if not all) are
just import errors.

dave


-----Original Message-----
From: gianugo@apache.org [mailto:gianugo@apache.org]
Sent: Friday, April 11, 2003 5:30 AM
To: xml-xindice-cvs@apache.org
Subject: cvs commit: xml-xindice/java/src/org/apache/xindice/core/query
XPathQueryResolver.java


gianugo     2003/04/11 05:29:37

  Modified:    java/src/org/apache/xindice/core/query
                        XPathQueryResolver.java
  Log:
  This should make Gump happy. So far all my tests have been succesful
  so i don't expect that anything breaks, but you never know so feedback
  is much appreciated, given also the level of undocumented black magic
  that this class has.

  NOTE: this doesn't mean that we can upgrade Xalan, since Xupdate would
break
  with 2.4.1 (hope to fix that soon)

  Revision  Changes    Path
  1.11      +2 -2
xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java

  Index: XPathQueryResolver.java
  ===================================================================
  RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResol
ver.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XPathQueryResolver.java	27 Mar 2003 07:05:32 -0000	1.10
  +++ XPathQueryResolver.java	11 Apr 2003 12:29:37 -0000	1.11
  @@ -538,7 +538,7 @@
         private Object evalFunction(String owner, int pos) throws Exception
{
            int idx = Compiler.getFirstChildPos(pos);
            int id = cmp.getOp(idx);
  -         int endFunc = pos + cmp.getOpMap()[pos+1] - 1;
  +         int endFunc = cmp.getOp(pos +1) - 1;

            List args = new ArrayList();
            int lp = idx+1;