zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1188035-csv into lp:zorba/csv-module.

Commit message:
Updated module URI.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1188035 in Zorba: "Update non-core module "csv""
  https://bugs.launchpad.net/zorba/+bug/1188035

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655

Updated module URI.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1188035-csv/+merge/182655
Your team Zorba Coders is subscribed to branch lp:zorba/csv-module.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-08-06 08:08:04 +0000
+++ src/CMakeLists.txt	2013-08-28 14:20:59 +0000
@@ -14,8 +14,8 @@
 
 # csv
 DECLARE_ZORBA_SCHEMA (FILE csv-options.xsd
-  URI "http://www.zorba-xquery.com/modules/converters/csv-options";)
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/converters/csv"; VERSION 1.0 FILE "csv.xq")
+  URI "http://zorba.io/modules/csv-options";)
+DECLARE_ZORBA_MODULE (URI "http://zorba.io/modules/csv"; VERSION 1.0 FILE "csv.xq")
 
 # add unit test for streambuf implementation in csv, related to streamable strings
 CREATE_TEST_SOURCELIST (

=== modified file 'src/csv-options.xsd'
--- src/csv-options.xsd	2012-08-04 00:19:55 +0000
+++ src/csv-options.xsd	2013-08-28 14:20:59 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schema
-   targetNamespace="http://www.zorba-xquery.com/modules/converters/csv-options";
-   xmlns:csv="http://www.zorba-xquery.com/modules/converters/csv-options";
+   targetNamespace="http://zorba.io/modules/csv-options";
+   xmlns:csv="http://zorba.io/modules/csv-options";
    xmlns="http://www.w3.org/2001/XMLSchema";
    version="1.0.0">
 <!--
@@ -110,4 +110,4 @@
 
   <element name="options" type="csv:optionsType"/>
   
-</schema>
\ No newline at end of file
+</schema>

=== modified file 'src/csv.xq'
--- src/csv.xq	2013-08-09 09:37:05 +0000
+++ src/csv.xq	2013-08-28 14:20:59 +0000
@@ -23,7 +23,7 @@
  : @author Daniel Turcanu
  : @project Zorba/Data Converters/CSV
  :)
-module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+module namespace csv = "http://zorba.io/modules/csv";;
 
 (:~
  : Import module for checking if csv options element is validated.
@@ -33,7 +33,7 @@
 (:~
  : Contains the definitions of the csv options element.
   :)
-import schema namespace csv-options = "http://www.zorba-xquery.com/modules/converters/csv-options";;
+import schema namespace csv-options = "http://zorba.io/modules/csv-options";;
 
 declare namespace ver = "http://zorba.io/options/versioning";;
 declare option ver:module-version "1.0";
@@ -68,7 +68,7 @@
  :    &lt;/csv-options:options><br/>
  :    <br/>
  :    All the parameters are optional and can appear in any order.<br/>
- :    All the parameters are case sensitive. The namespace used is "http://www.zorba-xquery.com/modules/converters/csv-options";.<br/>
+ :    All the parameters are case sensitive. The namespace used is "http://zorba.io/modules/csv-options";.<br/>
  :    All strings must have UTF-8 encoding.<br/>
  :    Parameters csv, column-widths, column-positions are mutually exclusive. If none is specified, 
  :    the input string is assumed to be csv.<br/>
@@ -180,7 +180,7 @@
  :     </dd>
  :    </dl>
  : @param $csv the string containing the csv or fixed size text.
- : @param $options this parameter is validated against "http://www.zorba-xquery.com/modules/converters/csv-options"; schema. 
+ : @param $options this parameter is validated against "http://zorba.io/modules/csv-options"; schema. 
  :    If this parameter is not specified, the row name is by default "row" and the column name is by default "column". 
  : @return a sequence of row elements, one for each line in csv
  : @error csv:CSV001 if the input string is streamable string and cannot be rewinded
@@ -250,7 +250,7 @@
  : </pre>
  :
  : All the parameters are optional and can appear in any order.<br/>
- : All the parameters are case sensitive. The namespace used is "http://www.zorba-xquery.com/modules/converters/csv-options";.<br/>
+ : All the parameters are case sensitive. The namespace used is "http://zorba.io/modules/csv-options";.<br/>
  : All strings must have UTF-8 encoding.<br/>
  : Parameters csv, column-widths, column-positions are mutually exclusive.
  : If none is specified, the xml is converted to csv.
@@ -334,7 +334,7 @@
  : @param $xml a sequence of elements, each element representing a row. The name of each row element is ignored.
  :     The childs of each row are the column fields.
  : @param $options The options parameter. See the function description for details. 
- : This parameter is validated against "http://www.zorba-xquery.com/modules/converters/csv-options"; schema.
+ : This parameter is validated against "http://zorba.io/modules/csv-options"; schema.
  : @return the csv or fixed size text as string containing all the lines
  : @error csv:CSV003 if the serialize output is streamable string and cannot be reset
  : @error csv:ForeignInput if there are input elements in subsequent rows that do not match the headers,

=== modified file 'src/csv.xq.src/csv.cpp'
--- src/csv.xq.src/csv.cpp	2013-06-04 01:46:28 +0000
+++ src/csv.xq.src/csv.cpp	2013-08-28 14:20:59 +0000
@@ -67,7 +67,7 @@
   return NULL;
 }
 
