Merge lp:~zorba-coders/zorba/update3.0_string-module into lp:zorba

[Juan Zacarias]

Updated String module to Zorba 3.0 format.

Updated String module to Zorba 3.0 format.

[lp:~zorba-coders/zorba/update3.0_string-module]

11528. By Juan Zacarias on 2013-06-25

Merged with trunk

[Matthias Brantner (matthias-brantner)]

need merge with the trunk to get the static_context.cpp changes that Paul just submitted.

review: Needs Fixing

[Matthias Brantner (matthias-brantner)]

- Shouldn't the module be in version 1.0?
- I forgot what the final decision was but I thought that modules should be pure JSONiq if possible. This would be a perfect candidate in which case all the types should be changed (i.e. xs prefix removed).
- Can we make the link to the module in options.dox refer to zorba.io?
- I know that it's unrelated to the change but the example using file:read-text in the materialize function doesn't make sense anymore. Because read-text returns a seekable string it can be consumed more than once. The http-client would be the right example. Also, a is-seekable function would be great to have.

[Chris Hillery (ceejatec)]

Per conf call today: yes, convert this to "pure JSONiq". That means, at least, having the "jsoniq" version declaration in the module, and eliminating the xs: prefix from all signatures. Not sure if anything else needs to be (or can be) done.

For the time being the file extension should remain .xq.

[Juan Zacarias (juan457)]

All the changes were addressed except for

-I know that it's unrelated to the change but the example using file:read-text in the materialize function doesn't make sense anymore. Because read-text returns a seekable string it can be consumed more than once. The http-client would be the right example. Also, a is-seekable function would be great to have.

Should I do this change?

[Chris Hillery (ceejatec)]

Discussed with Juan - the is-seekable() function should be easy enough to add, so sure, let's do it.

[lp:~zorba-coders/zorba/update3.0_string-module]

11529. By Juan Zacarias on 2013-07-02

merge with trunk

11530. By Juan Zacarias on 2013-07-02

Finishing touches for the "jsonification" of the string module.

11531. By Juan Zacarias on 2013-07-11

Added the function is-seekable to the string module.

11532. By Juan Zacarias on 2013-07-11

Added a test for the string is-seekable function.

[Juan Zacarias (juan457)]

Added the implementation of the is-seekable function in the string module.

Also removed the materialize from the test since it was doing nothing, since it returns a seekable stream by the file function read-text.

[Chris Hillery (ceejatec)]

review: Approve

[Chris Hillery (ceejatec)]

FYI, I moved the string module into the new modules/atomic directory. Also fixed the version number in DECLARE_ZORBA_MODULE().

[lp:~zorba-coders/zorba/update3.0_string-module]

11533. By Chris Hillery on 2013-07-17

Merge from trunk.

11534. By Chris Hillery on 2013-07-17

Move string module into modules/atomic.

11535. By Chris Hillery on 2013-07-17

Fixed is-seekable test.

11536. By Matthias Brantner on 2013-07-26

improved documentation

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_string-module/+merge/171376

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/update3.0_string-module/+merge/171376

