William Candillon has proposed merging lp:~zorba-coders/zorba/compile_queryplan 
into lp:zorba.

Requested reviews:
  William Candillon (wcandillon)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733

Remove conflicting shortcut -e for --execute-plan option.
-- 
https://code.launchpad.net/~zorba-coders/zorba/compile_queryplan/+merge/94733
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmdproperties.txt'
--- bin/zorbacmdproperties.txt	2012-02-20 10:10:44 +0000
+++ bin/zorbacmdproperties.txt	2012-02-27 09:10:24 +0000
@@ -36,4 +36,4 @@
 ("stop-words", po::value<std::vector<std::string> >(), "Mapping specifying a stop-words URI to another.")
 ("thesaurus", po::value<std::vector<std::string> >(), "Mapping specifying a thesaurus URI to another.")
 ("compile-plan,c", "Output the query plan as binary.")
-("execute-plan,e", "Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.")
+("execute-plan", "Take a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.")

=== modified file 'bin/zorbacmdproperties_base.h'
--- bin/zorbacmdproperties_base.h	2012-02-20 10:10:44 +0000
+++ bin/zorbacmdproperties_base.h	2012-02-27 09:10:24 +0000
@@ -308,7 +308,7 @@
       else if (strcmp (*argv, "--compile-plan") == 0 || strncmp (*argv, "-c", 2) == 0) {
         theCompilePlan = true;
       }
-      else if (strcmp (*argv, "--execute-plan") == 0 || strncmp (*argv, "-e", 2) == 0) {
+      else if (strcmp (*argv, "--execute-plan") == 0) {
         theExecutePlan = true;
       }
       else if (strcmp (*argv, "--") == 0) {
@@ -365,7 +365,7 @@
 "--stop-words\nMapping specifying a stop-words URI to another.\n\n"
 "--thesaurus\nMapping specifying a thesaurus URI to another.\n\n"
 "--compile-plan, -c\nOutput the query plan as binary.\n\n"
-"--execute-plan, -e\nTake a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.\n\n"
+"--execute-plan\nTake a query plan as binary and execute it. Binary query plans can be generated using the --compile-plan option.\n\n"
 ;
   }
 

-- 
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

Reply via email to