[Zorba-coders] [Merge] lp:~zorba-coders/zorba/general-tree-ids into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/general-tree-ids
into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608
Allowing general tree IDs in structural URIs (test).
--
https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/rbkt/Queries/zorba/nodes/position_4.xq'
--- test/rbkt/Queries/zorba/nodes/position_4.xq 2012-03-28 05:19:57 +
+++ test/rbkt/Queries/zorba/nodes/position_4.xq 2012-04-03 13:56:23 +
@@ -2,7 +2,7 @@
declare function local:get-ordpath($struct)
{
-replace($struct,'^zorba:\d*\.\d*\.\d*\.','np:')
+replace($struct,'^zorba:\d*\.[\w\-]*\.\d*\.','np:')
};
declare function local:test-generated-ordpath($testa,$testb)
=== modified file 'test/rbkt/Queries/zorba/nodes/position_4_parsed.xq'
--- test/rbkt/Queries/zorba/nodes/position_4_parsed.xq 2012-03-28 05:19:57 +
+++ test/rbkt/Queries/zorba/nodes/position_4_parsed.xq 2012-04-03 13:56:23 +
@@ -2,7 +2,7 @@
declare function local:get-ordpath($struct)
{
-replace($struct,'^zorba:\d*\.\d*\.\d*\.','np:')
+replace($struct,'^zorba:\d*\.[\w\-]*\.\d*\.','np:')
};
declare function local:test-generated-ordpath($testa,$testb)
--
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/no_unicode into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/no_unicode into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/no_unicode/+merge/89104 -- https://code.launchpad.net/~zorba-coders/zorba/no_unicode/+merge/89104 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/no_unicode into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/no_unicode-2012-04-03T15-17-37.639Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/no_unicode/+merge/89104 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/no_unicode into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/no_unicode into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job no_unicode-2012-04-03T15-17-37.639Z is finished. The final status was: 6 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/no_unicode/+merge/89104 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/no_unicode into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/no_unicode into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/no_unicode/+merge/89104 -- https://code.launchpad.net/~zorba-coders/zorba/no_unicode/+merge/89104 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] [Bug 967151] Re: xqdoc segmentation faults on Windows
Both VS10 and NMAKE projects fail to compile. I have attached the VS10 and NMAKE error logs. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/967151 Title: xqdoc segmentation faults on Windows Status in Zorba - The XQuery Processor: New Bug description: On Windows, Rodolfo reported some SEGFAULT errors on these tests on a clean build from the latest revision: 1 - test/xqdoc/make_xqdoc (SEGFAULT) 2442 - test/rbkt/zorba/xqdoc/basic (SEGFAULT) 2444 - test/rbkt/zorba/xqdoc/content (SEGFAULT) 2446 - test/rbkt/zorba/xqdoc/indentation (SEGFAULT) 2447 - test/rbkt/zorba/xqdoc/local (SEGFAULT) 2448 - test/rbkt/zorba/xqdoc/moduleDocumentation (SEGFAULT) 2449 - test/rbkt/zorba/xqdoc/no_global_var (SEGFAULT) 2450 - test/rbkt/zorba/xqdoc/testSchemaTypes (SEGFAULT) 2451 - test/rbkt/zorba/xqdoc/unorderedAnnotations (SEGFAULT) To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/967151/+subscriptions -- 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] [Bug 967151] Re: xqdoc segmentation faults on Windows
** Attachment added: VS10 Error log for 'zorba_simplestore' project. https://bugs.launchpad.net/zorba/+bug/967151/+attachment/2997016/+files/vs10.log -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/967151 Title: xqdoc segmentation faults on Windows Status in Zorba - The XQuery Processor: New Bug description: On Windows, Rodolfo reported some SEGFAULT errors on these tests on a clean build from the latest revision: 1 - test/xqdoc/make_xqdoc (SEGFAULT) 2442 - test/rbkt/zorba/xqdoc/basic (SEGFAULT) 2444 - test/rbkt/zorba/xqdoc/content (SEGFAULT) 2446 - test/rbkt/zorba/xqdoc/indentation (SEGFAULT) 2447 - test/rbkt/zorba/xqdoc/local (SEGFAULT) 2448 - test/rbkt/zorba/xqdoc/moduleDocumentation (SEGFAULT) 2449 - test/rbkt/zorba/xqdoc/no_global_var (SEGFAULT) 2450 - test/rbkt/zorba/xqdoc/testSchemaTypes (SEGFAULT) 2451 - test/rbkt/zorba/xqdoc/unorderedAnnotations (SEGFAULT) To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/967151/+subscriptions -- 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] [Bug 967151] Re: xqdoc segmentation faults on Windows
** Attachment added: NMAKE error log. https://bugs.launchpad.net/zorba/+bug/967151/+attachment/2997017/+files/nmake.log -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/967151 Title: xqdoc segmentation faults on Windows Status in Zorba - The XQuery Processor: New Bug description: On Windows, Rodolfo reported some SEGFAULT errors on these tests on a clean build from the latest revision: 1 - test/xqdoc/make_xqdoc (SEGFAULT) 2442 - test/rbkt/zorba/xqdoc/basic (SEGFAULT) 2444 - test/rbkt/zorba/xqdoc/content (SEGFAULT) 2446 - test/rbkt/zorba/xqdoc/indentation (SEGFAULT) 2447 - test/rbkt/zorba/xqdoc/local (SEGFAULT) 2448 - test/rbkt/zorba/xqdoc/moduleDocumentation (SEGFAULT) 2449 - test/rbkt/zorba/xqdoc/no_global_var (SEGFAULT) 2450 - test/rbkt/zorba/xqdoc/testSchemaTypes (SEGFAULT) 2451 - test/rbkt/zorba/xqdoc/unorderedAnnotations (SEGFAULT) To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/967151/+subscriptions -- 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:~diogo-simoes89/zorba/data-cleaning-thesaurus into lp:zorba/data-cleaning-module
Diogo Simões has proposed merging
lp:~diogo-simoes89/zorba/data-cleaning-thesaurus into
lp:zorba/data-cleaning-module.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning-thesaurus/+merge/100683
This revision includes a new normalization function: capitalize($string as
xs:string) as xs:string.
It also includes the thesaurus-based module, with the check-related ( $s1 as
xs:string, $s2 as xs:string, $uri as xs:string, $type as xs:string ) and the
related-terms ( $s1 as xs:string, $uri as xs:string, $type as xs:string )
functions.
--
https://code.launchpad.net/~diogo-simoes89/zorba/data-cleaning-thesaurus/+merge/100683
Your team Zorba Coders is requested to review the proposed merge of
lp:~diogo-simoes89/zorba/data-cleaning-thesaurus into
lp:zorba/data-cleaning-module.
=== modified file 'src/com/zorba-xquery/www/modules/data-cleaning/normalization.xq'
--- src/com/zorba-xquery/www/modules/data-cleaning/normalization.xq 2011-11-08 21:16:29 +
+++ src/com/zorba-xquery/www/modules/data-cleaning/normalization.xq 2012-04-03 20:16:21 +
@@ -31,12 +31,34 @@
module namespace normalization = http://www.zorba-xquery.com/modules/data-cleaning/normalization;;
import module namespace http = http://www.zorba-xquery.com/modules/http-client;;
+import module namespace ft = http://www.zorba-xquery.com/modules/full-text;;
declare namespace ann = http://www.zorba-xquery.com/annotations;;
declare namespace ver = http://www.zorba-xquery.com/options/versioning;;
declare option ver:module-version 2.0;
(:~
+: Converts a given string into a capitalized representation.
+:
+: @param $string The string to be capitalized.
+:
+: @return The string resulting from the conversion.
+: @example test/Queries/data-cleaning/normalization/capitalize.xq
+:)
+declare function normalization:capitalize ($string as xs:string) as xs:string{
+ let $ttokens := tokenize ($string, )
+ let $cap-tokens :=
+for $toks in $ttokens[position()1]
+let $capitalized-tokens :=
+ if (not(ft:is-stop-word($toks)))
+ then concat(upper-case(substring($toks, 1,1)), substring(lower-case($toks), 2), )
+ else concat(lower-case($toks), )
+return $capitalized-tokens
+ let $cap-string := concat(concat(upper-case(substring($ttokens[position()=1], 1,1)), substring(lower-case($ttokens[position()=1]), 2), ), string-join($cap-tokens))
+ return substring($cap-string, 1, string-length($cap-string)-1)
+};
+
+(:~
: Converts a given string representation of a date value into a date representation valid according
: to the corresponding XML Schema type.
:
=== added file 'src/com/zorba-xquery/www/modules/data-cleaning/thesaurus-based.xq'
--- src/com/zorba-xquery/www/modules/data-cleaning/thesaurus-based.xq 1970-01-01 00:00:00 +
+++ src/com/zorba-xquery/www/modules/data-cleaning/thesaurus-based.xq 2012-04-03 20:16:21 +
@@ -0,0 +1,74 @@
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the License);
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an AS IS BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+ :)
+
+(:~
+ : This library module provides thesaurus functions for checking semantic relations between strings
+ : and for checking abbreviations.
+
+ : These functions are particularly useful in tasks related to the creation of semantic mappings.
+ :
+ :
+ : @author Bruno Martins and Diogo Simões
+ :)
+
+module namespace thesaurus = http://www.zorba-xquery.com/modules/data-cleaning/thesaurus;;
+
+import module namespace ft = http://www.zorba-xquery.com/modules/full-text;;
+
+(:~
+ : Checks if two strings have a relationship defined in a given thesaurus.
+ : The implementation of this function depends on the full-text module.
+ :
+ :
+ : @param $s1 The first string.
+ : @param $s2 The second string.
+ : @param $uri The uri of the thesaurus to be considered.
+ : @param $type An identifyer for the type of relationship.
+ :
+ : @return true if the first string has the provided relationship with the second string defined in the thesaurus and false otherwise.
+ : @example test/Queries/data-cleaning/thesaurus-based/check-related.xq
+ :
+ :)
+declare function thesaurus:check-related ( $s1 as xs:string, $s2 as xs:string, $uri as xs:string, $type as xs:string ) as xs:boolean {
+ let $relation := ft:thesaurus-lookup( $uri,
+ $s2,
+ xs:language(en),
+ $type )
+ return $relation = $s1
+};
+
+(:~
[Zorba-coders] [Bug 972855] [NEW] Simplestore is not compiling on windows
Public bug reported: Currently, simplestore is not compiling on windows with error: zorba::simplestore::Store' : base class undefined ** Affects: zorba Importance: High Assignee: Rodolfo Ochoa (rodolfo-ochoa) Status: New ** Changed in: zorba Importance: Undecided = High -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/972855 Title: Simplestore is not compiling on windows Status in Zorba - The XQuery Processor: New Bug description: Currently, simplestore is not compiling on windows with error: zorba::simplestore::Store' : base class undefined To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/972855/+subscriptions -- 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] [Bug 972855] Re: Simplestore is not compiling on windows
** Changed in: zorba Assignee: (unassigned) = Rodolfo Ochoa (rodolfo-ochoa) ** Branch linked: lp:~zorba-coders/zorba/bug972855 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/972855 Title: Simplestore is not compiling on windows Status in Zorba - The XQuery Processor: New Bug description: Currently, simplestore is not compiling on windows with error: zorba::simplestore::Store' : base class undefined To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/972855/+subscriptions -- 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/bug928987 into lp:zorba
Matthias, there isn't any IStream.java file on the branch... make sure you do a clean build from the branch located in: lp:~zorba-coders/zorba/bug928987 -- https://code.launchpad.net/~zorba-coders/zorba/bug928987/+merge/99445 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/bug972855 into lp:zorba
Review: Needs Fixing Indeed the fix is OK for the VS10 build. However, the NMAKE build is still broken due to a separate issue: please see attached error details. If you think it's best we can open a new bug for the Windows NMAKE build and approve this fix for VS10 build. C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(173) : error C2953: 'std::default_delete' : class template has already been defined C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(20 53) : see declaration of 'std::default_delete' C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(186) : error C2953: 'std::default_delete' : class template has already been defined C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(20 53) : see declaration of 'std::default_delete' C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(200) : warning C434 8: 'std::unique_ptr' : redefinition of default parameter : parameter 2 C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(21 92) : see declaration of 'std::unique_ptr' C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(437) : error C2953: 'std::unique_ptr' : class template has already been defined C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(21 92) : see declaration of 'std::unique_ptr' C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(542) : error C2953: 'std::unique_ptr' : class template has already been defined C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(21 92) : see declaration of 'std::unique_ptr' NMAKE : fatal error U1077: 'C:\PROGRA~2\MICROS~2.0\VC\bin\cl.exe' : return code '0x2' Stop. NMAKE : fatal error U1077: 'C:\Program Files (x86)\Microsoft Visual Studio 10.0 \VC\BIN\nmake.exe' : return code '0x2' Stop. NMAKE : fatal error U1077: 'C:\Program Files (x86)\Microsoft Visual Studio 10.0 \VC\BIN\nmake.exe' : return code '0x2' Stop. -- https://code.launchpad.net/~zorba-coders/zorba/bug972855/+merge/100697 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