-const char* CSVModule::theModule = "http://www.zorba-xquery.com/modules/converters/csv";;
+const char* CSVModule::theModule = "http://zorba.io/modules/csv";;
 
 void
 CSVModule::destroy()

=== modified file 'test/Queries/converters/csv/bad_options.xml'
--- test/Queries/converters/csv/bad_options.xml	2011-10-06 07:40:17 +0000
+++ test/Queries/converters/csv/bad_options.xml	2013-08-28 14:20:59 +0000
@@ -1,4 +1,4 @@
-<csv-options:options xmlns:csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";>
+<csv-options:options xmlns:csv-options="http://zorba.io/modules/csv-options";>
 <first-row-is-headers/>
   <csv separator="&#009;"
        quote-char="&quot;"
@@ -8,4 +8,4 @@
       <column/>
     </test7:row>
   </xml-nodes>
-</csv-options:options>
\ No newline at end of file
+</csv-options:options>

=== modified file 'test/Queries/converters/csv/csv_bad.xq'
--- test/Queries/converters/csv/csv_bad.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_bad.xq	2013-08-28 14:20:59 +0000
@@ -1,8 +1,8 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(
 file:read-text(fn:resolve-uri("dpl.txt")), 
 fn:doc("bad_options.xml")/csv-options:options
-)
\ No newline at end of file
+)

=== modified file 'test/Queries/converters/csv/csv_parse1.xq'
--- test/Queries/converters/csv/csv_parse1.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse1.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
 (: csv-to-xml example with 1 row :)
 
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse("f1, f2, f3, f4", ())

=== modified file 'test/Queries/converters/csv/csv_parse10.xq'
--- test/Queries/converters/csv/csv_parse10.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse10.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("NAWQA.swmaster.CROSSTAB_COUNT.1260179451247.csv")),

=== modified file 'test/Queries/converters/csv/csv_parse11.xq'
--- test/Queries/converters/csv/csv_parse11.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse11.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse(
 'f1, f2, f3, f4, f10, f11

=== modified file 'test/Queries/converters/csv/csv_parse11_err.spec'
--- test/Queries/converters/csv/csv_parse11_err.spec	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse11_err.spec	2013-08-28 14:20:59 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/converters/csv:WrongInput
+Error: http://zorba.io/modules/csv:WrongInput

=== modified file 'test/Queries/converters/csv/csv_parse11_err.xq'
--- test/Queries/converters/csv/csv_parse11_err.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse11_err.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse(
 'f1, f2, f3, f4, f10, f11

=== modified file 'test/Queries/converters/csv/csv_parse11_err2.xq'
--- test/Queries/converters/csv/csv_parse11_err2.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse11_err2.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse(
 'f1, f2, f3, f4, f10, f11

=== modified file 'test/Queries/converters/csv/csv_parse2.xq'
--- test/Queries/converters/csv/csv_parse2.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse2.xq	2013-08-28 14:20:59 +0000
@@ -1,7 +1,7 @@
 (:Parse csv with two lines, and the last field is stretched over the next line:)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse(
 'f1, f2, f3, f4

=== modified file 'test/Queries/converters/csv/csv_parse3.xq'
--- test/Queries/converters/csv/csv_parse3.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse3.xq	2013-08-28 14:20:59 +0000
@@ -2,8 +2,8 @@
 The csv file is taken from http://data.gov.
 :)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("tri_2008_NH_v08.txt")),
@@ -46,4 +46,4 @@
   <Facility_Name>SAINT-GOBAIN CERAMICS- IGNITER PRODUCTS</Facility_Name>
   <Street_Address>47 POWERS ST</Street_Address>
 </row>
-:)
\ No newline at end of file
+:)

=== modified file 'test/Queries/converters/csv/csv_parse4.xq'
--- test/Queries/converters/csv/csv_parse4.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse4.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("ME_1_2008_v08.txt")),

