From: Pierrick B. <br...@us...> - 2006-01-15 20:55:52
|
Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17932/src/org/exist/xquery Modified Files: Predicate.java PathExpr.java Log Message: Cosmetics : Organized imports Relocated local variables Reformatted code Index: Predicate.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/Predicate.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** Predicate.java 15 Jan 2006 20:16:01 -0000 1.46 --- Predicate.java 15 Jan 2006 20:55:44 -0000 1.47 *************** *** 76,82 **** contextInfo.removeFlag(IN_WHERE_CLAUSE); // remove where clause flag contextInfo.setContextId(getExpressionId()); ! Expression inner = getExpression(0); ! if(inner == null) return; AnalyzeContextInfo newContextInfo = new AnalyzeContextInfo(contextInfo); newContextInfo.setParent(this); --- 76,85 ---- contextInfo.removeFlag(IN_WHERE_CLAUSE); // remove where clause flag contextInfo.setContextId(getExpressionId()); ! //TODO : how can it be possible ? ! Expression inner = getExpression(0); ! if(inner == null) { ! LOG.info("REPORT ME : null Inner Sequence"); return; + } AnalyzeContextInfo newContextInfo = new AnalyzeContextInfo(contextInfo); newContextInfo.setParent(this); *************** *** 213,217 **** for (Iterator i = nodes.iterator(); i.hasNext();) { NodeProxy currentNode = (NodeProxy) i.next(); ! int sizeHint = -1; if(lastDoc == null || currentNode.getDocument() != lastDoc) { lastDoc = currentNode.getDocument(); --- 216,220 ---- for (Iterator i = nodes.iterator(); i.hasNext();) { NodeProxy currentNode = (NodeProxy) i.next(); ! int sizeHint = Constants.NO_SIZE_HINT; if(lastDoc == null || currentNode.getDocument() != lastDoc) { lastDoc = currentNode.getDocument(); Index: PathExpr.java =================================================================== RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/PathExpr.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** PathExpr.java 15 Jan 2006 13:32:02 -0000 1.38 --- PathExpr.java 15 Jan 2006 20:55:44 -0000 1.39 *************** *** 140,146 **** result = Sequence.EMPTY_SEQUENCE; } else { ! ! if (contextSequence != null) ! result = contextSequence; DocumentSet contextDocs = null; --- 140,145 ---- result = Sequence.EMPTY_SEQUENCE; } else { ! //we will filter out nodes from the contextSequence ! result = contextSequence; DocumentSet contextDocs = null; |