Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
The Xerces doc doesn't say what happens with the buffer, but I checked the source and they both (setSystemId and setPublicId) do make copies of the buffer. -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Review: Approve Change looks good to me. I also tested it with a bigger schema and with valgrind. I don't see a memory problem. -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Fixed. Please check. -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Review: Approve I wish Xerces' doc confirmed that setPublicId() and setSystemId() made local copies of those parameters, but valgrind reports no leaks so clearly they do! -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1023120-schemaImport-2012-07-14T01-48-00.078Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Validation queue job bug1023120-schemaImport-2012-07-14T01-48-00.078Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba.
Requested reviews:
Zorba Coders (zorba-coders)
Related bugs:
Bug #1023120 in Zorba: xs:include ignored in schemas
https://bugs.launchpad.net/zorba/+bug/1023120
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712
Fix for bug 1023120 xs:include ignored in schemas.
Added a new test for this case.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba.
=== modified file 'src/types/schema/schema.cpp'
--- src/types/schema/schema.cpp 2012-07-12 17:29:55 +
+++ src/types/schema/schema.cpp 2012-07-12 19:33:21 +
@@ -115,13 +115,14 @@
// QQQ Is this reinterpret_cast necessary? Is it safe? Can I just
// pump the chars from read() to the XMLBytes Xerces wants?
char* const lToFill = reinterpret_castchar*(toFill);
+TRACE(lToFill: lToFill );
theStream-read(lToFill, maxToRead);
return static_castunsigned int(theStream-gcount());
}
virtual const XMLCh* getContentType() const
{
-// Unless we know it, do what Xerces' implemtation does: return 0
+// Unless we know it, do what Xerces' implementation does: return 0
return 0;
}
@@ -232,7 +233,7 @@
try
{
-TRACE(lId: StrX(lId) lResolved: lResolved);
+TRACE(lId: StrX(lId) lResolved: lResolved thePhysURI: StrX(thePhysicalURI));
zstring lErrorMessage;
lResource = theSctx-resolve_uri(lResolved, internal::EntityData::SCHEMA, lErrorMessage);
internal::StreamResource* lStream =
@@ -245,10 +246,10 @@
lStream-setStreamReleaser(nullptr);
if (isSystemId)
-lRetval-setSystemId(thePhysicalURI);
+lRetval-setSystemId(XMLString::transcode(lResolved.c_str()));
if (isPublicId)
-lRetval-setPublicId(thePhysicalURI);
+lRetval-setPublicId(XMLString::transcode(lResolved.c_str()));
return lRetval;
}
=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/include.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/include.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/schemas/include.xml.res 2012-07-12 19:33:21 +
@@ -0,0 +1,3 @@
+?xml version=1.0 encoding=UTF-8?
+s:superproduct xmlns:s=http://www.28msec.com/project1/schemas/simple; string=blabla something=something/
+
=== added file 'test/rbkt/Queries/zorba/schemas/incl-base.xsd'
--- test/rbkt/Queries/zorba/schemas/incl-base.xsd 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/incl-base.xsd 2012-07-12 19:33:21 +
@@ -0,0 +1,13 @@
+xs:schema xmlns:xs=http://www.w3.org/2001/XMLSchema;
+ targetNamespace=http://www.28msec.com/project1/schemas/simple;
+xmlns=http://www.28msec.com/project1/schemas/simple;
+ elementFormDefault=qualified
+
+ xs:element name=product type=ProductType/
+
+ xs:complexType name=ProductType
+xs:attribute name=string type=xs:string/
+ /xs:complexType
+
+/xs:schema
+
=== added file 'test/rbkt/Queries/zorba/schemas/incl-extensions.xsd'
--- test/rbkt/Queries/zorba/schemas/incl-extensions.xsd 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/incl-extensions.xsd 2012-07-12 19:33:21 +
@@ -0,0 +1,20 @@
+xs:schema xmlns:xs=http://www.w3.org/2001/XMLSchema;
+ targetNamespace=http://www.28msec.com/project1/schemas/simple;
+xmlns:ext=http://www.28msec.com/project1/schemas/simple;
+xmlns:simple=http://www.28msec.com/project1/schemas/simple;
+ elementFormDefault=qualified
+
+ xs:include schemaLocation=incl-base.xsd/
+
+ xs:element name=superproduct type=ext:SuperProductType/
+
+ xs:complexType name=SuperProductType
+xs:complexContent
+ xs:extension base=simple:ProductType
+xs:attribute name=something type=xs:string/
+ /xs:extension
+/xs:complexContent
+ /xs:complexType
+
+/xs:schema
+
=== added file 'test/rbkt/Queries/zorba/schemas/include.xq'
--- test/rbkt/Queries/zorba/schemas/include.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/include.xq 2012-07-12 19:33:21 +
@@ -0,0 +1,4 @@
+import schema namespace s =
+http://www.28msec.com/project1/schemas/simple; at incl-extensions.xsd;
+
+validate { s:superproduct string=blabla something=something/ }
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba has been updated. Commit Message changed to: Integrate: Fix for bug 1023120 xs:include ignored in schemas. Added a new test for this case. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1023120-schemaImport-2012-07-12T19-35-14.795Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Validation queue job bug1023120-schemaImport-2012-07-12T19-35-14.795Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1023120-schemaImport into lp:zorba
Review: Needs Fixing Interesting! However, XMLString::transcode() returns a memory buffer that the caller must free by calling XMLString::release(), so I believe this change introduces a memory leak (unless InputSource will free them, which I don't think it does). I'm actually not 100% sure how to solve this - I guess IstreamInputSource could free them in its destructor, if it can tell that it needs to do so? -- https://code.launchpad.net/~zorba-coders/zorba/bug1023120-schemaImport/+merge/114712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
