Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba

2013-04-10 Thread Chris Hillery
Review: Disapprove

I believe this branch has fallen too far behind the times. I will re-do the 
change to add the slash as part of 3.0.
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
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/functx-uri-fix into lp:zorba

2013-04-10 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Needs review = Rejected

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
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/functx-uri-fix into lp:zorba

2012-01-25 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
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/functx-uri-fix into lp:zorba

2012-01-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
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/functx-uri-fix into lp:zorba

2012-01-25 Thread Sorin Marian Nasoi
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
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/functx-uri-fix into lp:zorba

2012-01-11 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Description changed to:

Per discussion on conf call 1/11/2012, this fix should NOT be merged until we 
are preparing Zorba 3.0 - it should NOT be in Zorba 2.2 if there is such a 
release.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-11 Thread Cezar Andrei
Fix for allowing both URI's ending with or without slash '/' should also be 
added before 3.0 release.
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-11 Thread Chris Hillery
 Fix for allowing both URI's ending with or without slash '/' should also be
 added before 3.0 release.

As discussed on the mailing list, it is not possible to support both URIs 
simultaneously (without some ugly hacks). Is that what you meant? If not, what 
did you mean?
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-11 Thread Cezar Andrei
I'm talking about this problem, but solved cleanly without ugly hacks.
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-11 Thread Chris Hillery
AFAIK there are no suggestions on the table on how to allow this without 
special-cases or hacks. Also AFAIK there is no outstanding requirement to do 
so. The plan is to change the URI in 3.0 and be done with it.

The fact is that our name-mangling mechanism for mapping URIs to filesystem 
paths is not 100% one-to-one; it is slightly lossy, in that several URIs may 
map to the same filesystem path. This has always been a theoretical problem, 
not an actual one, in the past. The only reason it's an actual problem this 
time is because of a different bug (authoring our FunctX module with the wrong 
URI). IMHO solving this problem is not a high priority, and doing so fully 
would at the least make our on-disk layout rather uglier than it is.
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/functx-uri-fix-2012-01-10T09-14-14.724Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba 
failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 
(message):
  Validation queue job functx-uri-fix-2012-01-10T09-14-14.724Z is finished.
  The final status was:

  

  1 tests did not succeed - changes not commited.


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/functx-uri-fix-2012-01-11T01-08-06.641Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Zorba Build Bot
Voting does not meet specified criteria. Required: Approve  1, Disapprove  1. 
Got: 1 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-10 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-09 Thread Chris Hillery
Chris Hillery has proposed merging lp:~zorba-coders/zorba/functx-uri-fix into 
lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba.
=== modified file 'doc/code/headers_svg/zorba_headers_dependencies.xqi'
--- doc/code/headers_svg/zorba_headers_dependencies.xqi	2011-08-18 19:46:33 +
+++ doc/code/headers_svg/zorba_headers_dependencies.xqi	2012-01-10 07:45:30 +
@@ -22,7 +22,7 @@
 import module namespace file = http://expath.org/ns/file;;
 import module namespace dot = http://www.zorba-xquery.com/modules/image/graphviz;;
 import module namespace html = http://www.zorba-xquery.com/modules/converters/html;;
-import module namespace functx = http://www.functx.com/;;
+import module namespace functx = http://www.functx.com;;
 
 declare namespace ann = http://www.zorba-xquery.com/annotations;;
 

=== modified file 'doc/zorba/xqdoc/images/modules.svg'
--- doc/zorba/xqdoc/images/modules.svg	2011-08-01 17:55:38 +
+++ doc/zorba/xqdoc/images/modules.svg	2012-01-10 07:45:30 +
@@ -1006,7 +1006,7 @@
 /g
 !-- functx_16 --
 g id=node89 class=nodetitlefunctx_16/title
