[sword-svn] r2900 - trunk/utilities/diatheke
chrislit at crosswire.org
chrislit at crosswire.org
Tue Jul 16 00:48:52 MST 2013
Author: chrislit
Date: 2013-07-16 00:48:52 -0700 (Tue, 16 Jul 2013)
New Revision: 2900
Modified:
trunk/utilities/diatheke/README
trunk/utilities/diatheke/corediatheke.cpp
trunk/utilities/diatheke/corediatheke.h
trunk/utilities/diatheke/diatheke.cpp
Log:
bumped version because of various CLI changes
Modified: trunk/utilities/diatheke/README
===================================================================
--- trunk/utilities/diatheke/README 2013-07-16 07:16:16 UTC (rev 2899)
+++ trunk/utilities/diatheke/README 2013-07-16 07:48:52 UTC (rev 2900)
@@ -1,4 +1,4 @@
-Diatheke Suite release 4.0
+Diatheke Suite
by Chris Little <chrislit at crosswire.org>
This suite is intended for use with libraries and modules from
@@ -7,10 +7,10 @@
The latest versions of this suite and its components are available
at http://www.crosswire.org/sword/diatheke
-Version 4.0 of this suite consists of the following components:
+This suite consists of the following components:
-Diatheke 4.0 - a command line utility, good for lots of stuff
-Diatheke/CGI 4.0 - a PERL CGI module interface to Diatheke 4.0
+Diatheke - a command line utility, good for lots of stuff
+Diatheke/CGI - a PERL CGI module interface to Diatheke 4.0
--------------------------------------------------------------------
INSTALLING Diatheke/CGI
@@ -47,29 +47,36 @@
----------------------------------------------------------------------
VERSION HISTORY
-4.0 July 8, 2001.
+4.6 July 16, 2013
+ Updated for Sword 1.7.0.
+
+4.5
+
+4.0 July 8, 2001
Updated to Sword 1.5.2 with innumerable bug fixes.
Now builds properly for Win32 using VC++.
Diatheke/Tcl and HANDiatheke were omitted, for the moment
from this release, but are still available in the CVS.
-3.0 March 31, 2001.
+3.0 March 31, 2001
Self-generating HTML page for the lazy (Diatheke/CGI).
Localization support. (Diatheke and Diatheke/CGI).
-2.5 Now supports ThML. Numerous bugfixes. December 10, 2000.
+2.5 December 10, 2000
+ Now supports ThML. Numerous bugfixes.
Includes Diatheke 3.0, Diatheke/CGI 3.0, Diatheke/Tcl 3.0,
and HANDiatheke 3.0 (initial version, but version-synced)
-2.0 First public release, including Diatheke 2.0, Diatheke/CGI
- 2.0, and Diatheke/Tcl 2.5. October 23, 1999.
+2.0 October 23, 1999.
+ First public release, including Diatheke 2.0, Diatheke/CGI
+ 2.0, and Diatheke/Tcl 2.5.
-----------------------------------------------------------------------
COPYRIGHT
The Diatheke Suite and its components, Diatheke, Diatheke/CGI, and
-Diatheke/Tcl are Copyright 1999, 2000, 2001 by CrossWire Bible Society.
-HANDiatheke is Copyright 2000, 2001 by CrossWire Bible Society.
+Diatheke/Tcl are Copyright 1999-2013 by CrossWire Bible Society.
+HANDiatheke is Copyright 2000-2001 by CrossWire Bible Society.
The Diatheke Suite and all of its components are licensed through
the GNU General Public License and are intended for free distribution.
See http://www.gnu.org/copyleft/gpl.html for details.
Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp 2013-07-16 07:16:16 UTC (rev 2899)
+++ trunk/utilities/diatheke/corediatheke.cpp 2013-07-16 07:48:52 UTC (rev 2900)
@@ -21,7 +21,7 @@
*/
/******************************************************************************
- * Diatheke 4.5 by Chris Little <chrislit at crosswire.org>
+ * Diatheke by Chris Little <chrislit at crosswire.org>
* http://www.crosswire.org/sword/diatheke
*/
@@ -111,7 +111,7 @@
}
}
-void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed short variants = 0) {
+void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed char variants = 0) {
static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat,
((OP_BIDI & optionfilters) == OP_BIDI),
((OP_ARSHAPE & optionfilters) == OP_ARSHAPE));
@@ -222,12 +222,12 @@
if (optionfilters & OP_VARIANTS && variants) {
if (variants == -1)
- manager.setGlobalOption("Variants", "All Readings");
+ manager.setGlobalOption("Textual Variants", "All Readings");
else if (variants == 1)
- manager.setGlobalOption("Variants", "Secondary Readings");
+ manager.setGlobalOption("Textual Variants", "Secondary Readings");
}
else
- manager.setGlobalOption("Variants", "Primary Readings");
+ manager.setGlobalOption("Textual Variants", "Primary Readings");
Modified: trunk/utilities/diatheke/corediatheke.h
===================================================================
--- trunk/utilities/diatheke/corediatheke.h 2013-07-16 07:16:16 UTC (rev 2899)
+++ trunk/utilities/diatheke/corediatheke.h 2013-07-16 07:48:52 UTC (rev 2900)
@@ -66,4 +66,4 @@
using namespace std;
int hasalpha (char * string);
-void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed short variants);
+void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed char variants);
Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp 2013-07-16 07:16:16 UTC (rev 2899)
+++ trunk/utilities/diatheke/diatheke.cpp 2013-07-16 07:48:52 UTC (rev 2900)
@@ -21,7 +21,7 @@
*/
/******************************************************************************
- * Diatheke 4.5 by Chris Little <chrislit at crosswire.org>
+ * Diatheke 4.6 by Chris Little <chrislit at crosswire.org>
* http://www.crosswire.org/sword/diatheke
*/
@@ -37,7 +37,7 @@
void printsyntax() {
//if we got this far without exiting, something went wrong, so print syntax
- fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.5\n");
+ fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.6\n");
fprintf (stderr, "Copyright 1999-2013 by the CrossWire Bible Society\n");
fprintf (stderr, "http://www.crosswire.org/sword/diatheke/\n");
fprintf (stderr, "\n");
@@ -246,6 +246,7 @@
variants = atoi(argv[i+1]);
optionfilters |= OP_VARIANTS;
i++;
+ cout << variants << endl;
}
}
/*
More information about the sword-cvs
mailing list