Stage "TestZorbaUbuntu" failed.
13 tests failed (8416 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/127/testReport/ to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/update3.0_string-module/+merge/171376

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'doc/zorba/options.dox'
--- doc/zorba/options.dox	2013-06-25 03:55:20 +0000
+++ doc/zorba/options.dox	2013-07-26 18:57:32 +0000
@@ -375,11 +375,11 @@
 
 However, the disadvantage is that a streamable string can only be consumed exactly once.
 If a streamable string is consumed more than once, an error is raised.
-In order to enable multiple consumers of a streamable string, the materialize function of the string module (<a href="http://www.zorba-xquery.com/html/modules/zorba/xdm/atomic/string">http://www.zorba-xquery.com/modules/string</a>) should be used to materialize the entire contents in an (regular) xs:string item.
+In order to enable multiple consumers of a streamable string, the materialize function of the string module (<a href="http://zorba.io/html/modules/zorba/xdm/atomic/string">http://zorba.io/modules/string</a>) should be used to materialize the entire contents in an (regular) xs:string item.
 
 \code
 import module namespace file = "http://expath.org/ns/file";
-import module namespace string = "http://www.zorba-xquery.com/modules/string";
+import module namespace string = "http://zorba.io/modules/string";
 
 let $x := string:materialize(file:read-text("myfile.txt")))
 return ($x, $x)

=== modified file 'modules/atomic/CMakeLists.txt'
--- modules/atomic/CMakeLists.txt	2013-07-17 15:53:51 +0000
+++ modules/atomic/CMakeLists.txt	2013-07-26 18:57:32 +0000
@@ -18,3 +18,5 @@
   URI "http://zorba.io/modules/random")
 DECLARE_ZORBA_MODULE(FILE base64.xq VERSION 1.0
   URI "http://zorba.io/modules/base64")
+DECLARE_ZORBA_MODULE(FILE string.xq VERSION 1.0
+  URI "http://zorba.io/modules/string")

=== renamed file 'modules/com/zorba-xquery/www/modules/string.xq' => 'modules/atomic/string.xq'
--- modules/com/zorba-xquery/www/modules/string.xq	2013-06-15 16:20:18 +0000
+++ modules/atomic/string.xq	2013-07-26 18:57:32 +0000
@@ -1,4 +1,4 @@
-xquery version "1.0";
+jsoniq version "1.0";
 
 (:
  : Copyright 2006-2009 The FLWOR Foundation.
@@ -17,26 +17,31 @@
 :)
 
 (:~
- : This module provides string related functions.
+ : <p>This module provides string related functions.</p>
+ :
+ : <p>Mostly, the functions in this module provide primitives
+ : to work with streamable strings. For example, it allows to
+ : check whether a given string is streamable or seekable.</p>
  :
  : @author Matthias Brantner
  : @project Zorba/XQuery Data Model/Atomic/String
  :
  :)
-module namespace string = "http://www.zorba-xquery.com/modules/string";
+module namespace string = "http://zorba.io/modules/string";
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
-declare option ver:module-version "2.1";
+declare option ver:module-version "1.0";
 
 (:~
- : This function materializes a streamable string.
- : The drawback of a streamable string is that its value can only
- : be consumed once. That is, only one function can access the value
- : of a streamable string item.
- :
- : In order to remedy this situation, this function can be used to 
+ : <p>This function materializes a streamable string.</p>
+ :
+ : <p>The drawback of a streamable (non-seekable) string is that
+ : its value can only be consumed once. That is, only one function
+ : can access the value of astreamable string item.</p>
+ :
+ : <p>In order to remedy this situation, this function can be used to 
  : convert a streamable string into its non-streamable counterpart. As a
  : result, the string returned by this function has the same value as its
- : input but is materialized and, hence, can be consumed multiple times.
+ : input but is materialized and, hence, can be consumed multiple times.</p>
  :
  : @param $s the streamable string item to materialize
  : @return a materialized string of its input or the input if the input
@@ -46,34 +51,48 @@
  : @see <a href="expath.org_ns_file.html#read-text-1">file:read-text#1</a>
  : @see <a href="expath.org_ns_file.html#read-text-2">file:read-text#2</a>
  :)
-declare function string:materialize($s as xs:string) as xs:string external;
+declare function string:materialize($s as string) as string external;
 
 (:~
- : This function checks whether a given string item is implemented by a
- : streamable string.
- : A streamable string is produced by some functions of a module
- : (e.g. file:read-text()). It's an optimized implementation of an
- : xs:string to handle arbitrary sized data. The drawback is that
- : its value can only be consumed once. That is, only one function
- : can access the value of a streamable string item.
+ : <p>This function checks whether a given string item is implemented by a
+ : streamable string.</p>
+ :
+ : <p>A streamable string is produced by some functions of a module.
+ : It's an optimized implementation of an string to handle arbitrary
+ : sized data. The drawback is that its value can only be consumed once.
+ : That is, only one function can access the value of a streamable string
+ : item.</p>
  :
  : @param $s the string to check
+ :
  : @return true if the given item is implemented using a streamable string
  :         or false otherwise.
- :
- :)
-declare function string:is-streamable($s as xs:string) as xs:boolean external;
-
-(:~
- : Returns a sequence of strings constructed by splitting the input wherever the given
- : separator is found.
- :
- : The function is different from fn:tokenize. It doesn't allow
+ :)
+declare function string:is-streamable($s as string) as boolean external;
+
+(:~
+ : <p>This function checks whether a given string item is a
+ : seekable stream string.</p>
+ :
+ : <p>For example, a seekable streamable string is returned by the
+ : file module.</p>
+ :
+ : @param $s the string to check
+ :
+ : @return true if the given item is a seekable stream string
+ :         or false otherwise.
+ :)
+declare function string:is-seekable($s as string) as boolean external;
+
+(:~
+ : <p>Returns a sequence of strings constructed by splitting the input wherever
+ : the given separator is found.</p>
+ :
+ : <p>The function is different from tokenize. It doesn't allow
  : the separator to be a regular expression. This restriction allows for more
  : performant implementation. Specifically, the function processes
  : streamable strings as input in a streamable way which is particularly useful
- : to tokenize huge strings (e.g. if returned by the file module's read-text
- : function).
+ : to tokenize huge strings.</p>
  :
  : @param $s the input string to split
  : @param $separator the separator used for splitting the input string $s
@@ -81,5 +100,5 @@
  : @return a sequence of strings constructed by splitting the input
  :)
 declare function string:split(
-  $s as xs:string,
-  $separator as xs:string) as xs:string* external;
+  $s as string,
+  $separator as string) as string* external;

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-19 17:38:21 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2013-07-26 18:57:32 +0000
@@ -29,8 +29,6 @@
   URI "http://www.zorba-xquery.com/modules/reflection")
 DECLARE_ZORBA_MODULE(FILE schema.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/schema")
-DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1
-  URI "http://www.zorba-xquery.com/modules/string")
 DECLARE_ZORBA_SCHEMA(FILE xml-options.xsd 
   URI "http://www.zorba-xquery.com/modules/xml-options")
 DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-07-25 09:30:55 +0000
