cvs commit: xml-xalan/java/src/org/apache/xpath/functions FuncIndexOf.java FuncItemAt.java

[mmidy]

mmidy       2002/09/18 13:00:53

  Modified:    java/src/org/apache/xpath/functions Tag: xslt20
                        FuncIndexOf.java FuncItemAt.java
  Log:
  Fix sequence indexing
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +5 -5      
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncIndexOf.java
  
  Index: FuncIndexOf.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncIndexOf.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- FuncIndexOf.java  18 Sep 2002 14:17:47 -0000      1.1.2.2
  +++ FuncIndexOf.java  18 Sep 2002 20:00:52 -0000      1.1.2.3
  @@ -128,12 +128,12 @@
            if (comparator == null)
            {
              if (item.equals(srchParam))
  -            seq.insertItemAt(new XInteger(seqParam.getCurrentPos()), pos++); 
              
  +            seq.insertItemAt(new XInteger(seqParam.getCurrentPos()+1), 
pos++);             
            }
            else
            {
              if (comparator.compare(item.str(), srchParam.str()) == 0)
  -            seq.insertItemAt(new XInteger(seqParam.getCurrentPos()), pos++); 
              
  +            seq.insertItemAt(new XInteger(seqParam.getCurrentPos()+1), 
pos++);             
            }         
            
          }
  @@ -145,19 +145,19 @@
             if (comparator == null)
             {
               if (xnss.equalsExistential(srchParam))
  -               seq.insertItemAt(new XInteger(seqParam.getCurrentPos()), 
pos++);
  +               seq.insertItemAt(new XInteger(seqParam.getCurrentPos()+1), 
pos++);
             }
             else
             {
               if (comparator.compare(xnss.str(), srchParam.str()) == 0)
  -               seq.insertItemAt(new XInteger(seqParam.getCurrentPos()), 
pos++);
  +               seq.insertItemAt(new XInteger(seqParam.getCurrentPos()+1), 
pos++);
             }
            }
          }
          else
          {
            if (item.equals(srchParam))
  -         seq.insertItemAt(new XInteger(seqParam.getCurrentPos()), pos++);
  +         seq.insertItemAt(new XInteger(seqParam.getCurrentPos()+1), pos++);
          }
        }
        
  
  
  
  1.1.2.2   +1 -1      
xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncItemAt.java
  
  Index: FuncItemAt.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/Attic/FuncItemAt.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- FuncItemAt.java   13 Sep 2002 19:59:57 -0000      1.1.2.1
  +++ FuncItemAt.java   18 Sep 2002 20:00:52 -0000      1.1.2.2
  @@ -101,7 +101,7 @@
        if (seqParam.getLength() <= pos)
        this.error(xctxt, XPATHErrorResources.ER_ERROR_OCCURED, null);
        
  -     return ((XSequenceImpl)seqParam).getItem(pos);          
  +     return ((XSequenceImpl)seqParam).getItem(pos-1);        
    
       
     }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]