diff options
Diffstat (limited to 'utilities/diatheke')
-rw-r--r-- | utilities/diatheke/.cvsignore | 5 | ||||
-rw-r--r-- | utilities/diatheke/Makefile.in | 48 | ||||
-rwxr-xr-x | utilities/diatheke/cgi/dia-def.pl | 17 | ||||
-rwxr-xr-x | utilities/diatheke/cgi/diatheke.pl | 31 | ||||
-rw-r--r-- | utilities/diatheke/corediatheke.cpp | 126 | ||||
-rw-r--r-- | utilities/diatheke/corediatheke.h | 24 | ||||
-rw-r--r-- | utilities/diatheke/diafiltmgr.h | 3 | ||||
-rw-r--r-- | utilities/diatheke/diatheke.cpp | 22 | ||||
-rw-r--r-- | utilities/diatheke/diatheke.dsp | 204 | ||||
-rw-r--r-- | utilities/diatheke/diatheke.dsw | 44 | ||||
-rw-r--r-- | utilities/diatheke/diatheke.vcproj | 709 | ||||
-rw-r--r-- | utilities/diatheke/diathekemgr.cpp | 42 | ||||
-rw-r--r-- | utilities/diatheke/diathekemgr.h | 25 | ||||
-rw-r--r-- | utilities/diatheke/gbfcgi.cpp | 35 | ||||
-rw-r--r-- | utilities/diatheke/gbfcgi.h | 39 | ||||
-rw-r--r-- | utilities/diatheke/osiscgi.cpp | 35 | ||||
-rw-r--r-- | utilities/diatheke/osiscgi.h | 37 | ||||
-rwxr-xr-x | utilities/diatheke/soap/sapouni.cgi | 16 | ||||
-rwxr-xr-x | utilities/diatheke/soap/soapatheke.pl | 17 | ||||
-rw-r--r-- | utilities/diatheke/tcl/biblebot-diatheke.tcl | 19 | ||||
-rw-r--r-- | utilities/diatheke/thmlcgi.cpp | 35 | ||||
-rw-r--r-- | utilities/diatheke/thmlcgi.h | 37 |
22 files changed, 1128 insertions, 442 deletions
diff --git a/utilities/diatheke/.cvsignore b/utilities/diatheke/.cvsignore deleted file mode 100644 index f5ce63f..0000000 --- a/utilities/diatheke/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -diatheke diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in index 36d4273..fa59942 100644 --- a/utilities/diatheke/Makefile.in +++ b/utilities/diatheke/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,7 +40,10 @@ DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ subdir = utilities/diatheke ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \ - $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -56,7 +59,7 @@ diatheke_OBJECTS = $(am_diatheke_OBJECTS) am__DEPENDENCIES_1 = diatheke_DEPENDENCIES = $(top_builddir)/lib/libsword.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -104,14 +107,14 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GENCCODE = @GENCCODE@ GENCMN = @GENCMN@ GENRB = @GENRB@ @@ -125,17 +128,23 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -158,7 +167,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -192,6 +201,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -210,6 +220,7 @@ target_mingw32 = @target_mingw32@ target_os = @target_os@ target_system = @target_system@ target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ with_conf = @with_conf@ @@ -239,8 +250,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/cg @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -273,8 +284,8 @@ install-binPROGRAMS: $(bin_PROGRAMS) || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -342,8 +353,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -355,8 +366,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -366,13 +377,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff --git a/utilities/diatheke/cgi/dia-def.pl b/utilities/diatheke/cgi/dia-def.pl index e2f1d4f..206aaa6 100755 --- a/utilities/diatheke/cgi/dia-def.pl +++ b/utilities/diatheke/cgi/dia-def.pl @@ -1,5 +1,22 @@ #!/usr/bin/perl +# * +# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +# * CrossWire Bible Society +# * P. O. Box 2528 +# * Tempe, AZ 85280-2528 +# * +# * This program is free software; you can redistribute it and/or modify it +# * under the terms of the GNU General Public License as published by the +# * Free Software Foundation version 2. +# * +# * This program is distributed in the hope that it will be useful, but +# * WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# * General Public License for more details. +# * + + #change this variable to hostname of your server @values = split(/\&/,$ENV{'QUERY_STRING'}); $DOMAIN = $ENV{'REMOTE_ADDR'}; diff --git a/utilities/diatheke/cgi/diatheke.pl b/utilities/diatheke/cgi/diatheke.pl index ee36f11..8150d2c 100755 --- a/utilities/diatheke/cgi/diatheke.pl +++ b/utilities/diatheke/cgi/diatheke.pl @@ -1,5 +1,33 @@ #!/usr/bin/perl +######################################################################### +### WARNING: This is for demonstration purposes only. Do not deploy +### this CGI on a live website. There are security issues. +### You will likely be hacked if you try to deploy this on a +### live site. +### +### For a web Bible interface, please consider using +### SwordWeb, which can be also be installed on your +### server: http://www.crosswire.org/swordweb/ +######################################################################## + +# * +# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +# * CrossWire Bible Society +# * P. O. Box 2528 +# * Tempe, AZ 85280-2528 +# * +# * This program is free software; you can redistribute it and/or modify it +# * under the terms of the GNU General Public License as published by the +# * Free Software Foundation version 2. +# * +# * This program is distributed in the hope that it will be useful, but +# * WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# * General Public License for more details. +# * + + # Typical Linux/Unix settings $err = "2> /dev/null"; $sword_path = "/home/sword"; # SWORD_PATH environment variable you want to use @@ -110,8 +138,7 @@ foreach $i (@values) { $range = $mydata; $range =~ tr/+/ /; $range =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; - $range = "-r \"$range\""; - $range = shell_escape($range); + $range = "-r '" . shell_escape($range) . "'"; } elsif ($varname eq "strongs") { diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp index d691a2f..f2dcac9 100644 --- a/utilities/diatheke/corediatheke.cpp +++ b/utilities/diatheke/corediatheke.cpp @@ -1,8 +1,23 @@ // Diatheke 4.2 by Chris Little <chrislit@crosswire.org> -// Copyright 1999-2002 by CrossWire Bible Society +// Copyright 1999-2009 by CrossWire Bible Society // http://www.crosswire.org/sword/diatheke -// Licensed under GNU General Public License (GPL) -// see accompanying LICENSE file for license details + +/* + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include "corediatheke.h" #include <regex.h> @@ -64,7 +79,7 @@ void systemquery(const char * key, ostream* output){ if (names && descriptions) *output << " : "; if (descriptions) *output << target->Description(); *output << endl; - } + } } if (types) *output << "Dictionaries:\n"; for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { @@ -76,27 +91,39 @@ void systemquery(const char * key, ostream* output){ *output << endl; } } + if (types) *output << "Generic books:\n"; + for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) { + target = it->second; + if (!strcmp(target->Type(), "Generic Books")) { + if (names) *output << target->Name(); + if (names && descriptions) *output << " : "; + if (descriptions) *output << target->Description(); + *output << endl; + } + } + } } -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) { - static DiathekeMgr manager; +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) { + static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat, + ((OP_BIDI & optionfilters) == OP_BIDI), + ((OP_ARSHAPE & optionfilters) == OP_ARSHAPE)); ModMap::iterator it; ListKey listkey; SectionMap::iterator sit; ConfigEntMap::iterator eit; - - SWModule * target; + + SWModule *target; char *font = 0; char inputformat = 0; SWBuf encoding; - char querytype = 0; + char querytype = 0; if (locale) { LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale); } - VerseKey vk; //deal with queries to "system" if (!::stricmp(text, "system")) { @@ -113,12 +140,13 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI return; } target = (*it).second; + SWKey *p = target->CreateKey(); + VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p); + if (!parser) { + delete p; + parser = new VerseKey(); + } - manager.Markup(outputformat); - manager.Encoding(outputencoding); - manager.bidi = ((OP_BIDI & optionfilters) == OP_BIDI); - manager.shape = ((OP_ARSHAPE & optionfilters) == OP_ARSHAPE); - if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) { if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) { if (!::stricmp((char *)(*eit).second.c_str(), "GBF")) @@ -127,6 +155,8 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI inputformat = FMT_THML; else if (!::stricmp((char *)(*eit).second.c_str(), "OSIS")) inputformat = FMT_OSIS; + else if (!::stricmp((char *)(*eit).second.c_str(), "TEI")) + inputformat = FMT_TEI; } encoding = ((eit = (*sit).second.find("Encoding")) != (*sit).second.end()) ? (*eit).second : (SWBuf)""; } @@ -143,12 +173,16 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI case FMT_OSIS : *output << "OSIS"; break; + case FMT_TEI : + *output << "TEI"; + break; default: *output << "Other"; - } + } *output << ";"; *output << target->Type(); *output << ";"; + delete parser; return; } @@ -160,7 +194,9 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI querytype = QT_COMM; else if (!strcmp(target->Type(), "Lexicons / Dictionaries")) querytype = QT_LD; - + else if (!strcmp(target->Type(), "Generic Books")) + querytype = QT_LD; + if (optionfilters & OP_FOOTNOTES) manager.setGlobalOption("Footnotes","On"); else @@ -208,13 +244,13 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI manager.setGlobalOption("Variants", "Secondary Readings"); } else - manager.setGlobalOption("Transliteration", "Primary Readings"); + manager.setGlobalOption("Variants", "Primary Readings"); if (optionfilters & OP_TRANSLITERATOR && script) manager.setGlobalOption("Transliteration", script); else manager.setGlobalOption("Transliteration", "Off"); - + if (querytype == QT_SEARCH) { //this test is just to determine if we've got SWKeys or VerseKeys @@ -224,7 +260,9 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI querytype = QT_BIBLE; else if (!strcmp(target->Type(), "Lexicons / Dictionaries")) querytype = QT_LD; - + else if (!strcmp(target->Type(), "Generic Books")) + querytype = QT_LD; + //do search stuff char st = 1 - searchtype; if (querytype == QT_BIBLE) { @@ -235,18 +273,17 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "\"-- "; if (range) { - VerseKey parser; - ListKey scope = parser.ParseVerseList(range, parser, true); + ListKey scope = parser->ParseVerseList(range, "Gen 1:1", true); listkey = target->Search(ref, st, REG_ICASE, &scope); } else listkey = target->Search(ref, st, REG_ICASE); - + if (strlen((const char*)listkey)) { if (!listkey.Error()) { if (outputformat == FMT_CGI) *output << "<entry>"; if (querytype == QT_BIBLE) { - vk = listkey; - *output << (const char *)vk; + *parser = listkey; + *output << (const char *)*parser; } else *output << (const char *)listkey; if (outputformat == FMT_CGI) *output << "</entry>"; @@ -256,20 +293,20 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << " ; "; if (outputformat == FMT_CGI) *output << "<entry>"; if (querytype == QT_BIBLE) { - vk = listkey; - *output << (const char *)vk; + *parser = listkey; + *output << (const char *)*parser; } else *output << (const char *)listkey; if (outputformat == FMT_CGI) *output << "</entry>"; listkey++; } *output << " -- "; - + char *temp = new char[10]; sprintf(temp, "%u", listkey.Count()); *output << temp; delete [] temp; - + *output << " matches total ("; *output << target->Name(); *output << ")\n"; @@ -280,12 +317,12 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << ")\n"; } } - + else if (querytype == QT_LD) { //do dictionary stuff - + target->setKey(ref); - + const char * text = (const char *) *target; if (outputformat == FMT_RTF) { @@ -298,8 +335,8 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI } else if (outputformat == FMT_HTML) { *output << "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">"; - } - + } + if (strlen(text)) { *output << (char*)target->KeyText(); if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { @@ -324,14 +361,14 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "("; *output << target->Name(); *output << ")\n"; - } + } if (outputformat == FMT_RTF) { *output << "}"; } } - + else if (querytype == QT_BIBLE || querytype == QT_COMM) { //do commentary/Bible stuff @@ -341,8 +378,8 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI if (strlen(font) == 0) font = 0; } } - - listkey = vk.ParseVerseList(ref, "Gen1:1", true); + + listkey = parser->ParseVerseList(ref, "Gen1:1", true); int i; if (outputformat == FMT_RTF) { @@ -359,10 +396,10 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI for (i = 0; i < listkey.Count() && maxverses; i++) { VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.GetElement(i)); - if (element) { + if (element && element->isBoundSet()) { target->Key(element->LowerBound()); - vk = element->UpperBound(); - while (maxverses && target->Key() <= vk) { + *parser = element->UpperBound(); + while (maxverses && target->Key() <= *parser) { *output << (char*)target->KeyText(); if (font && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) { *output << ": <font face=\""; @@ -393,8 +430,8 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << "<CM>"; *output << "\n"; - - if (target->Key() == vk) + + if (target->Key() == *parser) break; maxverses--; (*target)++; @@ -421,7 +458,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI else if (outputformat == FMT_RTF) { *output << "}"; } - + if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_THML || outputformat == FMT_CGI)) *output << "<br />"; else if (outputformat == FMT_OSIS) @@ -445,5 +482,6 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI } } + delete parser; } diff --git a/utilities/diatheke/corediatheke.h b/utilities/diatheke/corediatheke.h index 0364b37..2ad4801 100644 --- a/utilities/diatheke/corediatheke.h +++ b/utilities/diatheke/corediatheke.h @@ -1,7 +1,23 @@ // Diatheke 4.2 by Chris Little <chrislit@crosswire.org> -// Copyright 1999-2002 by CrossWire Bible Society http://www.crosswire.org -// Licensed under GNU General Public License (GPL) -// see accompanying LICENSE file for license details +// Copyright 1999-2009 by CrossWire Bible Society +// http://www.crosswire.org/sword/diatheke + +/* + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include <stdio.h> #include <iostream> @@ -31,7 +47,7 @@ #define OP_BIDI 2048 #define OP_VARIANTS 4096 #define OP_RED 8192 - +#define OP_ARABICPOINTS 16384 #define ST_NONE 0 #define ST_REGEX 1 //0 #define ST_PHRASE 2 // -1 diff --git a/utilities/diatheke/diafiltmgr.h b/utilities/diatheke/diafiltmgr.h index 2ca34eb..0acdf1a 100644 --- a/utilities/diatheke/diafiltmgr.h +++ b/utilities/diatheke/diafiltmgr.h @@ -23,11 +23,12 @@ #define FMT_CGI 127 #include <encfiltmgr.h> + #ifndef NO_SWORD_NAMESPACE using namespace sword; #endif -class SWDLLEXPORT DiathekeFilterMgr : public EncodingFilterMgr { +class DiathekeFilterMgr : public EncodingFilterMgr { protected: SWFilter* fromthml; SWFilter* fromgbf; diff --git a/utilities/diatheke/diatheke.cpp b/utilities/diatheke/diatheke.cpp index 0a99c07..3ffe194 100644 --- a/utilities/diatheke/diatheke.cpp +++ b/utilities/diatheke/diatheke.cpp @@ -1,9 +1,23 @@ // Diatheke 4.2.1 by Chris Little <chrislit@crosswire.org> // Copyright 1999-2005 by CrossWire Bible Society // http://www.crosswire.org/sword/diatheke -// Licensed under GNU General Public License (GPL) -// see accompanying LICENSE file for license details +/* + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include "corediatheke.h" #include "diathekemgr.h" @@ -32,7 +46,7 @@ void printsyntax() { fprintf (stderr, "Valid search_type values are: regex, multiword, and phrase(def).\n"); fprintf (stderr, "Valid option_filters values are: n (Strong's numbers),\n"); fprintf (stderr, " f (Footnotes), m (Morphology), h (Section Headings),\n"); - fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents),\n"); + fprintf (stderr, " c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n"); fprintf (stderr, " l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping,\n"); fprintf (stderr, " b (Bi-Directional Reordering), x (Red Words of Christ)\n"); @@ -129,6 +143,8 @@ int main(int argc, char **argv) optionfilters |= OP_BIDI; if (strchr(argv[i+1], 'x')) optionfilters |= OP_RED; + if (strchr(argv[i+1], 'p')) + optionfilters |= OP_ARABICPOINTS; i++; } } diff --git a/utilities/diatheke/diatheke.dsp b/utilities/diatheke/diatheke.dsp deleted file mode 100644 index 03085d3..0000000 --- a/utilities/diatheke/diatheke.dsp +++ /dev/null @@ -1,204 +0,0 @@ -# Microsoft Developer Studio Project File - Name="diatheke" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=diatheke - Win32 Debug with ICU -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "diatheke.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "diatheke.mak" CFG="diatheke - Win32 Debug with ICU" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "diatheke - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "diatheke - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "diatheke - Win32 Debug with ICU" (based on "Win32 (x86) Console Application") -!MESSAGE "diatheke - Win32 Release with ICU" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "diatheke - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "../../include" /I "../../src/utilfuns/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libswordvc6.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" - -!ELSEIF "$(CFG)" == "diatheke - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "../../include" /I "../../src/utilfuns/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libswordvc6d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" - -!ELSEIF "$(CFG)" == "diatheke - Win32 Debug with ICU" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "diatheke___Win32_Debug_with_ICU" -# PROP BASE Intermediate_Dir "diatheke___Win32_Debug_with_ICU" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "ICUDebug" -# PROP Intermediate_Dir "ICUDebug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /w /W0 /Gm /GX /ZI /Od /I "../../include" /I "../../src/utilfuns/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__VISUALC__" /FR /YX /FD /GZ /c -# ADD CPP /nologo /MDd /w /W0 /Gm /GX /ZI /Od /I "../../include" /I "../../src/utilfuns/win32" /I "../../../icu-sword/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_ICU_" /D "_ICUSWORD_" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libsword.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/vcppmake/vc6/Debug" -# ADD LINK32 icuin.lib icuuc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libswordvc6icud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../icu-sword/lib" /libpath:"../../lib" - -!ELSEIF "$(CFG)" == "diatheke - Win32 Release with ICU" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "diatheke___Win32_Release_with_ICU" -# PROP BASE Intermediate_Dir "diatheke___Win32_Release_with_ICU" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ICURelease" -# PROP Intermediate_Dir "ICURelease" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /w /W0 /GX /O2 /I "../../include" /I "../../src/utilfuns/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__VISUALC__" /FR /YX /FD /c -# ADD CPP /nologo /MD /w /W0 /GX /O2 /I "../../include" /I "../../src/utilfuns/win32" /I "../../../icu-sword/include" /D "NDEBUG" /D "_ICU_" /D "_ICUSWORD_" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libsword.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/vcppmake/vc6/Release" -# ADD LINK32 icuin.lib icuuc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libswordvc6icu.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../icu-sword/lib" /libpath:"../../lib" - -!ENDIF - -# Begin Target - -# Name "diatheke - Win32 Release" -# Name "diatheke - Win32 Debug" -# Name "diatheke - Win32 Debug with ICU" -# Name "diatheke - Win32 Release with ICU" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\corediatheke.cpp -# End Source File -# Begin Source File - -SOURCE=.\diafiltmgr.cpp -# End Source File -# Begin Source File - -SOURCE=.\diatheke.cpp -# End Source File -# Begin Source File - -SOURCE=.\diathekemgr.cpp -# End Source File -# Begin Source File - -SOURCE=.\gbfcgi.cpp -# End Source File -# Begin Source File - -SOURCE=.\osiscgi.cpp -# End Source File -# Begin Source File - -SOURCE=.\thmlcgi.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\corediatheke.h -# End Source File -# Begin Source File - -SOURCE=.\diafiltmgr.h -# End Source File -# Begin Source File - -SOURCE=.\diathekemgr.h -# End Source File -# Begin Source File - -SOURCE=.\gbfcgi.h -# End Source File -# Begin Source File - -SOURCE=.\osiscgi.h -# End Source File -# Begin Source File - -SOURCE=.\thmlcgi.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/utilities/diatheke/diatheke.dsw b/utilities/diatheke/diatheke.dsw deleted file mode 100644 index 3bf8c0c..0000000 --- a/utilities/diatheke/diatheke.dsw +++ /dev/null @@ -1,44 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "diatheke"=.\diatheke.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libsword - End Project Dependency -}}} - -############################################################################### - -Project: "libsword"=..\..\lib\vcppmake\vc6\libsword.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/utilities/diatheke/diatheke.vcproj b/utilities/diatheke/diatheke.vcproj new file mode 100644 index 0000000..6b2b2ed --- /dev/null +++ b/utilities/diatheke/diatheke.vcproj @@ -0,0 +1,709 @@ +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="diatheke"
+ ProjectGUID="{891A765C-5503-4FED-B427-7AE1413DB264}"
+ TargetFrameworkVersion="0"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory=".\Debug"
+ IntermediateDirectory=".\Debug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/diatheke.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;SWUSINGDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\Debug/diatheke.pch"
+ AssemblerListingLocation=".\Debug/"
+ ObjectFile=".\Debug/"
+ ProgramDataBaseFileName=".\Debug/"
+ BrowseInformation="1"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
+ OutputFile=".\Debug/diatheke.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/Debug"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\Debug/diatheke.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\Debug/diatheke.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\Release"
+ IntermediateDirectory=".\Release"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/diatheke.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;SWUSINGDLL"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\Release/diatheke.pch"
+ AssemblerListingLocation=".\Release/"
+ ObjectFile=".\Release/"
+ ProgramDataBaseFileName=".\Release/"
+ BrowseInformation="1"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
+ OutputFile=".\Release/diatheke.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/Release"
+ ProgramDatabaseFile=".\Release/diatheke.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\Release/diatheke.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug with ICU|Win32"
+ OutputDirectory=".\ICUDebug"
+ IntermediateDirectory=".\ICUDebug"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\ICUDebug/diatheke.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ PrecompiledHeaderFile=".\ICUDebug/diatheke.pch"
+ AssemblerListingLocation=".\ICUDebug/"
+ ObjectFile=".\ICUDebug/"
+ ProgramDataBaseFileName=".\ICUDebug/"
+ BrowseInformation="1"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
+ OutputFile=".\ICUDebug/diatheke.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICUDebug"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile=".\ICUDebug/diatheke.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\ICUDebug/diatheke.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release with ICU|Win32"
+ OutputDirectory=".\ICURelease"
+ IntermediateDirectory=".\ICURelease"
+ ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\ICURelease/diatheke.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ AdditionalIncludeDirectories="../../include,../../src/utilfuns/win32,../../../icu-sword/include"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\ICURelease/diatheke.pch"
+ AssemblerListingLocation=".\ICURelease/"
+ ObjectFile=".\ICURelease/"
+ ProgramDataBaseFileName=".\ICURelease/"
+ BrowseInformation="1"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="icuin.lib icuuc.lib icudt.lib libsword.lib"
+ OutputFile=".\ICURelease/diatheke.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="../../../icu-sword/lib,../../lib/vcppmake/vc8/ICURelease"
+ ProgramDatabaseFile=".\ICURelease/diatheke.pdb"
+ SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ SuppressStartupBanner="true"
+ OutputFile=".\ICURelease/diatheke.bsc"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ >
+ <File
+ RelativePath="corediatheke.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="diafiltmgr.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="diatheke.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="diathekemgr.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="gbfcgi.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="osiscgi.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="thmlcgi.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release with ICU|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
+ <File
+ RelativePath="corediatheke.h"
+ >
+ </File>
+ <File
+ RelativePath="diafiltmgr.h"
+ >
+ </File>
+ <File
+ RelativePath="diathekemgr.h"
+ >
+ </File>
+ <File
+ RelativePath="gbfcgi.h"
+ >
+ </File>
+ <File
+ RelativePath="osiscgi.h"
+ >
+ </File>
+ <File
+ RelativePath="thmlcgi.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/utilities/diatheke/diathekemgr.cpp b/utilities/diatheke/diathekemgr.cpp index 38cb46d..93351c0 100644 --- a/utilities/diatheke/diathekemgr.cpp +++ b/utilities/diatheke/diathekemgr.cpp @@ -1,21 +1,23 @@ +/* + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + //--------------------------------------------------------------------------- -#include <thmlplain.h> -#include <gbfplain.h> -#include <thmlgbf.h> -#include <gbfthml.h> -#include <thmlhtml.h> -#include <gbfhtml.h> -#include <plainhtml.h> -#include <thmlhtmlhref.h> -#include <gbfhtmlhref.h> -#include <thmlrtf.h> -#include <gbfrtf.h> -#include <utilstr.h> #include <swmodule.h> -#include <swconfig.h> -#include "diafiltmgr.h" - #ifdef _ICU_ #include <utf8arshaping.h> #include <utf8bidireorder.h> @@ -27,8 +29,6 @@ #endif #include "diathekemgr.h" -#include "gbfcgi.h" -#include "thmlcgi.h" //--------------------------------------------------------------------------- DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autoload, char enc, char mark, bool ibidi, bool ishape) @@ -38,9 +38,9 @@ DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autolo shape = ishape; #ifdef _ICU_ - arshaping = new UTF8arShaping(); + arshaping = new UTF8arShaping(); bidireorder = new UTF8BiDiReorder(); - transliterator = new UTF8Transliterator(); + transliterator = new UTF8Transliterator(); #endif Load(); @@ -78,10 +78,10 @@ void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap §ion) rtl = ((entry = section.find("Direction")) != section.end()) ? ((*entry).second == "RtoL") : false; #ifdef _ICU_ - if (shape && !strnicmp(lang.c_str(), "ar", 2)) { + if (shape) { module->AddRenderFilter(arshaping); } - if (bidi && rtl) { + if (bidi && rtl) { module->AddRenderFilter(bidireorder); } #endif diff --git a/utilities/diatheke/diathekemgr.h b/utilities/diatheke/diathekemgr.h index cbd8e6f..6225bbf 100644 --- a/utilities/diatheke/diathekemgr.h +++ b/utilities/diatheke/diathekemgr.h @@ -1,10 +1,27 @@ +/* + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + #ifndef DIATHEKEMGR_H #define DIATHEKEMGR_H #include <swmgr.h> #include "diafiltmgr.h" -enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE }; +//enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE }; class DiathekeMgr : public SWMgr { SWFilter *arshaping; @@ -12,13 +29,13 @@ class DiathekeMgr : public SWMgr { SWOptionFilter *transliterator; #ifdef WIN32 - char platformID; + char platformID; #endif protected: virtual void AddRenderFilters(SWModule *module, ConfigEntMap §ion); - virtual signed char Load (); - virtual void AddGlobalOptions (SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end); + virtual signed char Load (); + virtual void AddGlobalOptions (SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end); public: bool shape; diff --git a/utilities/diatheke/gbfcgi.cpp b/utilities/diatheke/gbfcgi.cpp index c581fa1..5112c46 100644 --- a/utilities/diatheke/gbfcgi.cpp +++ b/utilities/diatheke/gbfcgi.cpp @@ -1,18 +1,25 @@ /*************************************************************************** - gbfcgi.cpp - GBF to Diatheke/CGI format - ------------------- - begin : 2001-11-12 - copyright : 2001 by CrossWire Bible Society - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + * gbfcgi.cpp - GBF to Diatheke/CGI format + * ------------------- + * begin : 2001-11-12 + * copyright : 2001 by CrossWire Bible Society + * + * + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include <stdlib.h> #include <string.h> diff --git a/utilities/diatheke/gbfcgi.h b/utilities/diatheke/gbfcgi.h index c2b68c9..71ded1a 100644 --- a/utilities/diatheke/gbfcgi.h +++ b/utilities/diatheke/gbfcgi.h @@ -1,18 +1,25 @@ -/*-************************************************************************* - gbfcgi.h - description - ------------------- - begin : 2001-11-12 - copyright : 2001 by CrossWire Bible Society - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/************************************************************************** + * gbfcgi.h - description + * ------------------- + * begin : 2001-11-12 + * copyright : 2001 by CrossWire Bible Society + * + * + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef GBFCGI_H #define GBFCGI_H @@ -27,7 +34,7 @@ SWORD_NAMESPACE_START typedef std::map<SWBuf, SWBuf> DualStringMap; /** this filter converts GBF text to Diatheke/CGI format */ -class SWDLLEXPORT GBFCGI : public SWBasicFilter { +class GBFCGI : public SWBasicFilter { protected: virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData); public: diff --git a/utilities/diatheke/osiscgi.cpp b/utilities/diatheke/osiscgi.cpp index 68298e9..86c7ed0 100644 --- a/utilities/diatheke/osiscgi.cpp +++ b/utilities/diatheke/osiscgi.cpp @@ -1,18 +1,25 @@ /*************************************************************************** - osiscgi.cpp - OSIS to Diatheke/CGI format - ------------------- - begin : 2003-10-21 - copyright : 2003 by CrossWire Bible Society - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + * osiscgi.cpp - OSIS to Diatheke/CGI format + * ------------------- + * begin : 2003-10-21 + * copyright : 2003 by CrossWire Bible Society + * + * + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include <stdlib.h> #include "osiscgi.h" diff --git a/utilities/diatheke/osiscgi.h b/utilities/diatheke/osiscgi.h index c6c6411..d64e805 100644 --- a/utilities/diatheke/osiscgi.h +++ b/utilities/diatheke/osiscgi.h @@ -1,18 +1,25 @@ /*************************************************************************** - osiscgi.h - OSIS to Diatheke/CGI format - ------------------- - begin : 2003-10-21 - copyright : 2003 by CrossWire Bible Society - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + * osiscgi.h - OSIS to Diatheke/CGI format + * ------------------- + * begin : 2003-10-21 + * copyright : 2003 by CrossWire Bible Society + * + * + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef OSISCGI_H #define OSISCGI_H @@ -25,7 +32,7 @@ SWORD_NAMESPACE_START /** this filter converts OSIS text to Diatheke/CGI format */ -class SWDLLEXPORT OSISCGI : public SWBasicFilter { +class OSISCGI : public SWBasicFilter { private: protected: class MyUserData : public BasicFilterUserData { diff --git a/utilities/diatheke/soap/sapouni.cgi b/utilities/diatheke/soap/sapouni.cgi index 24df769..5412d23 100755 --- a/utilities/diatheke/soap/sapouni.cgi +++ b/utilities/diatheke/soap/sapouni.cgi @@ -1,5 +1,21 @@ #!/usr/bin/perl +# * +# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +# * CrossWire Bible Society +# * P. O. Box 2528 +# * Tempe, AZ 85280-2528 +# * +# * This program is free software; you can redistribute it and/or modify it +# * under the terms of the GNU General Public License as published by the +# * Free Software Foundation version 2. +# * +# * This program is distributed in the hope that it will be useful, but +# * WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# * General Public License for more details. +# * + #version 1.0 package sapouni; diff --git a/utilities/diatheke/soap/soapatheke.pl b/utilities/diatheke/soap/soapatheke.pl index e3f88ed..c45fd98 100755 --- a/utilities/diatheke/soap/soapatheke.pl +++ b/utilities/diatheke/soap/soapatheke.pl @@ -1,5 +1,22 @@ #!/usr/bin/perl +# * +# * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) +# * CrossWire Bible Society +# * P. O. Box 2528 +# * Tempe, AZ 85280-2528 +# * +# * This program is free software; you can redistribute it and/or modify it +# * under the terms of the GNU General Public License as published by the +# * Free Software Foundation version 2. +# * +# * This program is distributed in the hope that it will be useful, but +# * WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# * General Public License for more details. +# * + + ## This is a test app and has no other purpose. use SOAP::Lite; diff --git a/utilities/diatheke/tcl/biblebot-diatheke.tcl b/utilities/diatheke/tcl/biblebot-diatheke.tcl index 1fea379..52d7568 100644 --- a/utilities/diatheke/tcl/biblebot-diatheke.tcl +++ b/utilities/diatheke/tcl/biblebot-diatheke.tcl @@ -1,9 +1,22 @@ # Diatheke/Tcl 3.0 by Chris Little <chrislit@gotjesus.org> # Based on code schema of <cking@acy.digex.net> -# Copyright 1999 by Chris Little -# Licensed under GNU General Public License (GPL) -# see accompanying LICENSE file for license details +# * +# * Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org) +# * CrossWire Bible Society +# * P. O. Box 2528 +# * Tempe, AZ 85280-2528 +# * +# * This program is free software; you can redistribute it and/or modify it +# * under the terms of the GNU General Public License as published by the +# * Free Software Foundation version 2. +# * +# * This program is distributed in the hope that it will be useful, but +# * WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# * General Public License for more details. +# * + # This script is intended for use with libraries and modules from # the SWORD Project, available at http://www.crosswire.org/ diff --git a/utilities/diatheke/thmlcgi.cpp b/utilities/diatheke/thmlcgi.cpp index 5ad180d..1bcc5ba 100644 --- a/utilities/diatheke/thmlcgi.cpp +++ b/utilities/diatheke/thmlcgi.cpp @@ -1,18 +1,25 @@ /*************************************************************************** - thmlcgi.cpp - ThML to Diatheke/CGI format - ------------------- - begin : 2001-11-12 - copyright : 2001 by CrossWire Bible Society - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + * thmlcgi.cpp - ThML to Diatheke/CGI format + * ------------------- + * begin : 2001-11-12 + * copyright : 2001 by CrossWire Bible Society + * + * + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #include <stdlib.h> #include <string.h> diff --git a/utilities/diatheke/thmlcgi.h b/utilities/diatheke/thmlcgi.h index efa9018..bfdee35 100644 --- a/utilities/diatheke/thmlcgi.h +++ b/utilities/diatheke/thmlcgi.h @@ -1,18 +1,25 @@ /*************************************************************************** - thmlcgi.h - OSIS to Diatheke/CGI format - ------------------- - begin : 2001-11-12 - copyright : 2001 by CrossWire Bible Society - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ + * thmlcgi.h - OSIS to Diatheke/CGI format + * ------------------- + * begin : 2001-11-12 + * copyright : 2001 by CrossWire Bible Society + * + * + * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org) + * CrossWire Bible Society + * P. O. Box 2528 + * Tempe, AZ 85280-2528 + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ #ifndef THMLCGI_H #define THMLCGI_H @@ -27,7 +34,7 @@ SWORD_NAMESPACE_START typedef std::map<SWBuf, SWBuf> DualStringMap; /** this filter converts ThML text to Diatheke/CGI format */ -class SWDLLEXPORT ThMLCGI : public SWBasicFilter { +class ThMLCGI : public SWBasicFilter { protected: virtual bool handleToken(SWBuf &buf, const char *token, DualStringMap &userData); public: |