-a xlink:href=../www.functx.com_index.html xlink:title=(Zorba-core) module uri=http://www.functx.com/;
+a xlink:href=../www.functx.com_index.html xlink:title=(Zorba-core) module uri=http://www.functx.com;
 ellipse fill=white stroke=white cx=8411 cy=-301 rx=36.0624 ry=19.0919/
 text text-anchor=middle x=8411 y=-297.9 font-family=Times Roman,serif font-size=14.00 fill=redfunctx/text
 /a

=== modified file 'doc/zorba/xqdoc/src/zorba_module_dependencies.xqi'
--- doc/zorba/xqdoc/src/zorba_module_dependencies.xqi	2011-08-12 16:07:57 +
+++ doc/zorba/xqdoc/src/zorba_module_dependencies.xqi	2012-01-10 07:45:30 +
@@ -26,7 +26,7 @@
 import module namespace file = http://expath.org/ns/file;;
 import module namespace dot = http://www.zorba-xquery.com/modules/image/graphviz;;
 import module namespace xqdoc2html = http://www.zorba-xquery.com/modules/xqdoc2xhtml/;;
-import module namespace functx = http://www.functx.com/;;
+import module namespace functx = http://www.functx.com;;
 
 import module namespace dml = http://www.zorba-xquery.com/modules/store/static/collections/dml;;
 import module namespace ddl = http://www.zorba-xquery.com/modules/store/static/collections/ddl;;

=== modified file 'doc/zorba/xqdoc/templates/www.functx.com_index.html'
--- doc/zorba/xqdoc/templates/www.functx.com_index.html	2011-08-17 19:19:17 +
+++ doc/zorba/xqdoc/templates/www.functx.com_index.html	2012-01-10 07:45:30 +
@@ -1,6 +1,6 @@
 html
   head
-titleDocumentation for http://www.functx.com//title
+titleDocumentation for http://www.functx.com/title
 meta content=text/html; charset=UTF-8 http-equiv=content-type /
 meta content=public http-equiv=CACHE-CONTROL /
 meta content=-1 http-equiv=Expires /
@@ -82,7 +82,7 @@
 /div
   /div
   div id=rightcontent
-h1http://www.functx.com/sup
+h1http://www.functx.comsup
 img src=images/ZCsmall.gif alt=ZC title=This module is part of Zorba core. /
   /sup
 /h1
@@ -90,7 +90,7 @@
   span id=module_descriptionModule Description/span
 /div
 spanBefore using any of the functions below please remember to import the module namespace:
-  pre class=brush: xquery;import module namespace functx = http://www.functx.com/;;/pre
+  pre class=brush: xquery;import module namespace functx = http://www.functx.com;;/pre
 /span
 p 
  The FunctX XQuery Function Library
@@ -132,7 +132,7 @@
 table class=varlist
   tr
 tdfunctx/td
-tdhttp://www.functx.com//td
+tdhttp://www.functx.com/td
   /tr
 /table
 div class=section

=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2011-12-21 14:40:33 +
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-01-10 07:45:30 +
@@ -532,7 +532,7 @@
   {
 if(($moduleUri = http://www.w3.org/2005/xpath-functions;) or
($moduleUri = http://www.w3.org/2005/xpath-functions/math;) or
-   ($moduleUri = http://www.functx.com/;)) then
+   ($moduleUri = http://www.functx.com;)) then
 {
   (:these modules never change, they have no tests, no external functions, and so on:)
   (:just read the content from the templates folder and compute the left menu:)
@@ -1117,7 +1117,7 @@
  xqdoc2html:annotations-module($module/xqdoc:comment),
  if(($moduleUri = http://www.w3.org/2005/xpath-functions;) or
 ($moduleUri = http://www.w3.org/2005/xpath-functions

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba

2012-01-09 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Description changed to:

This corrects the functx module URI. Clearly this fix will break backwards 
compatibility, so it should be approved with care.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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/functx-uri-fix into lp:zorba

2012-01-09 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/functx-uri-fix into lp:zorba has 
been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
-- 
https://code.launchpad.net/~zorba-coders/zorba/functx-uri-fix/+merge/88012
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/functx-uri-fix 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