+++ src/context/static_context.cpp	2013-07-26 18:57:32 +0000
@@ -453,7 +453,7 @@
 
 const char*
 static_context::ZORBA_STRING_FN_NS =
-"http://www.zorba-xquery.com/modules/string";
+"http://zorba.io/modules/string";
 
 const char*
 static_context::ZORBA_URI_FN_NS =

=== modified file 'src/functions/pregenerated/func_strings.cpp'
--- src/functions/pregenerated/func_strings.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_strings.cpp	2013-07-26 18:57:32 +0000
@@ -320,6 +320,16 @@
   return new StringIsStreamableIterator(sctx, loc, argv);
 }
 
+PlanIter_t fn_zorba_string_is_seekable::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringIsSeekableIterator(sctx, loc, argv);
+}
+
 PlanIter_t fn_zorba_string_split::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -854,7 +864,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_string_materialize,
-        (createQName("http://www.zorba-xquery.com/modules/string","","materialize"), 
+        (createQName("http://zorba.io/modules/string","","materialize"), 
         GENV_TYPESYSTEM.STRING_TYPE_ONE, 
         GENV_TYPESYSTEM.STRING_TYPE_ONE),
         FunctionConsts::FN_ZORBA_STRING_MATERIALIZE_1);
@@ -866,7 +876,7 @@
 
       {
     DECL_WITH_KIND(sctx, fn_zorba_string_is_streamable,
-        (createQName("http://www.zorba-xquery.com/modules/string","","is-streamable"), 
+        (createQName("http://zorba.io/modules/string","","is-streamable"), 
         GENV_TYPESYSTEM.STRING_TYPE_ONE, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
         FunctionConsts::FN_ZORBA_STRING_IS_STREAMABLE_1);
@@ -877,8 +887,20 @@
 
 
       {
+    DECL_WITH_KIND(sctx, fn_zorba_string_is_seekable,
+        (createQName("http://zorba.io/modules/string","","is-seekable"), 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_ZORBA_STRING_IS_SEEKABLE_1);
+
+  }
+
+
+
+
+      {
     DECL_WITH_KIND(sctx, fn_zorba_string_split,
-        (createQName("http://www.zorba-xquery.com/modules/string","","split"), 
+        (createQName("http://zorba.io/modules/string","","split"), 
         GENV_TYPESYSTEM.STRING_TYPE_ONE, 
         GENV_TYPESYSTEM.STRING_TYPE_ONE, 
         GENV_TYPESYSTEM.STRING_TYPE_STAR),

=== modified file 'src/functions/pregenerated/func_strings.h'
--- src/functions/pregenerated/func_strings.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_strings.h	2013-07-26 18:57:32 +0000
@@ -481,6 +481,21 @@
 };
 
 
+//fn-zorba-string:is-seekable
+class fn_zorba_string_is_seekable : public function
+{
+public:
+  fn_zorba_string_is_seekable(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
 //fn-zorba-string:split
 class fn_zorba_string_split : public function
 {

=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h	2013-07-11 00:46:02 +0000
+++ src/functions/pregenerated/function_enum.h	2013-07-26 18:57:32 +0000
@@ -503,6 +503,7 @@
   FN_ANALYZE_STRING_3,
   FN_ZORBA_STRING_MATERIALIZE_1,
   FN_ZORBA_STRING_IS_STREAMABLE_1,
+  FN_ZORBA_STRING_IS_SEEKABLE_1,
   FN_ZORBA_STRING_SPLIT_2,
   FN_ZORBA_URI_DECODE_3,
   FN_ZORBA_URI_PARSE_1,

=== modified file 'src/runtime/pregenerated/iterator_enum.h'
--- src/runtime/pregenerated/iterator_enum.h	2013-07-11 00:46:02 +0000
+++ src/runtime/pregenerated/iterator_enum.h	2013-07-26 18:57:32 +0000
@@ -369,6 +369,7 @@
   TYPE_FnAnalyzeStringIterator,
   TYPE_StringMaterializeIterator,
   TYPE_StringIsStreamableIterator,
+  TYPE_StringIsSeekableIterator,
   TYPE_StringSplitIterator,
   TYPE_DecodeURIIterator,
   TYPE_ParseURIIterator,

=== modified file 'src/runtime/spec/mappings.xml'
--- src/runtime/spec/mappings.xml	2013-07-17 15:48:38 +0000
+++ src/runtime/spec/mappings.xml	2013-07-26 18:57:32 +0000
@@ -110,7 +110,7 @@
                       define="ZORBA_UTIL_FN_NS"
                       prefix="fn-zorba-util"/>
 
-		<zorba:namespace uri="http://www.zorba-xquery.com/modules/string"
+		<zorba:namespace uri="http://zorba.io/modules/string"
                      define="ZORBA_STRING_FN_NS" 
                      prefix="fn-zorba-string"/>
 

=== modified file 'src/runtime/spec/strings/strings.xml'
--- src/runtime/spec/strings/strings.xml	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/strings/strings.xml	2013-07-26 18:57:32 +0000
@@ -687,7 +687,7 @@
 
 <!--
 /*******************************************************************************
- * http://www.zorba-xquery.com/modules/string
+ * http://zorba.io/modules/string
 ********************************************************************************/
 -->
 <!--
@@ -732,6 +732,26 @@
 
 <!--
 /*******************************************************************************
+ * string:is-seekable
+********************************************************************************/
+-->
+<zorba:iterator name="StringIsSeekableIterator">
+
+  <zorba:description author="Zorba Team">
+    string:is-seekable
+  </zorba:description>
+
+  <zorba:function>
+    <zorba:signature localname="is-seekable" prefix="fn-zorba-string">
+      <zorba:param>xs:string</zorba:param>
+      <zorba:output>xs:boolean</zorba:output>
+    </zorba:signature>
+  </zorba:function>
+
+</zorba:iterator>
+
+<!--
+/*******************************************************************************
  * string:tokenize
 ********************************************************************************/
 -->

=== modified file 'src/runtime/strings/pregenerated/strings.cpp'
--- src/runtime/strings/pregenerated/strings.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/strings/pregenerated/strings.cpp	2013-07-26 18:57:32 +0000
@@ -830,6 +830,34 @@
 // </StringIsStreamableIterator>
 
 
+// <StringIsSeekableIterator>
+SERIALIZABLE_CLASS_VERSIONS(StringIsSeekableIterator)
+
+void StringIsSeekableIterator::serialize(::zorba::serialization::Archiver& ar)
+{
+  serialize_baseclass(ar,
+  (NaryBaseIterator<StringIsSeekableIterator, PlanIteratorState>*)this);
+}
+
+
+void StringIsSeekableIterator::accept(PlanIterVisitor& v) const
+{
+  v.beginVisit(*this);
+
+  std::vector<PlanIter_t>::const_iterator lIter = theChildren.begin();
+  std::vector<PlanIter_t>::const_iterator lEnd = theChildren.end();
+  for ( ; lIter != lEnd; ++lIter ){
+    (*lIter)->accept(v);
+  }
+
+  v.endVisit(*this);
+}
+
+StringIsSeekableIterator::~StringIsSeekableIterator() {}
+
+// </StringIsSeekableIterator>
+
+
 // <StringSplitIterator>
 SERIALIZABLE_CLASS_VERSIONS(StringSplitIterator)
 

=== modified file 'src/runtime/strings/pregenerated/strings.h'
--- src/runtime/strings/pregenerated/strings.h	2013-03-05 23:11:50 +0000
+++ src/runtime/strings/pregenerated/strings.h	2013-07-26 18:57:32 +0000
@@ -966,6 +966,38 @@
 
 /**
  * 
+ *    string:is-seekable
+ *  
+ * Author: Zorba Team
+ */
+class StringIsSeekableIterator : public NaryBaseIterator<StringIsSeekableIterator, PlanIteratorState>
+{ 
+public:
+  SERIALIZABLE_CLASS(StringIsSeekableIterator);
+
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(StringIsSeekableIterator,
+    NaryBaseIterator<StringIsSeekableIterator, PlanIteratorState>);
+
+  void serialize( ::zorba::serialization::Archiver& ar);
+
+  StringIsSeekableIterator(
+    static_context* sctx,
+    const QueryLoc& loc,
+    std::vector<PlanIter_t>& children)
+    : 
+    NaryBaseIterator<StringIsSeekableIterator, PlanIteratorState>(sctx, loc, children)
+  {}
+
+  virtual ~StringIsSeekableIterator();
+
+  void accept(PlanIterVisitor& v) const;
+
+  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
+};
+
+
+/**
+ * 
  *    string:split
  *  
  * Author: Matthias Brantner

=== modified file 'src/runtime/strings/strings_impl.cpp'
--- src/runtime/strings/strings_impl.cpp	2013-07-01 18:59:06 +0000
+++ src/runtime/strings/strings_impl.cpp	2013-07-26 18:57:32 +0000
@@ -2271,11 +2271,10 @@
   STACK_END(state);
 }
 
-
 /**
  *______________________________________________________________________
  *
- * http://www.zorba-xquery.com/modules/string
+ * http://zorba.io/modules/string
  * string:materialize
  */
 
@@ -2308,7 +2307,7 @@
 /**
  *______________________________________________________________________
  *
- * http://www.zorba-xquery.com/modules/string
+ * http://zorba.io/modules/string
  * string:materialize
  */
 bool StringIsStreamableIterator::nextImpl(
@@ -2333,7 +2332,32 @@
 /**
  *______________________________________________________________________
  *
- * http://www.zorba-xquery.com/modules/string
+ * http://zorba.io/modules/string
+ * string:is-seekable
+ */
+bool StringIsSeekableIterator::nextImpl(
+    store::Item_t& result,
+    PlanState& planState) const
+{
+  store::Item_t item;
+
+  PlanIteratorState* state;
+  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
+#ifndef NDEBUG
+  assert(consumeNext(item, theChildren[0].getp(), planState));
+#else
+  consumeNext(item, theChildren[0].getp(), planState);
+#endif
+  STACK_PUSH(GENV_ITEMFACTORY->createBoolean(result, item->isSeekable()), state);
+
+  STACK_END(state);
+}
+
+/**
+ *______________________________________________________________________
+ *
+ * http://zorba.io/modules/string
  * string:split
  */
 bool StringSplitIterator::nextImpl(

=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2013-07-11 00:46:02 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2013-07-26 18:57:32 +0000
@@ -745,6 +745,8 @@
 
     class StringIsStreamableIterator;
 
+    class StringIsSeekableIterator;
+
     class StringSplitIterator;
 
     class DecodeURIIterator;
@@ -1829,6 +1831,9 @@
     virtual void beginVisit ( const StringIsStreamableIterator& ) = 0;
     virtual void endVisit   ( const StringIsStreamableIterator& ) = 0;
 
+    virtual void beginVisit ( const StringIsSeekableIterator& ) = 0;
+    virtual void endVisit   ( const StringIsSeekableIterator& ) = 0;
+
     virtual void beginVisit ( const StringSplitIterator& ) = 0;
     virtual void endVisit   ( const StringSplitIterator& ) = 0;
 

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-07-11 00:46:02 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-07-26 18:57:32 +0000
@@ -4884,6 +4884,20 @@
 // </StringIsStreamableIterator>
 
 
+// <StringIsSeekableIterator>
+void PrinterVisitor::beginVisit ( const StringIsSeekableIterator& a) {
+  thePrinter.startBeginVisit("StringIsSeekableIterator", ++theId);
+  printCommons( &a, theId );
+  thePrinter.endBeginVisit( theId );
+}
+
+void PrinterVisitor::endVisit ( const StringIsSeekableIterator& ) {
+  thePrinter.startEndVisit();
+  thePrinter.endEndVisit();
+}
+// </StringIsSeekableIterator>
+
+
 // <StringSplitIterator>
 void PrinterVisitor::beginVisit ( const StringSplitIterator& a) {
   thePrinter.startBeginVisit("StringSplitIterator", ++theId);

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2013-07-11 00:46:02 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2013-07-26 18:57:32 +0000
@@ -1128,6 +1128,9 @@
     void beginVisit( const StringIsStreamableIterator& );
     void endVisit  ( const StringIsStreamableIterator& );
 
+    void beginVisit( const StringIsSeekableIterator& );
+    void endVisit  ( const StringIsSeekableIterator& );
+
     void beginVisit( const StringSplitIterator& );
     void endVisit  ( const StringSplitIterator& );
 

=== added file 'test/rbkt/ExpQueryResults/zorba/string/is-seekable.xml.res'
--- test/rbkt/ExpQueryResults/zorba/string/is-seekable.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/string/is-seekable.xml.res	2013-07-26 18:57:32 +0000
@@ -0,0 +1,1 @@
+true false

=== modified file 'test/rbkt/Queries/zorba/fetch/fetch_seekable.xq'
--- test/rbkt/Queries/zorba/fetch/fetch_seekable.xq	2012-05-09 21:48:57 +0000
+++ test/rbkt/Queries/zorba/fetch/fetch_seekable.xq	2013-07-26 18:57:32 +0000
@@ -1,6 +1,6 @@
 import module namespace fetch = "http://www.zorba-xquery.com/modules/fetch";
 
-import module namespace s = "http://www.zorba-xquery.com/modules/string";
+import module namespace s = "http://zorba.io/modules/string";
 
 (: make sure the returned string is streamable and can be consumed twice, i.e. is seekable :)
 let $x := fetch:content(fn:resolve-uri("iso-8859-1.txt"))

=== modified file 'test/rbkt/Queries/zorba/file/streamability1.xq'
--- test/rbkt/Queries/zorba/file/streamability1.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/file/streamability1.xq	2013-07-26 18:57:32 +0000
@@ -1,8 +1,7 @@
 import module namespace file = "http://expath.org/ns/file";
-import module namespace string = "http://www.zorba-xquery.com/modules/string";
+import module namespace string = "http://zorba.io/modules/string";
 
 declare variable $rbktPath as xs:string external;
 
-(: test materialization of a streamable string :)
-let $x := string:materialize(file:read-text(concat($rbktPath, "/Queries/zorba/file/sample_files/sample.txt")))
+let $x := file:read-text(concat($rbktPath, "/Queries/zorba/file/sample_files/sample.txt"))
 return ($x, $x)

=== modified file 'test/rbkt/Queries/zorba/file/streamability2.xq'
--- test/rbkt/Queries/zorba/file/streamability2.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/file/streamability2.xq	2013-07-26 18:57:32 +0000
@@ -1,5 +1,5 @@
 import module namespace file = "http://expath.org/ns/file";
-import module namespace string = "http://www.zorba-xquery.com/modules/string";
+import module namespace string = "http://zorba.io/modules/string";
 
 declare variable $rbktPath as xs:string external;
 

=== modified file 'test/rbkt/Queries/zorba/file/streamability3.xq'
--- test/rbkt/Queries/zorba/file/streamability3.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/file/streamability3.xq	2013-07-26 18:57:32 +0000
@@ -1,5 +1,5 @@
 import module namespace file = "http://expath.org/ns/file";
-import module namespace string = "http://www.zorba-xquery.com/modules/string";
+import module namespace string = "http://zorba.io/modules/string";
 
 declare variable $rbktPath as xs:string external;
 

=== modified file 'test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm'
--- test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-07-17 15:48:38 +0000
+++ test/rbkt/Queries/zorba/string/AnalyzeString/http-client-doc.htm	2013-07-26 18:57:32 +0000
@@ -144,7 +144,7 @@
                       </sup>
                     </li>
                     <li>
-                      <a href="www.zorba-xquery.com_modules_string.html" title="http://www.zorba-xquery.com/modules/string">string</a>
+                      <a href="www.zorba-xquery.com_modules_string.html" title="http://zorba.io/modules/string">string</a>
                       <sup>
                         <a href="http://www.w3.org/TR/xquery-30/#dt-external-function" target="_blank" title="There are external functions (either private or public) declared in this module.">(E)</a>
                       </sup>

=== added file 'test/rbkt/Queries/zorba/string/is-seekable.xq'
--- test/rbkt/Queries/zorba/string/is-seekable.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/string/is-seekable.xq	2013-07-26 18:57:32 +0000
@@ -0,0 +1,6 @@
+import module namespace file = "http://expath.org/ns/file";
+import module namespace string = "http://zorba.io/modules/string";
+
+let $x := file:read-text(fn:resolve-uri("../file/sample_files/sample.txt"))
+return (string:is-seekable($x), string:is-seekable("test"))
+

=== modified file 'test/rbkt/Queries/zorba/string/tokenize01.xq'
--- test/rbkt/Queries/zorba/string/tokenize01.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/string/tokenize01.xq	2013-07-26 18:57:32 +0000
@@ -1,5 +1,5 @@
 import module namespace f = "http://expath.org/ns/file";
-import module namespace s = "http://www.zorba-xquery.com/modules/string";
+import module namespace s = "http://zorba.io/modules/string";
 
 s:split(f:read-text(fn:resolve-uri("token01.txt")), "bc"),
 s:split(s:materialize(f:read-text(fn:resolve-uri("token01.txt"))), "bc")

=== modified file 'test/rbkt/Queries/zorba/string/tokenize02.xq'
--- test/rbkt/Queries/zorba/string/tokenize02.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/string/tokenize02.xq	2013-07-26 18:57:32 +0000
@@ -1,5 +1,5 @@
 import module namespace f = "http://expath.org/ns/file";
-import module namespace s = "http://www.zorba-xquery.com/modules/string";
+import module namespace s = "http://zorba.io/modules/string";
 
 s:split(f:read-text(fn:resolve-uri("token02.txt")), "bc"),
 s:split(s:materialize(f:read-text(fn:resolve-uri("token02.txt"))), "bc")

=== modified file 'test/rbkt/Queries/zorba/string/tokenize03.xq'
--- test/rbkt/Queries/zorba/string/tokenize03.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/string/tokenize03.xq	2013-07-26 18:57:32 +0000
@@ -1,5 +1,5 @@
 import module namespace f = "http://expath.org/ns/file";
-import module namespace s = "http://www.zorba-xquery.com/modules/string";
+import module namespace s = "http://zorba.io/modules/string";
 
 s:split(f:read-text(fn:resolve-uri("token03.txt")), "bc"),
 s:split(s:materialize(f:read-text(fn:resolve-uri("token03.txt"))), "bc")

=== modified file 'test/rbkt/Queries/zorba/string/tokenize04.xq'
--- test/rbkt/Queries/zorba/string/tokenize04.xq	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/string/tokenize04.xq	2013-07-26 18:57:32 +0000
@@ -1,5 +1,5 @@
 import module namespace f = "http://expath.org/ns/file";
-import module namespace s = "http://www.zorba-xquery.com/modules/string";
+import module namespace s = "http://zorba.io/modules/string";
 
 s:split(f:read-text(fn:resolve-uri("token04.txt")), "f"),
 s:split(s:materialize(f:read-text(fn:resolve-uri("token04.txt"))), "f")