From: John S. <jp...@us...> - 2007-01-09 01:01:25
|
Update of /cvsroot/xqilla/xqilla/tests/xqts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15121/tests/xqts Modified Files: runner.cpp Log Message: Moved recent fixes over from the XQilla_1_0 branch, including: function signature global cache removal, fix to parse modules using the correct syntax, fix to query plan output of modules. Index: runner.cpp =================================================================== RCS file: /cvsroot/xqilla/xqilla/tests/xqts/runner.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** runner.cpp 1 Nov 2006 16:37:23 -0000 1.27 --- runner.cpp 9 Jan 2007 01:01:24 -0000 1.28 *************** *** 302,310 **** context->registerURIResolver(this); ! Janitor<XQQuery> pParsedQuery(xqilla.parseFromURI(X(testCase.queryURL.c_str()), XQilla::XQUERY, context.get(), XQilla::NO_ADOPT_CONTEXT)); map<string, string>::const_iterator v; for(v=testCase.extraVars.begin();v!=testCase.extraVars.end();v++) { ! XQQuery* pInnerQuery = xqilla.parseFromURI(X(v->second.c_str()), XQilla::XQUERY, context.get()); Sequence doc=pInnerQuery->execute(context.get())->toSequence(context.get()); context->getVariableStore()->setGlobalVar(X(v->first.c_str()),doc,context.get(), 0); --- 302,310 ---- context->registerURIResolver(this); ! Janitor<XQQuery> pParsedQuery(xqilla.parseFromURI(X(testCase.queryURL.c_str()), context.get(), XQilla::NO_ADOPT_CONTEXT)); map<string, string>::const_iterator v; for(v=testCase.extraVars.begin();v!=testCase.extraVars.end();v++) { ! XQQuery* pInnerQuery = xqilla.parseFromURI(X(v->second.c_str()), context.get()); Sequence doc=pInnerQuery->execute(context.get())->toSequence(context.get()); context->getVariableStore()->setGlobalVar(X(v->first.c_str()),doc,context.get(), 0); |