=== modified file 'test/Queries/converters/csv/csv_parse4_1.xq'
--- test/Queries/converters/csv/csv_parse4_1.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse4_1.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("ME_1_2008_v08.txt")),

=== modified file 'test/Queries/converters/csv/csv_parse5.xq'
--- test/Queries/converters/csv/csv_parse5.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse5.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 let $options := validate{
@@ -9,7 +9,7 @@
        quote-char=""
        quote-escape=""/>
   <xml-nodes>
-    <csv:row xmlns:csv="http://www.zorba-xquery.com/modules/converters/csv"/>
+    <csv:row xmlns:csv="http://zorba.io/modules/csv"/>
   </xml-nodes>
 </csv-options:options>}
 return 

=== modified file 'test/Queries/converters/csv/csv_parse6.xq'
--- test/Queries/converters/csv/csv_parse6.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse6.xq	2013-08-28 14:20:59 +0000
@@ -3,8 +3,8 @@
 Data continues after subheaders.
 The csv file is taken from http://data.gov.
 :)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("Hospital Outpatient Payments for 61 Commonly Performed Procedures, CY 2008 Data.csv")),
@@ -86,4 +86,4 @@
     </CPT_19103>
   </Breast_biopsy_through_skin_with_sampling_device>
 </row>
-:)
\ No newline at end of file
+:)

=== modified file 'test/Queries/converters/csv/csv_parse7.xq'
--- test/Queries/converters/csv/csv_parse7.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse7.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(
@@ -16,4 +16,4 @@
     </test7:row>
   </xml-nodes>
 </csv-options:options>}
-)
\ No newline at end of file
+)

=== modified file 'test/Queries/converters/csv/csv_parse9.xq'
--- test/Queries/converters/csv/csv_parse9.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse9.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(
@@ -15,4 +15,4 @@
     </test7:row>
   </xml-nodes>
 </csv-options:options>}
-)
\ No newline at end of file
+)

=== modified file 'test/Queries/converters/csv/csv_parse_serialize3.xq'
--- test/Queries/converters/csv/csv_parse_serialize3.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_parse_serialize3.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 

=== modified file 'test/Queries/converters/csv/csv_parse_serialize6.xq'
--- test/Queries/converters/csv/csv_parse_serialize6.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse_serialize6.xq	2013-08-28 14:20:59 +0000
@@ -4,8 +4,8 @@
 Note the character escaping for the QNames. Also the empty line from subheader is ignored.
 The csv has been taken from http://data.gov.
 :)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 let $options := 

=== modified file 'test/Queries/converters/csv/csv_parse_utf8_11.xq'
--- test/Queries/converters/csv/csv_parse_utf8_11.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_parse_utf8_11.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
 (: csv-to-xml example with utf8 characters :)
 
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse("ü,ö,ä, ă,î,ș,ț,â", ())

=== modified file 'test/Queries/converters/csv/csv_serialize1.xq'
--- test/Queries/converters/csv/csv_serialize1.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_serialize1.xq	2013-08-28 14:20:59 +0000
@@ -1,6 +1,6 @@
 (: Simple example of serializing xml to csv :)
 
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:serialize(
 <row>

=== modified file 'test/Queries/converters/csv/csv_serialize2.xq'
--- test/Queries/converters/csv/csv_serialize2.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/csv_serialize2.xq	2013-08-28 14:20:59 +0000
@@ -1,6 +1,6 @@
 (: Serialize a sequence of two nodes into two lines of csv :)
 
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:serialize(
 (<row>

=== modified file 'test/Queries/converters/csv/csv_serialize3.xq'
--- test/Queries/converters/csv/csv_serialize3.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_serialize3.xq	2013-08-28 14:20:59 +0000
@@ -1,6 +1,6 @@
 (: Serialize xml nodes to csv, with header and escaping some fields. :)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:serialize(
 (<row1>

=== modified file 'test/Queries/converters/csv/csv_serialize5.xq'
--- test/Queries/converters/csv/csv_serialize5.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_serialize5.xq	2013-08-28 14:20:59 +0000
@@ -2,8 +2,8 @@
 Note that the last node has element names that do not correpond to the header names taken from the first node,
 so it is not processed.
 :)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 
 let $options := 
@@ -65,4 +65,4 @@
   <f4>value14</f4>
 </row>
 
-:)
\ No newline at end of file
+:)

=== modified file 'test/Queries/converters/csv/csv_serialize6.xq'
--- test/Queries/converters/csv/csv_serialize6.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/csv_serialize6.xq	2013-08-28 14:20:59 +0000
@@ -1,6 +1,6 @@
 (:Serialize a sequence of constructed nodes in csv lines, without header:)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 declare namespace data="http://www.zorba-xquery/data";;
 declare variable $input-xml external;
 

=== modified file 'test/Queries/converters/csv/txt_parse5.xq'
--- test/Queries/converters/csv/txt_parse5.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/txt_parse5.xq	2013-08-28 14:20:59 +0000
@@ -2,8 +2,8 @@
 The text file is taken from http://data.gov.
 :)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("PUAOSL95.TXT")),
