Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-skinny
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-skinny/+merge/80756
moved base uri and doc uri from the XmlTree to the DocumentNode
--
https://code.launchpad.net/~zorba-coders/zorba/markos-skinny/+merge/80756
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp 2011-07-15 16:39:51 +
+++ src/store/naive/loader_dtd.cpp 2011-10-30 15:52:25 +
@@ -104,10 +104,12 @@
theSaxHandler.entityDecl = FragmentXmlLoader::entityDecl;
}
+
FragmentXmlLoader::~FragmentXmlLoader()
{
}
+
store::Item_t FragmentXmlLoader::loadXml(
const zstring baseUri,
const zstring docUri,
@@ -117,6 +119,8 @@
xmlSubstituteEntitiesDefault(1);
+ theBaseUri = baseUri;
+
if (docUri.empty())
{
std::ostringstream uristream;
@@ -130,9 +134,6 @@
thePathStack.push(PathStepInfo(NULL, baseUri));
- theTree-setDocUri(theDocUri);
- theTree-setBaseUri(baseUri);
-
try
{
theFragmentStream = static_castFragmentIStream*(stream);
@@ -147,17 +148,24 @@
theFragmentStream-theBuffer = new char[static_castunsigned int(fileSize+1)];
theFragmentStream-theBuffer[fileSize] = 0;
- std::streamsize numChars = readPacket(*theFragmentStream-theStream, theFragmentStream-theBuffer, fileSize);
+ std::streamsize numChars = readPacket(*theFragmentStream-theStream,
+theFragmentStream-theBuffer,
+fileSize);
theFragmentStream-buffer_size = numChars;
if (numChars 0)
{
-theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+
abortload();
return NULL;
}
else if (numChars == 0)
{
-theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR, ERROR_PARAMS(ZED(NoInputData;
+theXQueryDiagnostics-
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR,
+ ERROR_PARAMS(ZED(NoInputData;
+
abortload();
return NULL;
}
@@ -168,7 +176,10 @@
// ctxt = xmlCreate
if (ctxt == NULL)
{
- theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParserInitFailed ) )));
+ theXQueryDiagnostics-
+ add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,
+ERROR_PARAMS(ZED(ParserInitFailed;
+
abortload();
return NULL;
}
@@ -180,7 +191,10 @@
xmlParserInputPtr input = xmlNewInputStream(ctxt);
if (input == NULL)
{
- theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( ParserInitFailed ) )));
+ theXQueryDiagnostics-
+ add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,
+ERROR_PARAMS(ZED(ParserInitFailed;
+
abortload();
return NULL;
}
@@ -199,7 +213,10 @@
// Finally call the parser
if (xmlParseExtParsedEnt(ctxt)==-1)
{
- theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,ERROR_PARAMS( ZED( ParserNoCreateTree ) )));
+ theXQueryDiagnostics-
+ add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,
+ERROR_PARAMS(ZED(ParserNoCreateTree;
+
abortload();
return NULL;
}
@@ -223,11 +240,15 @@
{
if (!theDocUri.empty())
{
- theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ), theDocUri )));
+ theXQueryDiagnostics-
+ add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,
+ERROR_PARAMS(ZED(BadXMLDocument_2o), theDocUri)));
}
else
{
- theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ) )));
+ theXQueryDiagnostics-
+ add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,
+ERROR_PARAMS(ZED(BadXMLDocument_2o;
}
abortload();
return NULL;
@@ -237,7 +258,10 @@
if ( ctxt-lastError.code == XML_NS_ERR_UNDEFINED_NAMESPACE ||
ctxt-lastError.code != XML_ERR_NO_DTD )
{
- theXQueryDiagnostics-add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR, ERROR_PARAMS( ZED( BadXMLDocument_2o ) )));
+ theXQueryDiagnostics-
+ add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0021_LOADER_PARSING_ERROR,
+ERROR_PARAMS(ZED(BadXMLDocument_2o;
+
abortload();
return NULL;
}
@@ -256,6
