Merge lp:~zorba-coders/zorba/zorba-2.9 into lp:zorba

[Chris Hillery]

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-07 08:39:33 +0000
+++ CMakeLists.txt	2013-07-11 07:09:31 +0000
@@ -479,7 +479,7 @@
 # zorba versioning
 SET(ZORBA_MAJOR_NUMBER "2")
 SET(ZORBA_MINOR_NUMBER "9")
-SET(ZORBA_PATCH_NUMBER "0")
+SET(ZORBA_PATCH_NUMBER "1")
 SET(ZORBA_VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
 MESSAGE(STATUS "Zorba version number: ${ZORBA_VERSION}")
 

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2013-05-07 08:39:33 +0000
+++ NOTICE.txt	2013-07-11 07:09:31 +0000
@@ -1,5 +1,5 @@
 -----------
-Zorba 2.9.0
+Zorba 2.9.1
 -----------
 
 (Note: This file is generated automatically from NOTICE.xml.

=== modified file 'cmake_modules/ZorbaModule.cmake'
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2013-06-28 04:19:14 +0000
+++ modules/ExternalModules.conf	2013-07-11 07:09:31 +0000
@@ -26,6 +26,7 @@
 #   "tag" is the VCS tag to check out (optional - defaults to HEAD;
 #       currently only works for bzr, since svn tags are just different URLS)
 
+<<<<<<< TREE
 archive         bzr  lp:zorba/archive-module
 csv             bzr  lp:zorba/csv-module
 data-cleaning   bzr  lp:zorba/data-cleaning-module
@@ -53,3 +54,32 @@
 queue           bzr  lp:zorba/queue-module
 couchbase       bzr  lp:zorba/couchbase-module
 sqlite          bzr  lp:zorba/sqlite-module
+=======
+archive         bzr  lp:zorba/archive-module          zorba-2.9
+csv             bzr  lp:zorba/csv-module              zorba-2.9
+data-cleaning   bzr  lp:zorba/data-cleaning-module    zorba-2.9
+data-formatting bzr  lp:zorba/data-formatting-module  zorba-2.9.1
+excel           bzr  lp:zorba/excel-module            zorba-2.9
+info-extraction bzr  lp:zorba/info-extraction-module  zorba-2.9
+geo             bzr  lp:zorba/geo-module              zorba-2.9
+geoproj         bzr  lp:zorba/geoproj-module          zorba-2.9
+graphviz        bzr  lp:zorba/graphviz-module         zorba-2.9
+html            bzr  lp:zorba/html-module             zorba-2.9
+http-client     bzr  lp:zorba/http-client-module      zorba-2.9
+image           bzr  lp:zorba/image-module            zorba-2.9
+jdbc            bzr  lp:zorba/jdbc-module             zorba-2.9
+languages       bzr  lp:zorba/languages-module        zorba-2.9
+oracle-nosql-db bzr  lp:zorba/oracle-nosql-db-module  zorba-2.9
+oauth           bzr  lp:zorba/oauth-module            zorba-2.9
+process         bzr  lp:zorba/process-module          zorba-2.9
+read-pdf        bzr  lp:zorba/read-pdf-module         zorba-2.9.1
+security        bzr  lp:zorba/security-module         zorba-2.9
+system          bzr  lp:zorba/system-module           zorba-2.9
+email           bzr  lp:zorba/email-module            zorba-2.9
+util-jvm        bzr  lp:zorba/util-jvm-module         zorba-2.9.1
+schema-tools    bzr  lp:zorba/schema-tools-module     zorba-2.9.1
+stack           bzr  lp:zorba/stack-module            zorba-2.9
+queue           bzr  lp:zorba/queue-module            zorba-2.9
+couchbase       bzr  lp:zorba/couchbase-module        zorba-2.9
+sqlite          bzr  lp:zorba/sqlite-module           zorba-2.9
+>>>>>>> MERGE-SOURCE

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-06-27 00:05:25 +0000
+++ src/compiler/translator/translator.cpp	2013-07-11 07:09:31 +0000
@@ -12784,6 +12784,7 @@
 
         break;
       }
+<<<<<<< TREE
       case FunctionConsts::FN_FOR_EACH_2:
       case FunctionConsts::FN_FILTER_2:
       {
@@ -12797,6 +12798,21 @@
         body = flworBody;
         break;
       }
+=======
+      case FunctionConsts::FN_MAP_2:
+      case FunctionConsts::FN_FILTER_2:
+      {
+        flwor_expr* flworBody = CREATE(flwor)(theRootSctx, theUDF, loc, false);
+
+        let_clause* lc = wrap_in_letclause(foArgs[0]);
+        flworBody->add_clause(lc);
+        foArgs[0] = CREATE(wrapper)(theRootSctx, theUDF, loc, lc->get_var());
+
+        flworBody->set_return_expr(generate_fn_body(f, foArgs, loc));
+        body = flworBody;
+        break;
+      }
+>>>>>>> MERGE-SOURCE
       case FunctionConsts::FN_FUNCTION_LOOKUP_2:
       {
         bool varAdded = false;

=== modified file 'src/runtime/api/plan_iterator_wrapper.cpp'
=== modified file 'src/runtime/api/plan_iterator_wrapper.h'
=== modified file 'src/util/stl_util.h'