@@ -55,4 +55,4 @@
   <column>AO</column>
   <column>Pickens</column>
 </row>
-:)
\ No newline at end of file
+:)

=== modified file 'test/Queries/converters/csv/txt_parse6.xq'
--- test/Queries/converters/csv/txt_parse6.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/txt_parse6.xq	2013-08-28 14:20:59 +0000
@@ -2,8 +2,8 @@
 The text file is taken from http://data.gov.
 :)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("PUAOSL95.TXT")),
@@ -54,4 +54,4 @@
   <column>AO</column>
   <column>Pickens</column>
 </row>
-:)
\ No newline at end of file
+:)

=== modified file 'test/Queries/converters/csv/txt_parse8.xq'
--- test/Queries/converters/csv/txt_parse8.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/txt_parse8.xq	2013-08-28 14:20:59 +0000
@@ -2,8 +2,8 @@
 The text file is taken from http://data.gov.
 :)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 csv:parse(file:read-text(fn:resolve-uri("pusum02a.txt")),

=== modified file 'test/Queries/converters/csv/txt_parse_serialize5.xq'
--- test/Queries/converters/csv/txt_parse_serialize5.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/txt_parse_serialize5.xq	2013-08-28 14:20:59 +0000
@@ -1,5 +1,5 @@
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 let $options :=

=== modified file 'test/Queries/converters/csv/txt_parse_serialize6.xq'
--- test/Queries/converters/csv/txt_parse_serialize6.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/txt_parse_serialize6.xq	2013-08-28 14:20:59 +0000
@@ -3,8 +3,8 @@
 The align attributes are ignored in the parse function.
 The data file is taken from http://data.gov.
 :)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 import module namespace file="http://expath.org/ns/file";;
 
 let $options :=
@@ -70,4 +70,4 @@
 501-000                           Jefferson County Library System                    2100 Park Place       Birmingham3523700232052263615HQMJAO        Jefferson
 511-000                        Pickens County Cooperative Library      Post Office Bldg Highway 17 S       Carrollton3544704892053678407HQCOAO          Pickens
 
-:)
\ No newline at end of file
+:)

=== modified file 'test/Queries/converters/csv/txt_serialize4.xq'
--- test/Queries/converters/csv/txt_serialize4.xq	2011-08-18 20:54:58 +0000
+++ test/Queries/converters/csv/txt_serialize4.xq	2013-08-28 14:20:59 +0000
@@ -5,8 +5,8 @@
 Also note the truncation of fields.
  :)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:serialize(
 (<row1>

=== modified file 'test/Queries/converters/csv/txt_serialize5.spec'
--- test/Queries/converters/csv/txt_serialize5.spec	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/txt_serialize5.spec	2013-08-28 14:20:59 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/modules/converters/csv:ForeignInput
+Error: http://zorba.io/modules/csv:ForeignInput

=== modified file 'test/Queries/converters/csv/txt_serialize5.xq'
--- test/Queries/converters/csv/txt_serialize5.xq	2011-08-17 23:28:43 +0000
+++ test/Queries/converters/csv/txt_serialize5.xq	2013-08-28 14:20:59 +0000
@@ -5,8 +5,8 @@
 Also note the truncation of fields.
  :)
 
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:serialize(
 (<row1>

=== modified file 'test/Queries/converters/csv/txt_serialize6.xq'
--- test/Queries/converters/csv/txt_serialize6.xq	2011-08-03 14:28:53 +0000
+++ test/Queries/converters/csv/txt_serialize6.xq	2013-08-28 14:20:59 +0000
@@ -2,8 +2,8 @@
 Serialize xml nodes to fixed size text, 
 and then parse it using different parameters, but same column sizes.
 :)
-import schema namespace csv-options="http://www.zorba-xquery.com/modules/converters/csv-options";;
-import module namespace csv = "http://www.zorba-xquery.com/modules/converters/csv";;
+import schema namespace csv-options="http://zorba.io/modules/csv-options";;
+import module namespace csv = "http://zorba.io/modules/csv";;
 
 csv:parse(
    csv:serialize(
@@ -58,4 +58,4 @@
   <f4>value14</f4>
 </row>
  
-:)
\ No newline at end of file
+:)