diff options
Diffstat (limited to 'tests/parsekey.cpp')
| -rw-r--r-- | tests/parsekey.cpp | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/tests/parsekey.cpp b/tests/parsekey.cpp index 3e53b82..03802fc 100644 --- a/tests/parsekey.cpp +++ b/tests/parsekey.cpp @@ -1,5 +1,10 @@ -/* - * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +/****************************************************************************** + * + * parsekey.cpp - + * + * $Id: parsekey.cpp 2833 2013-06-29 06:40:28Z chrislit $ + * + * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society * P. O. Box 2528 * Tempe, AZ 85280-2528 @@ -26,8 +31,8 @@ using namespace sword; #endif int main(int argc, char **argv) { - if ((argc < 2) || (argc > 7)) { - std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse]\n"; + if ((argc < 2) || (argc > 8)) { + std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse 1|0] [intros 1|0]\n"; exit(-1); } @@ -42,14 +47,20 @@ int main(int argc, char **argv) { const char *context = (argc > 4) ? argv[4] : "gen.1.1"; + bool echo = (argc > 5) ? !strcmp(argv[5], "1") : false; + bool inSetTest = (argc > 6) ? !strcmp(argv[6], "1") : false; + bool intros = (argc > 7) ? !strcmp(argv[7], "1") : false; + + DefaultVSKey.setIntros(intros); + SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG); DefaultVSKey.validateCurrentLocale(); DefaultVSKey = context; - - ListKey verses = DefaultVSKey.ParseVerseList(argv[1], DefaultVSKey, true); - if ((argc > 5) && (argv[5][0] == '1')) { + ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true); + + if (echo) { for (int i = 1; i < argc; i++) { if (i > 1) std::cout << " "; std::cout << argv[i]; @@ -63,9 +74,9 @@ int main(int argc, char **argv) { } */ - if (argc > 6) { - verses.setText(argv[4]); - std::cout << "Verse is" << ((verses.Error()) ? " NOT" : "") << " in set.\n\n"; + if (inSetTest) { + verses.setText(context); + std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n"; } return 0; |