[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1015468 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
ChangeLog entry will be added on bump-2.9 branch. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/unit_tests/test_uri.cpp text conflict in src/zorbatypes/URI.cpp -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1015468-2013-05-07T22-42-52.906Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba has been updated. Commit Message changed to: Fix bug 1015468: wrong relative URI resolution with fragment-only relative URIs. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1015468-2013-05-03T08-19-58.515Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Validation queue job bug-1015468-2013-05-03T08-19-58.515Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
I followed Chris' suggestion and now we use the full path to build the reference in the case when we don't have a path in the relative URI. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712 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/bug-1015468 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1015468
into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1015468 in Zorba: wrong uri resolution with fn:resolve-uri()
https://bugs.launchpad.net/zorba/+bug/1015468
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/test_uri.cpp'
--- src/unit_tests/test_uri.cpp 2013-02-07 17:24:36 +
+++ src/unit_tests/test_uri.cpp 2013-04-30 22:07:29 +
@@ -608,7 +608,21 @@
,
,
localhost/Ångström/b/c // path notation
-}
+},
+{
+ file:///test.xml,
+ #id,
+ file:///test.xml#id,
+ file,
+ 0,
+ id,
+ ,
+ ,
+ /test.xml,
+ ,
+ ,
+ /test.xml
+ }
}; // URITestEntry tests[]
=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp 2013-02-07 17:24:36 +
+++ src/zorbatypes/URI.cpp 2013-04-30 22:07:29 +
@@ -1279,7 +1279,7 @@
base_uri-get_path(path);
zstring::size_type last_slash = path.rfind(/);
- if ( last_slash != zstring::npos )
+ if ( last_slash != zstring::npos (last_slash != 0) )
thePath = path.substr(0, last_slash+1);
else
thePath = path;
@@ -1287,7 +1287,8 @@
set_state(Path);
}
-if ( (! is_set(QueryString)) )
+if ( !is_set(QueryString) base_uri-is_set(QueryString)
+ !base_uri-get_encoded_query().empty() )
{
base_uri-get_query(theQueryString);
--
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
