From sword@www.crosswire.org Tue Jul 1 18:16:23 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Tue, 1 Jul 2003 11:16:23 -0700 Subject: [sword-cvs] swordweb wordsearchresults.jsp,1.4,1.5 Message-ID: <200307011816.h61IGNj07620@www.crosswire.org> Update of /usr/local/cvsroot/swordweb In directory www:/tmp/cvs-serv7613 Modified Files: wordsearchresults.jsp Log Message: Index: wordsearchresults.jsp =================================================================== RCS file: /usr/local/cvsroot/swordweb/wordsearchresults.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wordsearchresults.jsp 23 May 2003 20:38:19 -0000 1.4 --- wordsearchresults.jsp 1 Jul 2003 18:16:20 -0000 1.5 *************** *** 35,39 **** ! Search results for "<%= activeSearchTerm %>" --- 35,39 ---- ! Search results for <%= new String(activeSearchTerm.getBytes("iso8859-1"), "UTF-8") %> *************** *** 103,107 **** %>
<%= results[i] %>
!
<%= activeModule.getRenderText() %>
<% } --- 103,109 ---- %>
<%= results[i] %>
!
! <%= new String(activeModule.getRenderText().getBytes("iso8859-1"), "UTF-8") %> !
<% } From sword@www.crosswire.org Tue Jul 1 18:23:03 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Tue, 1 Jul 2003 11:23:03 -0700 Subject: [sword-cvs] swordweb wordsearchresults.jsp,1.5,1.6 Message-ID: <200307011823.h61IN3j07799@www.crosswire.org> Update of /usr/local/cvsroot/swordweb In directory www:/tmp/cvs-serv7790 Modified Files: wordsearchresults.jsp Log Message: Index: wordsearchresults.jsp =================================================================== RCS file: /usr/local/cvsroot/swordweb/wordsearchresults.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wordsearchresults.jsp 1 Jul 2003 18:16:20 -0000 1.5 --- wordsearchresults.jsp 1 Jul 2003 18:23:01 -0000 1.6 *************** *** 75,79 **** !

Results for "<%= activeSearchTerm %>"

<% String[] results = null; --- 75,79 ---- !

Results for "<%= new String(activeSearchTerm.getBytes("iso8859-1"), "UTF-8") %>"

<% String[] results = null; From sword@www.crosswire.org Fri Jul 4 21:45:27 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 14:45:27 -0700 Subject: [sword-cvs] sword/tests parsekey.cpp,1.10,1.11 rawldidxtest.cpp,1.4,1.5 Message-ID: <200307042145.h64LjRj31434@www.crosswire.org> Update of /usr/local/cvsroot/sword/tests In directory www:/tmp/cvs-serv31399/tests Modified Files: parsekey.cpp rawldidxtest.cpp Log Message: Index: parsekey.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/tests/parsekey.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** parsekey.cpp 25 Nov 2002 22:33:08 -0000 1.10 --- parsekey.cpp 4 Jul 2003 21:45:24 -0000 1.11 *************** *** 27,31 **** VerseKey *element = dynamic_cast(verses.GetElement(i)); if (element) { ! std::cout << (std::string(element->LowerBound()) + " - " + std::string(element->UpperBound())).c_str() << "\n"; } else std::cout << (const char *)*verses.GetElement(i) << "\n"; --- 27,31 ---- VerseKey *element = dynamic_cast(verses.GetElement(i)); if (element) { ! std::cout << (SWBuf(element->LowerBound()) + " - " + SWBuf(element->UpperBound())).c_str() << "\n"; } else std::cout << (const char *)*verses.GetElement(i) << "\n"; Index: rawldidxtest.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/tests/rawldidxtest.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rawldidxtest.cpp 27 Feb 2003 07:47:37 -0000 1.4 --- rawldidxtest.cpp 4 Jul 2003 21:45:24 -0000 1.5 *************** *** 32,36 **** FileMgr::systemFileMgr.close(idxfd); ! std::string last = ""; bool first = true; char *trybuf = 0; --- 32,36 ---- FileMgr::systemFileMgr.close(idxfd); ! SWBuf last = ""; bool first = true; char *trybuf = 0; From sword@www.crosswire.org Fri Jul 4 21:45:27 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 14:45:27 -0700 Subject: [sword-cvs] sword/locales.d abbr.conf,1.6,1.7 af.conf,1.2,1.3 cs.conf,1.5,1.6 da.conf,1.3,1.4 de.conf,1.11,1.12 de_abbrev.conf,1.4,1.5 en_GB.conf,1.2,1.3 es.conf,1.2,1.3 et.conf,1.4,1.5 et_abbr.conf,1.3,1.4 fi.conf,1.2,1.3 fr.conf,1.3,1.4 hu.conf,1.6,1.7 id.conf,1.7,1.8 it.conf,1.3,1.4 la.conf,1.2,1.3 nl.conf,1.4,1.5 no.conf,1.7,1.8 pl.conf,1.4,1.5 pt.conf,1.3,1.4 pt_BR.conf,1.1,1.2 ro.conf,1.3,1.4 ru_RU-cp1251.conf,1.2,1.3 ru_RU-koi8-r.conf,1.2,1.3 sk.conf,1.4,1.5 sl.conf,1.1,1.2 uk_UA-cp1251.conf,1.2,1.3 uk_UA-koi8-u.conf,1.2,1.3 Message-ID: <200307042145.h64LjRj31458@www.crosswire.org> Update of /usr/local/cvsroot/sword/locales.d In directory www:/tmp/cvs-serv31399/locales.d Modified Files: abbr.conf af.conf cs.conf da.conf de.conf de_abbrev.conf en_GB.conf es.conf et.conf et_abbr.conf fi.conf fr.conf hu.conf id.conf it.conf la.conf nl.conf no.conf pl.conf pt.conf pt_BR.conf ro.conf ru_RU-cp1251.conf ru_RU-koi8-r.conf sk.conf sl.conf uk_UA-cp1251.conf uk_UA-koi8-u.conf Log Message: Index: abbr.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/abbr.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** abbr.conf 21 Jun 2003 08:57:08 -0000 1.6 --- abbr.conf 4 Jul 2003 21:45:24 -0000 1.7 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: af.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/af.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** af.conf 14 Jun 2003 14:09:14 -0000 1.2 --- af.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 241,244 **** --- 241,245 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: cs.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/cs.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cs.conf 18 Jun 2003 14:04:49 -0000 1.5 --- cs.conf 4 Jul 2003 21:45:24 -0000 1.6 *************** *** 254,257 **** --- 254,258 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: da.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/da.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** da.conf 19 Jun 2003 19:16:04 -0000 1.3 --- da.conf 4 Jul 2003 21:45:24 -0000 1.4 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: de.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/de.conf,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** de.conf 18 Jun 2003 10:07:03 -0000 1.11 --- de.conf 4 Jul 2003 21:45:24 -0000 1.12 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: de_abbrev.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/de_abbrev.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** de_abbrev.conf 21 Jun 2003 08:55:52 -0000 1.4 --- de_abbrev.conf 4 Jul 2003 21:45:24 -0000 1.5 *************** *** 246,249 **** --- 246,250 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: en_GB.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/en_GB.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** en_GB.conf 19 Jun 2003 20:52:09 -0000 1.2 --- en_GB.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: es.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/es.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** es.conf 1 Nov 2001 20:50:23 -0000 1.2 --- es.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 241,244 **** --- 241,245 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: et.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/et.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** et.conf 19 Jun 2003 20:52:09 -0000 1.4 --- et.conf 4 Jul 2003 21:45:24 -0000 1.5 *************** *** 241,244 **** --- 241,245 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: et_abbr.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/et_abbr.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** et_abbr.conf 19 Jun 2003 20:52:09 -0000 1.3 --- et_abbr.conf 4 Jul 2003 21:45:24 -0000 1.4 *************** *** 239,242 **** --- 239,243 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: fi.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/fi.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fi.conf 18 Jun 2003 14:04:49 -0000 1.2 --- fi.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: fr.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/fr.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fr.conf 6 Jun 2002 21:15:14 -0000 1.3 --- fr.conf 4 Jul 2003 21:45:24 -0000 1.4 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: hu.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/hu.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** hu.conf 18 Jun 2003 14:04:49 -0000 1.6 --- hu.conf 4 Jul 2003 21:45:24 -0000 1.7 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: id.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/id.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** id.conf 19 Jun 2003 20:52:09 -0000 1.7 --- id.conf 4 Jul 2003 21:45:24 -0000 1.8 *************** *** 405,408 **** --- 405,409 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: it.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/it.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** it.conf 18 Jun 2003 14:04:49 -0000 1.3 --- it.conf 4 Jul 2003 21:45:24 -0000 1.4 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: la.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/la.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** la.conf 20 Jun 2002 19:51:56 -0000 1.2 --- la.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 246,249 **** --- 246,250 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: nl.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/nl.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** nl.conf 2 Nov 2001 04:58:20 -0000 1.4 --- nl.conf 4 Jul 2003 21:45:24 -0000 1.5 *************** *** 197,200 **** --- 197,201 ---- EPH=49 PHILIPPENSEN=50 + PHLM=57 PHP=50 PHIL=50 Index: no.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/no.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** no.conf 18 Jun 2003 14:04:49 -0000 1.7 --- no.conf 4 Jul 2003 21:45:24 -0000 1.8 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: pl.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/pl.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pl.conf 19 Jun 2003 20:52:09 -0000 1.4 --- pl.conf 4 Jul 2003 21:45:24 -0000 1.5 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: pt.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/pt.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pt.conf 1 Nov 2001 20:50:23 -0000 1.3 --- pt.conf 4 Jul 2003 21:45:24 -0000 1.4 *************** *** 241,244 **** --- 241,245 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: pt_BR.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/pt_BR.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pt_BR.conf 27 Mar 2002 19:36:04 -0000 1.1 --- pt_BR.conf 4 Jul 2003 21:45:24 -0000 1.2 *************** *** 241,244 **** --- 241,245 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: ro.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/ro.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ro.conf 19 Jun 2003 20:52:09 -0000 1.3 --- ro.conf 4 Jul 2003 21:45:24 -0000 1.4 *************** *** 240,243 **** --- 240,244 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: ru_RU-cp1251.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/ru_RU-cp1251.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ru_RU-cp1251.conf 19 Jun 2003 19:16:04 -0000 1.2 --- ru_RU-cp1251.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 245,248 **** --- 245,249 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: ru_RU-koi8-r.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/ru_RU-koi8-r.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ru_RU-koi8-r.conf 19 Jun 2003 19:16:04 -0000 1.2 --- ru_RU-koi8-r.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 245,248 **** --- 245,249 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: sk.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/sk.conf,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sk.conf 31 May 2002 14:35:16 -0000 1.4 --- sk.conf 4 Jul 2003 21:45:24 -0000 1.5 *************** *** 251,254 **** --- 251,255 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 *************** *** 266,269 **** --- 267,273 ---- ZECHARIAH=38 ZEPHANIAH=36 + + + GENESIS=1 GN=1 Index: sl.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/sl.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sl.conf 28 Jul 2002 11:12:29 -0000 1.1 --- sl.conf 4 Jul 2003 21:45:24 -0000 1.2 *************** *** 72,75 **** --- 72,260 ---- [Book Abbrevs] + 1 C=46 + 1 CHRONICLES=13 + 1 CORINTHIANS=46 + 1 JN=62 + 1 JOHN=62 + 1 KGS=11 + 1 KINGS=11 + 1 PETER=60 + 1 PTR=60 + 1 SAMUEL=9 + 1 THESSALONIANS=52 + 1 TIMOTHY=54 + 1C=46 + 1CHRONICLES=13 + 1CORINTHIANS=46 + 1JN=62 + 1JOHN=62 + 1KGS=11 + 1KINGS=11 + 1PETER=60 + 1PTR=60 + 1SAMUEL=9 + 1THESSALONIANS=52 + 1TIMOTHY=54 + 2 C=47 + 2 CHRONICLES=14 + 2 CORINTHIANS=47 + 2 JN=63 + 2 JOHN=63 + 2 KGS=12 + 2 KINGS=12 + 2 PETER=61 + 2 PTR=61 + 2 SAMUEL=10 + 2 THESSALONIANS=53 + 2 TIMOTHY=55 + 2C=47 + 2CHRONICLES=14 + 2CORINTHIANS=47 + 2JN=63 + 2JOHN=63 + 2KGS=12 + 2KINGS=12 + 2PETER=61 + 2PTR=61 + 2SAMUEL=10 + 2THESSALONIANS=53 + 2TIMOTHY=55 + 3 JN=64 + 3 JOHN=64 + 3JN=64 + 3JOHN=64 + ACTS=44 + AMOS=30 + APOCALYPSE OF ST. JOHN=66 + C=51 + CANTICLE OF CANTICLES=22 + COC=22 + COLOSSIANS=51 + D=5 + DANIEL=27 + DEUTERONOMY=5 + E=49 + ECCLESIASTES=21 + EPHESIANS=49 + ESTER=17 + ESTHER=17 + EXODUS=2 + EZEKIEL=26 + EZRA=15 + G=1 + GALATIANS=48 + GENESIS=1 + H=58 + HABAKKUK=35 + HAGGAI=37 + HEBREWS=58 + HOSEA=28 + I C=46 + I CHRONICLES=13 + I CORINTHIANS=46 + I JN=62 + I JOHN=62 + I KGS=11 + I KINGS=11 + I PETER=60 + I PTR=60 + I SAMUEL=9 + I THESSALONIANS=52 + I TIMOTHY=54 + IC=46 + ICHRONICLES=13 + ICORINTHIANS=46 + II C=47 + II CHRONICLES=14 + II CORINTHIANS=47 + II JN=63 + II JOHN=63 + II KGS=12 + II KINGS=12 + II PETER=61 + II PTR=61 + II SAMUEL=10 + II THESSALONIANS=53 + II TIMOTHY=55 + IIC=47 + IICHRONICLES=14 + IICORINTHIANS=47 + III JN=64 + III JOHN=64 + IIIJN=64 + IIIJOHN=64 + IIJN=63 + IIJOHN=63 + IIKGS=12 + IIKINGS=12 + IIPETER=61 + IIPTR=61 + IISAMUEL=10 + IITHESSALONIANS=53 + IITIMOTHY=55 + IJN=62 + IJOHN=62 + IKGS=11 + IKINGS=11 + IPETER=60 + IPTR=60 + ISA=23 + ISAIAH=23 + ISAMUEL=9 + ITHESSALONIANS=52 + ITIMOTHY=54 + J=43 + JAMES=59 + JAS=59 + JEREMIAH=24 + JN=43 + JO=43 + JOB=18 + JOEL=29 + JOHN=43 + JONAH=32 + JOSHUA=6 + JUD=7 + JUDE=65 + JUDGES=7 + L=42 + LAMENTATIONS=25 + LEVITICUS=3 + LK=42 + LUKE=42 + MA=40 + MALACHI=39 + MARK=41 + MATTHEW=40 + MICAH=33 + MK=41 + MR=41 + MT=40 + N=4 + NAHUM=34 + NEHEMIAH=16 + NUMBERS=4 + OBADIAH=31 + P=19 + PH=50 + PHILEMON=57 + PHILIPPIANS=50 + PHLM=57 + PHM=57 + PHP=50 + PROVERBS=20 + PSALMS=19 + PSM=19 + PSS=19 + REVELATION OF JOHN=66 + ROMANS=45 + RUTH=8 + SONG OF SOLOMON=22 + SONG OF SONGS=22 + SOS=22 + TITUS=56 + ZECHARIAH=38 + ZEPHANIAH=36 + GENEZA=1 GEN=1 Index: uk_UA-cp1251.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/uk_UA-cp1251.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uk_UA-cp1251.conf 19 Jun 2003 19:16:04 -0000 1.2 --- uk_UA-cp1251.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 245,248 **** --- 245,249 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 Index: uk_UA-koi8-u.conf =================================================================== RCS file: /usr/local/cvsroot/sword/locales.d/uk_UA-koi8-u.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uk_UA-koi8-u.conf 19 Jun 2003 19:16:04 -0000 1.2 --- uk_UA-koi8-u.conf 4 Jul 2003 21:45:24 -0000 1.3 *************** *** 245,248 **** --- 245,249 ---- PHILEMON=57 PHILIPPIANS=50 + PHLM=57 PHM=57 PHP=50 From sword@www.crosswire.org Fri Jul 4 21:45:31 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 14:45:31 -0700 Subject: [sword-cvs] sword/include canon.h,1.18,1.19 Message-ID: <200307042145.h64LjQj31422@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv31399/include Modified Files: canon.h Log Message: Index: canon.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/canon.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** canon.h 26 May 2003 08:36:31 -0000 1.18 --- canon.h 4 Jul 2003 21:45:24 -0000 1.19 *************** *** 282,285 **** --- 282,286 ---- {"PHILEMON", 57}, // Philemon {"PHILIPPIANS", 50}, // Philippians + {"PHLM", 57}, // Philemon {"PHM", 57}, // Philemon {"PHP", 50}, // Philippians From sword@www.crosswire.org Sat Jul 5 01:16:48 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 18:16:48 -0700 Subject: [sword-cvs] sword/include swbuf.h,1.16,1.17 Message-ID: <200307050116.h651Gmj24024@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv24006/include Modified Files: swbuf.h Log Message: Changed entry attribute osis footnotes around to better facilitate separation of crossRefs from other kinds of footnotes Index: swbuf.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/swbuf.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** swbuf.h 27 Jun 2003 11:31:41 -0000 1.16 --- swbuf.h 5 Jul 2003 01:16:46 -0000 1.17 *************** *** 59,63 **** * */ ! SWBuf(const char *initVal = 0); /** --- 59,63 ---- * */ ! SWBuf(const char *initVal = 0); /** From sword@www.crosswire.org Sat Jul 5 01:16:48 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 18:16:48 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/BibleCS DevOfTheDay.cpp,1.3,1.4 RxRichEditX.cpp,1.47,1.48 RxRichEditX.h,1.17,1.18 mainfrm.cpp,1.124,1.125 searchfrm.cpp,1.43,1.44 sword.res,1.105,1.106 vrslstfrm.cpp,1.14,1.15 Message-ID: <200307050116.h651Gmj24027@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS In directory www:/tmp/cvs-serv24006/apps/windoze/CBuilder5/BibleCS Modified Files: DevOfTheDay.cpp RxRichEditX.cpp RxRichEditX.h mainfrm.cpp searchfrm.cpp sword.res vrslstfrm.cpp Log Message: Changed entry attribute osis footnotes around to better facilitate separation of crossRefs from other kinds of footnotes Index: DevOfTheDay.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DevOfTheDay.cpp 27 Jun 2003 11:31:41 -0000 1.3 --- DevOfTheDay.cpp 5 Jul 2003 01:16:46 -0000 1.4 *************** *** 44,48 **** SWBuf tmpval = Form1->optionsconf->Sections["ModDefaults"]["DailyDevotion"]; if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) { ! RichTip->fillWithVerses(it->second, &key, false, false); } else DevOfTheDay2->RichTip->Text = "A Daily Devotional is not installed or is not configured for use with the \"Devotional of the Day.\n\nTo configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the \"Options\" menu and selecting \"Preferences...\"; then click the \"Special Modules\" tab. Find the \"Default Devotional\" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are \"Spurgeon's Morning and Evening\" or \"Jonathan Bagster's Daily Light\".\n\nVisit our website at www.crosswire.org for more information."; --- 44,48 ---- SWBuf tmpval = Form1->optionsconf->Sections["ModDefaults"]["DailyDevotion"]; if ((it = Form1->mainmgr->Modules.find(tmpval)) != Form1->mainmgr->Modules.end()) { ! RichTip->fillWithVerses(it->second, &key, 0, false, false); } else DevOfTheDay2->RichTip->Text = "A Daily Devotional is not installed or is not configured for use with the \"Devotional of the Day.\n\nTo configure an installed devotional for use with this dialog box open the Preferences dialog box by going to the \"Options\" menu and selecting \"Preferences...\"; then click the \"Special Modules\" tab. Find the \"Default Devotional\" option and select a devotional to use from the list. If nothing shows up in the pull-down list you will need to install a devotional. This can be done by using the Install Manager. Some examples of devotionals are \"Spurgeon's Morning and Evening\" or \"Jonathan Bagster's Daily Light\".\n\nVisit our website at www.crosswire.org for more information."; Index: RxRichEditX.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** RxRichEditX.cpp 27 Jun 2003 11:31:41 -0000 1.47 --- RxRichEditX.cpp 5 Jul 2003 01:16:46 -0000 1.48 *************** *** 280,284 **** ! bool TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, bool heading, bool verseNum, const char *type, bool stripNewlines) { SWBuf fontname; TMemoryStream *RTFStream = new TMemoryStream(); --- 280,284 ---- ! bool TRxRichEditX::fillWithVerses(SWModule *module, ListKey *verses, const char *introText, bool heading, bool verseNum, const char *type, bool stripNewlines) { SWBuf fontname; TMemoryStream *RTFStream = new TMemoryStream(); *************** *** 312,315 **** --- 312,322 ---- module->setKey(verses); + + if (introText) { + newtext += RTFHeadingPre; + newtext += introText; + newtext += RTFHeadingPost; + newtext += "{\\par ________ \\par\\par}"; + } SWKey *lastKey = 0; bool first = true; Index: RxRichEditX.h =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RxRichEditX.h 22 Jun 2003 23:50:23 -0000 1.17 --- RxRichEditX.h 5 Jul 2003 01:16:46 -0000 1.18 *************** *** 105,109 **** TRxRichEditX(TWinControl *parent); int paintTo(HDC, TRect *size, int margin = 4); ! bool fillWithVerses(SWModule *module, ListKey *verses, bool heading = true, bool verseNum = true, const char* type = "Default", bool stripNewlines = true); void fillWithRTFString(SWModule *module, const char *text, const char *type = "Default"); void getDisplayPrefs(DISP_ATTRIBS *attribs, SWModule *module); --- 105,109 ---- TRxRichEditX(TWinControl *parent); int paintTo(HDC, TRect *size, int margin = 4); ! bool fillWithVerses(SWModule *module, ListKey *verses, const char *introText = 0, bool heading = true, bool verseNum = true, const char* type = "Default", bool stripNewlines = true); void fillWithRTFString(SWModule *module, const char *text, const char *type = "Default"); void getDisplayPrefs(DISP_ATTRIBS *attribs, SWModule *module); Index: mainfrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** mainfrm.cpp 27 Jun 2003 11:31:41 -0000 1.124 --- mainfrm.cpp 5 Jul 2003 01:16:46 -0000 1.125 *************** *** 1703,1710 **** SWBuf body = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["body"].c_str(); DefaultVSKey->Verse(oldVerse); ! if ((type == "crossReference") || (type == "x-cross-ref")) { ! tmpVerseList = DefaultVSKey->ParseVerseList(body.c_str(), *DefaultVSKey); if (tmpVerseList.Count()) ! AddVerseChoices(menu, body.c_str(), rtf); } } --- 1703,1711 ---- SWBuf body = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["body"].c_str(); DefaultVSKey->Verse(oldVerse); ! if (type == "crossReference") { ! SWBuf refList = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["refList"].c_str(); ! tmpVerseList = DefaultVSKey->ParseVerseList(refList.c_str(), *DefaultVSKey); if (tmpVerseList.Count()) ! AddVerseChoices(menu, refList.c_str(), rtf); } } *************** *** 2409,2417 **** SWBuf type = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["type"].c_str(); SWBuf body = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["body"].c_str(); DefaultVSKey->Verse(oldVerse); ! if ((type == "crossReference") || (type == "x-cross-ref")) { ! ListKey verses = DefaultVSKey->ParseVerseList(body.c_str(), *DefaultVSKey, true); if (verses.Count()) { ! RTFHintForm->rtfDrawer->fillWithVerses(module, &verses, true, true, "Popup"); HintStr = "show rtf"; } --- 2410,2420 ---- SWBuf type = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["type"].c_str(); SWBuf body = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["body"].c_str(); + SWBuf refList = module->getEntryAttributes()["Footnote"][fnNum.c_str()]["refList"].c_str(); + body = module->RenderText(body.c_str()); DefaultVSKey->Verse(oldVerse); ! if (type == "crossReference") { ! ListKey verses = DefaultVSKey->ParseVerseList(refList.c_str(), *DefaultVSKey, true); if (verses.Count()) { ! RTFHintForm->rtfDrawer->fillWithVerses(module, &verses, body.c_str(), true, true, "Popup"); HintStr = "show rtf"; } *************** *** 2419,2424 **** } else { ! SWBuf text = module->RenderText(body.c_str()); ! RTFHintForm->rtfDrawer->fillWithRTFString(module, text.c_str()); HintStr = "show rtf"; } --- 2422,2426 ---- } else { ! RTFHintForm->rtfDrawer->fillWithRTFString(module, body.c_str()); HintStr = "show rtf"; } *************** *** 2441,2445 **** ListKey verses = DefaultVSKey->ParseVerseList(verseList.c_str(), *DefaultVSKey, true); if (verses.Count()) { ! RTFHintForm->rtfDrawer->fillWithVerses(module, &verses, true, true, "Popup"); HintStr = "show rtf"; } --- 2443,2447 ---- ListKey verses = DefaultVSKey->ParseVerseList(verseList.c_str(), *DefaultVSKey, true); if (verses.Count()) { ! RTFHintForm->rtfDrawer->fillWithVerses(module, &verses, 0, true, true, "Popup"); HintStr = "show rtf"; } *************** *** 2481,2485 **** ListKey key; key << WideStringToUTF8(strongsWord).c_str(); ! bool validEntry = RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, true, false, "Popup"); HintStr = (validEntry) ? "show rtf" : ""; break; --- 2483,2487 ---- ListKey key; key << WideStringToUTF8(strongsWord).c_str(); ! bool validEntry = RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, 0, true, false, "Popup"); HintStr = (validEntry) ? "show rtf" : ""; break; *************** *** 2500,2504 **** ListKey key; key << WideStringToUTF8(targetWord).c_str(); ! bool validEntry = RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, true, false, "Popup"); HintStr = (validEntry) ? "show rtf" : ""; break; --- 2502,2506 ---- ListKey key; key << WideStringToUTF8(targetWord).c_str(); ! bool validEntry = RTFHintForm->rtfDrawer->fillWithVerses(defMod, &key, 0, true, false, "Popup"); HintStr = (validEntry) ? "show rtf" : ""; break; Index: searchfrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** searchfrm.cpp 27 Jun 2003 11:31:41 -0000 1.43 --- searchfrm.cpp 5 Jul 2003 01:16:46 -0000 1.44 *************** *** 140,144 **** verse << *key; delete key; ! pvrtf->fillWithVerses(target, &verse, true, false, "Search"); } } --- 140,144 ---- verse << *key; delete key; ! pvrtf->fillWithVerses(target, &verse, 0, true, false, "Search"); } } *************** *** 284,288 **** ListKey verse; verse << Item->Caption.c_str(); ! RTFHintForm->searchListDrawer->fillWithVerses(target, &verse, false, false, "Search", true); //set color back in case it got changed in fill* if (resultsLV->Selected == Item) RTFHintForm->searchListDrawer->Color = TColor(0xB4CDBB); --- 284,288 ---- ListKey verse; verse << Item->Caption.c_str(); ! RTFHintForm->searchListDrawer->fillWithVerses(target, &verse, 0, false, false, "Search", true); //set color back in case it got changed in fill* if (resultsLV->Selected == Item) RTFHintForm->searchListDrawer->Color = TColor(0xB4CDBB); Index: sword.res =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.res,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 Binary files /tmp/cvs8zBR2E and /tmp/cvs1wIrh5 differ Index: vrslstfrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** vrslstfrm.cpp 19 Jun 2003 16:58:30 -0000 1.14 --- vrslstfrm.cpp 5 Jul 2003 01:16:46 -0000 1.15 *************** *** 53,57 **** key << *tkey; delete tkey; ! pvrtf->fillWithVerses(target, &key, true, false); } } --- 53,57 ---- key << *tkey; delete tkey; ! pvrtf->fillWithVerses(target, &key, 0, true, false); } } *************** *** 129,133 **** } if (target) { ! RTFHintForm->rtfDrawer->fillWithVerses(target, &verses, true, true); RTFHintForm->rtfDrawer->SelectAll(); RTFHintForm->rtfDrawer->CopyToClipboard(); --- 129,133 ---- } if (target) { ! RTFHintForm->rtfDrawer->fillWithVerses(target, &verses, 0, true, true); RTFHintForm->rtfDrawer->SelectAll(); RTFHintForm->rtfDrawer->CopyToClipboard(); From sword@www.crosswire.org Sat Jul 5 01:16:49 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 18:16:49 -0700 Subject: [sword-cvs] sword/src/modules/filters osisfootnotes.cpp,1.8,1.9 osisrtf.cpp,1.11,1.12 osisscripref.cpp,1.1,1.2 unicodertf.cpp,1.16,1.17 Message-ID: <200307050116.h651Gnj24038@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/modules/filters In directory www:/tmp/cvs-serv24006/src/modules/filters Modified Files: osisfootnotes.cpp osisrtf.cpp osisscripref.cpp unicodertf.cpp Log Message: Changed entry attribute osis footnotes around to better facilitate separation of crossRefs from other kinds of footnotes Index: osisfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisfootnotes.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** osisfootnotes.cpp 27 Jun 2003 21:51:50 -0000 1.8 --- osisfootnotes.cpp 5 Jul 2003 01:16:46 -0000 1.9 *************** *** 10,13 **** --- 10,14 ---- #include #include + #include #include #ifndef __GNUC__ *************** *** 50,55 **** --- 51,58 ---- SWBuf tagText; XMLTag startTag; + SWBuf refs = ""; int footnoteNum = 1; char buf[254]; + VerseKey parser = key->getText(); SWBuf orig = text; *************** *** 75,92 **** XMLTag tag(token); ! if (!strcmp(tag.getName(), "note") && ((!tag.getAttribute("type")) || (strcmp(tag.getAttribute("type"), "crossReference")))) { if (!tag.isEndTag() && (!tag.isEmpty())) { startTag = tag; hide = true; tagText = ""; - if (option) { // we want the tag in the text - text += '<'; - text.append(token); - text += '>'; - } continue; } if (hide && tag.isEndTag()) { ! if (module->isProcessEntryAttributes() && option) { sprintf(buf, "%i", footnoteNum++); ListString attributes = startTag.getAttributeNames(); --- 78,91 ---- XMLTag tag(token); ! if (!strcmp(tag.getName(), "note")) { if (!tag.isEndTag() && (!tag.isEmpty())) { + refs = ""; startTag = tag; hide = true; tagText = ""; continue; } if (hide && tag.isEndTag()) { ! if (module->isProcessEntryAttributes()) { sprintf(buf, "%i", footnoteNum++); ListString attributes = startTag.getAttributeNames(); *************** *** 95,114 **** } module->getEntryAttributes()["Footnote"][buf]["body"] = tagText; ! if (option) { // we want the tag in the text ! text.append(tagText); } } hide = false; ! if (!option) { // we don't want the tag in the text anymore ! continue; } } } // if not a heading token, keep token in text if (!hide) { text += '<'; text.append(token); text += '>'; } continue; --- 94,129 ---- } module->getEntryAttributes()["Footnote"][buf]["body"] = tagText; ! startTag.setAttribute("swordFootnote", buf); ! if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) { ! if (!refs.length()) ! refs = parser.ParseVerseList(tagText.c_str(), parser, true).getRangeText(); ! module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str(); } } hide = false; ! if ((option) || ((startTag.getAttribute("type") && (!strcmp(startTag.getAttribute("type"), "crossReference"))))) { // we want the tag in the text; crossReferences are handled by another filter ! text += startTag; ! text.append(tagText); } + else continue; } } // if not a heading token, keep token in text + if ((!strcmp(tag.getName(), "reference")) && (!tag.isEndTag())) { + SWBuf osisRef = tag.getAttribute("osisRef"); + if (refs.length()) + refs += "; "; + refs += osisRef; + } if (!hide) { text += '<'; text.append(token); text += '>'; + } + else { + tagText += '<'; + tagText.append(token); + tagText += '>'; } continue; Index: osisrtf.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisrtf.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** osisrtf.cpp 28 Jun 2003 21:31:20 -0000 1.11 --- osisrtf.cpp 5 Jul 2003 01:16:46 -0000 1.12 *************** *** 129,137 **** else if (!strcmp(tag.getName(), "note")) { if (!tag.isEmpty() && !tag.isEndTag()) { - SWBuf footnoteNum = userData["fn"]; SWBuf type = tag.getAttribute("type"); if (type != "strongsMarkup") { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off ! int footnoteNumber = (footnoteNum.length()) ? atoi(footnoteNum.c_str()) : 1; VerseKey *vkey; // see if we have a VerseKey * or descendant --- 129,136 ---- else if (!strcmp(tag.getName(), "note")) { if (!tag.isEmpty() && !tag.isEndTag()) { SWBuf type = tag.getAttribute("type"); if (type != "strongsMarkup") { // leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off ! SWBuf footnoteNumber = tag.getAttribute("swordFootnote"); VerseKey *vkey; // see if we have a VerseKey * or descendant *************** *** 141,148 **** catch ( ... ) { } if (vkey) { ! buf.appendFormatted("{\\super *%c%i.%i} ", ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'), vkey->Verse(), footnoteNumber); ! SWBuf tmp; ! tmp.appendFormatted("%i", ++footnoteNumber); ! userData["fn"] = tmp.c_str(); } } --- 140,144 ---- catch ( ... ) { } if (vkey) { ! buf.appendFormatted("{\\super *%c%i.%s} ", ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n'), vkey->Verse(), footnoteNumber.c_str()); } } *************** *** 181,185 **** // poetry, etc ! else if (!strcmp(tag.getName(), "line")) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { buf += "{"; --- 177,181 ---- // poetry, etc ! else if ((!strcmp(tag.getName(), "line")) || ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line")))) { if ((!tag.isEndTag()) && (!tag.isEmpty())) { buf += "{"; Index: osisscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisscripref.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osisscripref.cpp 27 Jun 2003 06:18:05 -0000 1.1 --- osisscripref.cpp 5 Jul 2003 01:16:46 -0000 1.2 *************** *** 65,96 **** XMLTag tag(token); ! if (!strcmp(tag.getName(), "note") && !strcmp(tag.getAttribute("type"), "crossReference")) { if (!tag.isEndTag() && (!tag.isEmpty())) { startTag = tag; ! hide = true; ! tagText = ""; ! if (option) { // we want the tag in the text ! text += '<'; ! text.append(token); ! text += '>'; ! } ! continue; ! } ! if (hide && tag.isEndTag()) { ! if (module->isProcessEntryAttributes() && option) { ! sprintf(buf, "%i", footnoteNum++); ! ListString attributes = startTag.getAttributeNames(); ! for (ListString::iterator it = attributes.begin(); it != attributes.end(); it++) { ! module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str()); ! } ! module->getEntryAttributes()["Footnote"][buf]["body"] = tagText; if (option) { // we want the tag in the text ! text.append(tagText); } } hide = false; ! if (!option) { // we don't want the tag in the text anymore ! continue; } } } --- 65,88 ---- XMLTag tag(token); ! if (!strcmp(tag.getName(), "note")) { if (!tag.isEndTag() && (!tag.isEmpty())) { startTag = tag; ! if ((tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "crossReference"))) { ! hide = true; ! tagText = ""; if (option) { // we want the tag in the text ! text += '<'; ! text.append(token); ! text += '>'; } + continue; } + } + if (hide && tag.isEndTag()) { hide = false; ! if (option) { // we want the tag in the text ! text.append(tagText); // end tag gets added further down } + else continue; // don't let the end tag get added to the text } } *************** *** 101,104 **** --- 93,101 ---- text.append(token); text += '>'; + } + else { + tagText += '<'; + tagText.append(token); + tagText += '>'; } continue; Index: unicodertf.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/unicodertf.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** unicodertf.cpp 27 Jun 2003 06:13:16 -0000 1.16 --- unicodertf.cpp 5 Jul 2003 01:16:46 -0000 1.17 *************** *** 58,82 **** from += subsequent; if (ch < 0x10000) { ! utf16 = (signed short)ch; ! text += '\\'; ! text += 'u'; ! sprintf(digit, "%d", utf16); ! text += digit; ! text += '?'; ! } ! else { ! utf16 = (signed short)((ch - 0x10000) / 0x400 + 0xD800); ! text += '\\'; ! text += 'u'; ! sprintf(digit, "%d", utf16); ! text += digit; ! text += '?'; ! utf16 = (signed short)((ch - 0x10000) % 0x400 + 0xDC00); ! text += '\\'; ! text += 'u'; ! sprintf(digit, "%d", utf16); ! text += digit; ! text += '?'; ! } } --- 58,82 ---- from += subsequent; if (ch < 0x10000) { ! utf16 = (signed short)ch; ! text += '\\'; ! text += 'u'; ! sprintf(digit, "%d", utf16); ! text += digit; ! text += '?'; ! } ! else { ! utf16 = (signed short)((ch - 0x10000) / 0x400 + 0xD800); ! text += '\\'; ! text += 'u'; ! sprintf(digit, "%d", utf16); ! text += digit; ! text += '?'; ! utf16 = (signed short)((ch - 0x10000) % 0x400 + 0xDC00); ! text += '\\'; ! text += 'u'; ! sprintf(digit, "%d", utf16); ! text += digit; ! text += '?'; ! } } From sword@www.crosswire.org Sat Jul 5 01:16:49 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 18:16:49 -0700 Subject: [sword-cvs] sword/src/utilfuns utilxml.cpp,1.8,1.9 Message-ID: <200307050116.h651Gnj24040@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/utilfuns In directory www:/tmp/cvs-serv24006/src/utilfuns Modified Files: utilxml.cpp Log Message: Changed entry attribute osis footnotes around to better facilitate separation of crossRefs from other kinds of footnotes Index: utilxml.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/utilfuns/utilxml.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** utilxml.cpp 26 Jun 2003 04:33:31 -0000 1.8 --- utilxml.cpp 5 Jul 2003 01:16:46 -0000 1.9 *************** *** 46,49 **** --- 46,51 ---- break; } + if (buf[i-1] == '/') + empty = true; parsed = true; if (name) delete [] name; From sword@www.crosswire.org Sat Jul 5 04:58:44 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 21:58:44 -0700 Subject: [sword-cvs] sword/bindings flatapi.cpp,1.6,1.7 Message-ID: <200307050458.h654wij07707@www.crosswire.org> Update of /usr/local/cvsroot/sword/bindings In directory www:/tmp/cvs-serv7690/bindings Modified Files: flatapi.cpp Log Message: Added SWOptionFilter Index: flatapi.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/bindings/flatapi.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** flatapi.cpp 18 Oct 2002 01:57:47 -0000 1.6 --- flatapi.cpp 5 Jul 2003 04:58:42 -0000 1.7 *************** *** 113,117 **** SWHANDLE SWMgr_getGlobalOptionsIterator(SWHANDLE hmgr) { SWMgr *mgr = (SWMgr *)hmgr; ! static OptionsList::iterator it; if (mgr) --- 113,117 ---- SWHANDLE SWMgr_getGlobalOptionsIterator(SWHANDLE hmgr) { SWMgr *mgr = (SWMgr *)hmgr; ! static StringList::iterator it; if (mgr) *************** *** 124,128 **** SWHANDLE SWMgr_getGlobalOptionValuesIterator(SWHANDLE hmgr, const char *option) { SWMgr *mgr = (SWMgr *)hmgr; ! static OptionsList::iterator it; if (mgr) --- 124,128 ---- SWHANDLE SWMgr_getGlobalOptionValuesIterator(SWHANDLE hmgr, const char *option) { SWMgr *mgr = (SWMgr *)hmgr; ! static StringList::iterator it; if (mgr) *************** *** 242,246 **** void stringlist_iterator_next(SWHANDLE hsli) { ! OptionsList::iterator *sli = (OptionsList::iterator *)hsli; (*sli)++; } --- 242,246 ---- void stringlist_iterator_next(SWHANDLE hsli) { ! StringList::iterator *sli = (StringList::iterator *)hsli; (*sli)++; } *************** *** 248,252 **** const char *stringlist_iterator_val(SWHANDLE hsli) { ! OptionsList::iterator *sli = (OptionsList::iterator *)hsli; return (const char *)(*sli)->c_str(); } --- 248,252 ---- const char *stringlist_iterator_val(SWHANDLE hsli) { ! StringList::iterator *sli = (StringList::iterator *)hsli; return (const char *)(*sli)->c_str(); } From sword@www.crosswire.org Sat Jul 5 04:58:44 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 21:58:44 -0700 Subject: [sword-cvs] sword/src/mgr localemgr.cpp,1.15,1.16 swmgr.cpp,1.92,1.93 Message-ID: <200307050458.h654wij07726@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/mgr In directory www:/tmp/cvs-serv7690/src/mgr Modified Files: localemgr.cpp swmgr.cpp Log Message: Added SWOptionFilter Index: localemgr.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/mgr/localemgr.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** localemgr.cpp 27 Jun 2003 01:41:07 -0000 1.15 --- localemgr.cpp 5 Jul 2003 04:58:42 -0000 1.16 *************** *** 42,49 **** --- 42,51 ---- SWORD_NAMESPACE_START + LocaleMgr LocaleMgr::systemLocaleMgr; LocaleMgr::LocaleMgr(const char *iConfigPath) { + locales = new LocaleMap(); char *prefixPath = 0; char *configPath = 0; *************** *** 99,102 **** --- 101,105 ---- delete [] defaultLocaleName; deleteLocales(); + delete locales; } *************** *** 118,127 **** SWLocale *locale = new SWLocale(newmodfile.c_str()); if (locale->getName()) { ! it = locales.find(locale->getName()); ! if (it != locales.end()) { *((*it).second) += *locale; delete locale; } ! else locales.insert(LocaleMap::value_type(locale->getName(), locale)); } else delete locale; --- 121,130 ---- SWLocale *locale = new SWLocale(newmodfile.c_str()); if (locale->getName()) { ! it = locales->find(locale->getName()); ! if (it != locales->end()) { *((*it).second) += *locale; delete locale; } ! else locales->insert(LocaleMap::value_type(locale->getName(), locale)); } else delete locale; *************** *** 137,144 **** LocaleMap::iterator it; ! for (it = locales.begin(); it != locales.end(); it++) delete (*it).second; ! locales.erase(locales.begin(), locales.end()); } --- 140,147 ---- LocaleMap::iterator it; ! for (it = locales->begin(); it != locales->end(); it++) delete (*it).second; ! locales->erase(locales->begin(), locales->end()); } *************** *** 147,152 **** LocaleMap::iterator it; ! it = locales.find(name); ! if (it != locales.end()) return (*it).second; --- 150,155 ---- LocaleMap::iterator it; ! it = locales->find(name); ! if (it != locales->end()) return (*it).second; *************** *** 157,161 **** std::list LocaleMgr::getAvailableLocales() { std::list retVal; ! for (LocaleMap::iterator it = locales.begin(); it != locales.end(); it++) retVal.push_back((*it).second->getName()); --- 160,164 ---- std::list LocaleMgr::getAvailableLocales() { std::list retVal; ! for (LocaleMap::iterator it = locales->begin(); it != locales->end(); it++) retVal.push_back((*it).second->getName()); Index: swmgr.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/mgr/swmgr.cpp,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** swmgr.cpp 27 Jun 2003 06:25:37 -0000 1.92 --- swmgr.cpp 5 Jul 2003 04:58:42 -0000 1.93 *************** *** 860,864 **** if (it != optionFilters.end()) { module->AddOptionFilter((*it).second); // add filter to module and option as a valid option ! OptionsList::iterator loop; for (loop = options.begin(); loop != options.end(); loop++) { if (!strcmp((*loop).c_str(), (*it).second->getOptionName())) --- 860,864 ---- if (it != optionFilters.end()) { module->AddOptionFilter((*it).second); // add filter to module and option as a valid option ! StringList::iterator loop; for (loop = options.begin(); loop != options.end(); loop++) { if (!strcmp((*loop).c_str(), (*it).second->getOptionName())) *************** *** 1115,1119 **** ! OptionsList SWMgr::getGlobalOptions() { return options; --- 1115,1119 ---- ! StringList SWMgr::getGlobalOptions() { return options; *************** *** 1121,1127 **** ! OptionsList SWMgr::getGlobalOptionValues(const char *option) { ! OptionsList options; for (FilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) { if ((*it).second->getOptionName()) { --- 1121,1127 ---- ! StringList SWMgr::getGlobalOptionValues(const char *option) { ! StringList options; for (FilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) { if ((*it).second->getOptionName()) { From sword@www.crosswire.org Sat Jul 5 04:58:44 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 21:58:44 -0700 Subject: [sword-cvs] sword/src/utilfuns utilxml.cpp,1.9,1.10 Message-ID: <200307050458.h654wij07738@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/utilfuns In directory www:/tmp/cvs-serv7690/src/utilfuns Modified Files: utilxml.cpp Log Message: Added SWOptionFilter Index: utilxml.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/utilfuns/utilxml.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** utilxml.cpp 5 Jul 2003 01:16:46 -0000 1.9 --- utilxml.cpp 5 Jul 2003 04:58:42 -0000 1.10 *************** *** 104,114 **** } ! const ListString XMLTag::getAttributeNames() const { ! ListString retVal; if (!parsed) parse(); ! for (MapStringPair::iterator it = attributes.begin(); it != attributes.end(); it++) retVal.push_back(it->first.c_str()); --- 104,114 ---- } ! const StringList XMLTag::getAttributeNames() const { ! StringList retVal; if (!parsed) parse(); ! for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) retVal.push_back(it->first.c_str()); *************** *** 150,154 **** parse(); ! MapStringPair::iterator it = attributes.find(attribName); const char *retVal = (it == attributes.end()) ? 0 : it->second.c_str(); if ((retVal) && (partNum > -1)) --- 150,154 ---- parse(); ! StringPairMap::iterator it = attributes.find(attribName); const char *retVal = (it == attributes.end()) ? 0 : it->second.c_str(); if ((retVal) && (partNum > -1)) *************** *** 177,181 **** tag += getName(); ! for (MapStringPair::iterator it = attributes.begin(); it != attributes.end(); it++) { tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); } --- 177,181 ---- tag += getName(); ! for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) { tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str()); } From sword@www.crosswire.org Sat Jul 5 04:58:45 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 21:58:45 -0700 Subject: [sword-cvs] sword/utilities mod2osis.cpp,1.8,1.9 Message-ID: <200307050458.h654wjj07742@www.crosswire.org> Update of /usr/local/cvsroot/sword/utilities In directory www:/tmp/cvs-serv7690/utilities Modified Files: mod2osis.cpp Log Message: Added SWOptionFilter Index: mod2osis.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/utilities/mod2osis.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mod2osis.cpp 22 Nov 2002 04:46:03 -0000 1.8 --- mod2osis.cpp 5 Jul 2003 04:58:42 -0000 1.9 *************** *** 52,58 **** SWMgr mgr(new MarkupFilterMgr(FMT_OSIS)); ! OptionsList options = mgr.getGlobalOptions(); ! for (OptionsList::iterator it = options.begin(); it != options.end(); it++) { ! OptionsList values = mgr.getGlobalOptionValues(it->c_str()); if (find(values.begin(), values.end(), "On") != values.end()) { mgr.setGlobalOption(it->c_str(), "On"); --- 52,58 ---- SWMgr mgr(new MarkupFilterMgr(FMT_OSIS)); ! StringList options = mgr.getGlobalOptions(); ! for (StringList::iterator it = options.begin(); it != options.end(); it++) { ! StringList values = mgr.getGlobalOptionValues(it->c_str()); if (find(values.begin(), values.end(), "On") != values.end()) { mgr.setGlobalOption(it->c_str(), "On"); From sword@www.crosswire.org Sat Jul 5 04:58:45 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 21:58:45 -0700 Subject: [sword-cvs] sword/include swoptfilter.h,NONE,1.1 gbffootnotes.h,1.12,1.13 gbfheadings.h,1.5,1.6 gbfmorph.h,1.5,1.6 gbfosis.h,1.9,1.10 gbfredletterwords.h,1.3,1.4 gbfstrongs.h,1.11,1.12 localemgr.h,1.15,1.16 osisfootnotes.h,1.1,1.2 osisheadings.h,1.1,1.2 osislemma.h,1.1,1.2 osismorph.h,1.2,1.3 osisredletterwords.h,1.1,1.2 osisscripref.h,1.1,1.2 osisstrongs.h,1.2,1.3 plainfootnotes.h,1.6,1.7 swfilter.h,1.16,1.17 swmgr.h,1.54,1.55 swmodule.h,1.66,1.67 thmlfootnotes.h,1.4,1.5 thmlheadings.h,1.4,1.5 thmllemma.h,1.4,1.5 thmlmorph.h,1.4,1.5 thmlscripref.h,1.4,1.5 thmlstrongs.h,1.4,1.5 thmlvariants.h,1.4,1.5 utf8cantillation.h,1.4,1.5 utf8greekaccents.h,1.4,1.5 utf8hebrewpoints.h,1.4,1.5 utilxml.h,1.5,1.6 Message-ID: <200307050458.h654wjj07777@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv7690/include Modified Files: gbffootnotes.h gbfheadings.h gbfmorph.h gbfosis.h gbfredletterwords.h gbfstrongs.h localemgr.h osisfootnotes.h osisheadings.h osislemma.h osismorph.h osisredletterwords.h osisscripref.h osisstrongs.h plainfootnotes.h swfilter.h swmgr.h swmodule.h thmlfootnotes.h thmlheadings.h thmllemma.h thmlmorph.h thmlscripref.h thmlstrongs.h thmlvariants.h utf8cantillation.h utf8greekaccents.h utf8hebrewpoints.h utilxml.h Added Files: swoptfilter.h Log Message: Added SWOptionFilter --- NEW FILE: swoptfilter.h --- /*************************************************************************** * * $Id: swoptfilter.h,v 1.1 2003/07/05 04:58:42 scribe Exp $ * * Copyright 1998 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 SWOPTFILTER_H #define SWOPTFILTER_H #include SWORD_NAMESPACE_START /** This Filter shows/hides strong's numbers in a OSIS text */ class SWDLLEXPORT SWOptionFilter : public SWFilter { protected: SWBuf optionValue; const char *optName; const char *optTip; const StringList *optValues; bool option; public: SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues); virtual ~SWOptionFilter(); virtual const char *getOptionName() { return optName; } virtual const char *getOptionTip() { return optTip; } virtual void setOptionValue(const char *ival); virtual const char *getOptionValue(); virtual StringList getOptionValues() { return *optValues; } }; SWORD_NAMESPACE_END #endif Index: gbffootnotes.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/gbffootnotes.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gbffootnotes.h 28 Feb 2003 13:31:37 -0000 1.12 --- gbffootnotes.h 5 Jul 2003 04:58:42 -0000 1.13 *************** *** 22,26 **** #define GBFFOOTNOTES_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define GBFFOOTNOTES_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides footnotes in a GBF text */ ! class SWDLLEXPORT GBFFootnotes:public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: GBFFootnotes(); virtual ~GBFFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides footnotes in a GBF text */ ! class SWDLLEXPORT GBFFootnotes : public SWOptionFilter { public: GBFFootnotes(); virtual ~GBFFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: gbfheadings.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/gbfheadings.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gbfheadings.h 28 Feb 2003 13:31:37 -0000 1.5 --- gbfheadings.h 5 Jul 2003 04:58:42 -0000 1.6 *************** *** 22,26 **** #define GBFHEADINGS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define GBFHEADINGS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides headings in a GBF text */ ! class SWDLLEXPORT GBFHeadings : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: GBFHeadings(); virtual ~GBFHeadings(); virtual char processText (SWBuf &text, const SWKey * key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a GBF text */ ! class SWDLLEXPORT GBFHeadings : public SWOptionFilter { public: GBFHeadings(); virtual ~GBFHeadings(); virtual char processText (SWBuf &text, const SWKey * key = 0, const SWModule *module = 0); }; Index: gbfmorph.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/gbfmorph.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gbfmorph.h 28 Feb 2003 13:31:37 -0000 1.5 --- gbfmorph.h 5 Jul 2003 04:58:42 -0000 1.6 *************** *** 22,26 **** #define GBFMORPH_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define GBFMORPH_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides morph tags in a GBF text */ ! class SWDLLEXPORT GBFMorph : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: GBFMorph(); virtual ~GBFMorph(); virtual char processText(SWBuf &text, const SWKey * key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides morph tags in a GBF text */ ! class SWDLLEXPORT GBFMorph : public SWOptionFilter { public: GBFMorph(); virtual ~GBFMorph(); virtual char processText(SWBuf &text, const SWKey * key = 0, const SWModule *module = 0); }; Index: gbfosis.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/gbfosis.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gbfosis.h 27 Jun 2003 01:41:06 -0000 1.9 --- gbfosis.h 5 Jul 2003 04:58:42 -0000 1.10 *************** *** 27,30 **** --- 27,31 ---- SWORD_NAMESPACE_START + class QuoteStack { private: *************** *** 44,48 **** }; ! std::stack quotes; public: QuoteStack(); --- 45,50 ---- }; ! typedef std::stack QuoteInstanceStack; ! QuoteInstanceStack quotes; public: QuoteStack(); Index: gbfredletterwords.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/gbfredletterwords.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gbfredletterwords.h 20 Feb 2003 07:25:19 -0000 1.3 --- gbfredletterwords.h 5 Jul 2003 04:58:42 -0000 1.4 *************** *** 22,26 **** #define GBFREDLETTERWORDS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define GBFREDLETTERWORDS_H ! #include SWORD_NAMESPACE_START *************** *** 30,49 **** * to have this kind of markup in the text. */ ! class SWDLLEXPORT GBFRedLetterWords : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: GBFRedLetterWords(); virtual ~GBFRedLetterWords(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue (const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 30,38 ---- * to have this kind of markup in the text. */ ! class SWDLLEXPORT GBFRedLetterWords : public SWOptionFilter { public: GBFRedLetterWords(); virtual ~GBFRedLetterWords(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0); }; Index: gbfstrongs.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/gbfstrongs.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gbfstrongs.h 28 Feb 2003 13:31:37 -0000 1.11 --- gbfstrongs.h 5 Jul 2003 04:58:42 -0000 1.12 *************** *** 22,26 **** #define GBFSTRONGS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define GBFSTRONGS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides strong's numbers in a GBF text */ ! class SWDLLEXPORT GBFStrongs : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: GBFStrongs(); virtual ~GBFStrongs(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides strong's numbers in a GBF text */ ! class SWDLLEXPORT GBFStrongs : public SWOptionFilter { public: GBFStrongs(); virtual ~GBFStrongs(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: localemgr.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/localemgr.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** localemgr.h 27 Jun 2003 01:41:06 -0000 1.15 --- localemgr.h 5 Jul 2003 04:58:42 -0000 1.16 *************** *** 33,38 **** SWORD_NAMESPACE_START ! typedef std::map < SWBuf, SWLocale *, std::less < SWBuf > >LocaleMap; ! /** * The LocaleMgr class handles all the different locales of Sword. --- 33,39 ---- SWORD_NAMESPACE_START ! ! typedef std::list StringList; ! typedef std::map < SWBuf, SWLocale *, std::less < SWBuf > > LocaleMap; /** * The LocaleMgr class handles all the different locales of Sword. *************** *** 46,114 **** * To get a list of availble locales use @see getAvailableLocales */ ! class SWDLLEXPORT LocaleMgr ! { private: ! void deleteLocales (); ! char *defaultLocaleName; ! LocaleMgr(const LocaleMgr &); protected: ! LocaleMap locales; public: ! /** Default constructor of LocaleMgr ! * You do normally not need this constructor, use LocaleMgr::systemLocaleMgr instead. ! */ ! LocaleMgr (const char *iConfigPath = 0); ! /** ! * Default destructor of LocaleMgr ! */ ! virtual ~ LocaleMgr (); ! /** Get the locale connected with the name "name". ! * ! * @param name The name of the locale you want to have. For example use getLocale("de") to get the locale for the German language. ! * @return Returns the locale object if the locale with the name given as parameter was found. If it wasn't found return NULL. ! */ ! virtual SWLocale *getLocale (const char *name); ! /** Get the list of available locales. ! * ! * @return Returns a list of strings, which contains the names of the available locales. ! */ ! virtual std::list < SWBuf > getAvailableLocales (); ! ! /** Returns translated text. ! * This function uses both parameters to return the translated version of the given text. ! * ! * @param text The text to translate into the language given by the first parameter. ! * @param localeName The name of the locale Sword should use ! * @return Returns the translated text. ! */ ! virtual const char *translate (const char *text, const char *localeName = 0); ! /** Get the default locale name. To set it use @see setDefaultLocaleName ! * ! * @return Returns the default locale name ! */ ! virtual const char *getDefaultLocaleName (); ! /** Set the new standard locale of Sword. ! * ! * @param name The name of the new default locale ! */ ! virtual void setDefaultLocaleName (const char *name); ! /** The LocaleMgr object used globally in the Sword world. ! * Do not create your own LocaleMgr, use this static object instead. ! */ ! static LocaleMgr systemLocaleMgr; - - /** Augment this localmgr with all locale.conf files in a directory - */ - virtual void loadConfigDir(const char *ipath); - }; --- 47,114 ---- * To get a list of availble locales use @see getAvailableLocales */ ! class SWDLLEXPORT LocaleMgr { private: ! void deleteLocales(); ! char *defaultLocaleName; ! LocaleMgr(const LocaleMgr &); protected: ! LocaleMap *locales; public: ! /** Default constructor of LocaleMgr ! * You do normally not need this constructor, use LocaleMgr::systemLocaleMgr instead. ! */ ! LocaleMgr(const char *iConfigPath = 0); ! /** ! * Default destructor of LocaleMgr ! */ ! virtual ~LocaleMgr(); ! /** Get the locale connected with the name "name". ! * ! * @param name The name of the locale you want to have. For example use getLocale("de") to get the locale for the German language. ! * @return Returns the locale object if the locale with the name given as parameter was found. If it wasn't found return NULL. ! */ ! virtual SWLocale *getLocale(const char *name); ! /** Get the list of available locales. ! * ! * @return Returns a list of strings, which contains the names of the available locales. ! */ ! virtual StringList getAvailableLocales(); ! /** Returns translated text. ! * This function uses both parameters to return the translated version of the given text. ! * ! * @param text The text to translate into the language given by the first parameter. ! * @param localeName The name of the locale Sword should use ! * @return Returns the translated text. ! */ ! virtual const char *translate(const char *text, const char *localeName = 0); ! /** Get the default locale name. To set it use @see setDefaultLocaleName ! * ! * @return Returns the default locale name ! */ ! virtual const char *getDefaultLocaleName(); ! /** Set the new standard locale of Sword. ! * ! * @param name The name of the new default locale ! */ ! virtual void setDefaultLocaleName(const char *name); ! ! /** The LocaleMgr object used globally in the Sword world. ! * Do not create your own LocaleMgr, use this static object instead. ! */ ! static LocaleMgr systemLocaleMgr; ! ! ! /** Augment this localmgr with all locale.conf files in a directory ! */ ! virtual void loadConfigDir(const char *ipath); }; Index: osisfootnotes.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osisfootnotes.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osisfootnotes.h 17 Jun 2003 22:14:18 -0000 1.1 --- osisfootnotes.h 5 Jul 2003 04:58:42 -0000 1.2 *************** *** 22,26 **** #define OSISFOOTNOTES_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISFOOTNOTES_H ! #include SWORD_NAMESPACE_START *************** *** 28,48 **** /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISFootnotes : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; ! public: OSISFootnotes(); virtual ~OSISFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISFootnotes : public SWOptionFilter { public: OSISFootnotes(); virtual ~OSISFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: osisheadings.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osisheadings.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osisheadings.h 30 Apr 2003 08:20:03 -0000 1.1 --- osisheadings.h 5 Jul 2003 04:58:42 -0000 1.2 *************** *** 22,26 **** #define OSISHEADINGS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISHEADINGS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISHeadings : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: OSISHeadings(); virtual ~OSISHeadings(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISHeadings : public SWOptionFilter { public: OSISHeadings(); virtual ~OSISHeadings(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: osislemma.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osislemma.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osislemma.h 27 Jun 2003 06:18:44 -0000 1.1 --- osislemma.h 5 Jul 2003 04:58:42 -0000 1.2 *************** *** 22,26 **** #define OSISLEMMA_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISLEMMA_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISLemma : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: OSISLemma(); virtual ~OSISLemma(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISLemma : public SWOptionFilter { public: OSISLemma(); virtual ~OSISLemma(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: osismorph.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osismorph.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osismorph.h 20 Feb 2003 07:25:19 -0000 1.2 --- osismorph.h 5 Jul 2003 04:58:42 -0000 1.3 *************** *** 22,26 **** #define OSISMORPH_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISMORPH_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides morph tags in a OSIS text */ ! class SWDLLEXPORT OSISMorph : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: OSISMorph(); virtual ~OSISMorph(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip () { return optTip; } - virtual void setOptionValue (const char *ival); - virtual const char *getOptionValue (); - virtual OptionsList getOptionValues () { return options; } }; --- 28,36 ---- /** This Filter shows/hides morph tags in a OSIS text */ ! class SWDLLEXPORT OSISMorph : public SWOptionFilter { public: OSISMorph(); virtual ~OSISMorph(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: osisredletterwords.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osisredletterwords.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osisredletterwords.h 27 Jun 2003 06:18:44 -0000 1.1 --- osisredletterwords.h 5 Jul 2003 04:58:42 -0000 1.2 *************** *** 22,26 **** #define OSISREDLETTERWORDS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISREDLETTERWORDS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISRedLetterWords : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: OSISRedLetterWords(); virtual ~OSISRedLetterWords(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISRedLetterWords : public SWOptionFilter { public: OSISRedLetterWords(); virtual ~OSISRedLetterWords(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: osisscripref.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osisscripref.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osisscripref.h 27 Jun 2003 06:18:44 -0000 1.1 --- osisscripref.h 5 Jul 2003 04:58:42 -0000 1.2 *************** *** 22,26 **** #define OSISSCRIPREF_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISSCRIPREF_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISScripref : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: OSISScripref(); virtual ~OSISScripref(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a OSIS text */ ! class SWDLLEXPORT OSISScripref : public SWOptionFilter { public: OSISScripref(); virtual ~OSISScripref(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: osisstrongs.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/osisstrongs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osisstrongs.h 20 Feb 2003 07:25:19 -0000 1.2 --- osisstrongs.h 5 Jul 2003 04:58:42 -0000 1.3 *************** *** 22,26 **** #define OSISSTRONGS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define OSISSTRONGS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides strong's numbers in a OSIS text */ ! class SWDLLEXPORT OSISStrongs : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: OSISStrongs(); virtual ~OSISStrongs(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides strong's numbers in a OSIS text */ ! class SWDLLEXPORT OSISStrongs : public SWOptionFilter { public: OSISStrongs(); virtual ~OSISStrongs(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: plainfootnotes.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/plainfootnotes.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** plainfootnotes.h 20 Feb 2003 07:25:19 -0000 1.6 --- plainfootnotes.h 5 Jul 2003 04:58:42 -0000 1.7 *************** *** 22,26 **** #define PLAINFOOTNOTES_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define PLAINFOOTNOTES_H ! #include SWORD_NAMESPACE_START *************** *** 31,51 **** *@author The team of BibleTime */ ! class SWDLLEXPORT PLAINFootnotes : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; ! public: PLAINFootnotes(); virtual ~PLAINFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 31,39 ---- *@author The team of BibleTime */ ! class SWDLLEXPORT PLAINFootnotes : public SWOptionFilter { public: PLAINFootnotes(); virtual ~PLAINFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: swfilter.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/swfilter.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** swfilter.h 28 Feb 2003 13:31:37 -0000 1.16 --- swfilter.h 5 Jul 2003 04:58:42 -0000 1.17 *************** *** 34,38 **** * The type definitoin for option types */ ! typedef std::list < SWBuf > OptionsList; class SWModule; --- 34,38 ---- * The type definitoin for option types */ ! typedef std::list < SWBuf > StringList; class SWModule; *************** *** 61,66 **** * @return list of option values */ ! virtual OptionsList getOptionValues () { ! OptionsList options; return options; } --- 61,66 ---- * @return list of option values */ ! virtual StringList getOptionValues () { ! StringList options; return options; } Index: swmgr.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/swmgr.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** swmgr.h 27 Jun 2003 01:41:06 -0000 1.54 --- swmgr.h 5 Jul 2003 04:58:42 -0000 1.55 *************** *** 54,57 **** --- 54,58 ---- typedef std::map < SWBuf, SWModule *, std::less < SWBuf > >ModMap; typedef std::map < SWBuf, SWFilter * >FilterMap; + typedef std::list < SWBuf >StringList; /** SWMgr is the main class of the Sword library. *************** *** 86,90 **** SWFilter *transliterator; FilterList cleanupFilters; ! OptionsList options; virtual void init(); // use to initialize before loading modules virtual char AddModToConfig(int conffd, const char *fname); --- 87,91 ---- SWFilter *transliterator; FilterList cleanupFilters; ! StringList options; virtual void init(); // use to initialize before loading modules virtual char AddModToConfig(int conffd, const char *fname); *************** *** 96,100 **** ConfigEntMap::iterator start, ConfigEntMap::iterator end); ! std::list augPaths; /** --- 97,101 ---- ConfigEntMap::iterator start, ConfigEntMap::iterator end); ! StringList augPaths; /** *************** *** 137,141 **** * */ ! static void findConfig(char *configType, char **prefixPath, char **configPath, std::list *augPaths = 0); /** The global config object. * This is the global config object. It contains all items of all modules, --- 138,142 ---- * */ ! static void findConfig(char *configType, char **prefixPath, char **configPath, StringList *augPaths = 0); /** The global config object. * This is the global config object. It contains all items of all modules, *************** *** 245,253 **** * @return This function returns a list of global options. */ ! virtual OptionsList getGlobalOptions(); /** * */ ! virtual OptionsList getGlobalOptionValues(const char *option); /** * Sets the cipher key for the given module. This function updates the key --- 246,254 ---- * @return This function returns a list of global options. */ ! virtual StringList getGlobalOptions(); /** * */ ! virtual StringList getGlobalOptionValues(const char *option); /** * Sets the cipher key for the given module. This function updates the key Index: swmodule.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/swmodule.h,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** swmodule.h 27 Jun 2003 01:41:07 -0000 1.66 --- swmodule.h 5 Jul 2003 04:58:42 -0000 1.67 *************** *** 53,57 **** typedef std::list < SWFilter * >FilterList; - typedef std::map < SWBuf, SWBuf, std::less < SWBuf > > AttributeValue; typedef std::map < SWBuf, AttributeValue, std::less < SWBuf > > AttributeList; --- 53,56 ---- Index: thmlfootnotes.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmlfootnotes.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmlfootnotes.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmlfootnotes.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define THMLFOOTNOTES_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define THMLFOOTNOTES_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides footnotes in a ThML text */ ! class SWDLLEXPORT ThMLFootnotes : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: ThMLFootnotes(); virtual ~ThMLFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides footnotes in a ThML text */ ! class SWDLLEXPORT ThMLFootnotes : public SWOptionFilter { public: ThMLFootnotes(); virtual ~ThMLFootnotes(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: thmlheadings.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmlheadings.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmlheadings.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmlheadings.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define THMLHEADINGS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define THMLHEADINGS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides headings in a ThML text */ ! class SWDLLEXPORT ThMLHeadings : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: ThMLHeadings(); virtual ~ThMLHeadings(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides headings in a ThML text */ ! class SWDLLEXPORT ThMLHeadings : public SWOptionFilter { public: ThMLHeadings(); virtual ~ThMLHeadings(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: thmllemma.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmllemma.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmllemma.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmllemma.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define THMLLEMMA_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define THMLLEMMA_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides lemmas in a ThML text */ ! class SWDLLEXPORT ThMLLemma : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: ThMLLemma(); virtual ~ThMLLemma(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides lemmas in a ThML text */ ! class SWDLLEXPORT ThMLLemma : public SWOptionFilter { public: ThMLLemma(); virtual ~ThMLLemma(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: thmlmorph.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmlmorph.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmlmorph.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmlmorph.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define THMLMORPH_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define THMLMORPH_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides morph tags in a ThML text */ ! class SWDLLEXPORT ThMLMorph : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: ThMLMorph(); virtual ~ThMLMorph(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides morph tags in a ThML text */ ! class SWDLLEXPORT ThMLMorph : public SWOptionFilter { public: ThMLMorph(); virtual ~ThMLMorph(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: thmlscripref.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmlscripref.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmlscripref.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmlscripref.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define THMLSCRIPREF_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define THMLSCRIPREF_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides scripture references in a ThML text */ ! class SWDLLEXPORT ThMLScripref : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: ThMLScripref(); virtual ~ThMLScripref(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides scripture references in a ThML text */ ! class SWDLLEXPORT ThMLScripref : public SWOptionFilter { public: ThMLScripref(); virtual ~ThMLScripref(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: thmlstrongs.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmlstrongs.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmlstrongs.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmlstrongs.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define THMLSTRONGS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define THMLSTRONGS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides strong's numbers in a ThML text */ ! class SWDLLEXPORT ThMLStrongs : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: ThMLStrongs(); virtual ~ThMLStrongs(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides strong's numbers in a ThML text */ ! class SWDLLEXPORT ThMLStrongs : public SWOptionFilter { public: ThMLStrongs(); virtual ~ThMLStrongs(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: thmlvariants.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/thmlvariants.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** thmlvariants.h 20 Feb 2003 07:25:20 -0000 1.4 --- thmlvariants.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 38,42 **** static const char optName[]; static const char optTip[]; ! OptionsList options; public: --- 38,42 ---- static const char optName[]; static const char optTip[]; ! StringList options; public: *************** *** 48,52 **** virtual void setOptionValue(const char *ival); virtual const char *getOptionValue(); ! virtual OptionsList getOptionValues() { return options; } }; --- 48,52 ---- virtual void setOptionValue(const char *ival); virtual const char *getOptionValue(); ! virtual StringList getOptionValues() { return options; } }; Index: utf8cantillation.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/utf8cantillation.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** utf8cantillation.h 20 Feb 2003 07:25:20 -0000 1.4 --- utf8cantillation.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define UTF8CANTILLATION_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define UTF8CANTILLATION_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides Hebrew cantillation marks in UTF8 text */ ! class SWDLLEXPORT UTF8Cantillation : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: UTF8Cantillation(); virtual ~UTF8Cantillation(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides Hebrew cantillation marks in UTF8 text */ ! class SWDLLEXPORT UTF8Cantillation : public SWOptionFilter { public: UTF8Cantillation(); virtual ~UTF8Cantillation(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: utf8greekaccents.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/utf8greekaccents.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** utf8greekaccents.h 20 Feb 2003 07:25:20 -0000 1.4 --- utf8greekaccents.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define UTF8GREEKACCENTS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define UTF8GREEKACCENTS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides Greek Accents marks in UTF8 text */ ! class SWDLLEXPORT UTF8GreekAccents : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: UTF8GreekAccents(); virtual ~UTF8GreekAccents(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides Greek Accents marks in UTF8 text */ ! class SWDLLEXPORT UTF8GreekAccents : public SWOptionFilter { public: UTF8GreekAccents(); virtual ~UTF8GreekAccents(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: utf8hebrewpoints.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/utf8hebrewpoints.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** utf8hebrewpoints.h 20 Feb 2003 07:25:20 -0000 1.4 --- utf8hebrewpoints.h 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 22,26 **** #define UTF8HEBREWPOINTS_H ! #include SWORD_NAMESPACE_START --- 22,26 ---- #define UTF8HEBREWPOINTS_H ! #include SWORD_NAMESPACE_START *************** *** 28,47 **** /** This Filter shows/hides Hebrew vowel points in UTF8 text */ ! class SWDLLEXPORT UTF8HebrewPoints : public SWFilter { ! bool option; ! static const char on[]; ! static const char off[]; ! static const char optName[]; ! static const char optTip[]; ! OptionsList options; public: UTF8HebrewPoints(); virtual ~UTF8HebrewPoints(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); - virtual const char *getOptionName() { return optName; } - virtual const char *getOptionTip() { return optTip; } - virtual void setOptionValue(const char *ival); - virtual const char *getOptionValue(); - virtual OptionsList getOptionValues() { return options; } }; --- 28,36 ---- /** This Filter shows/hides Hebrew vowel points in UTF8 text */ ! class SWDLLEXPORT UTF8HebrewPoints : public SWOptionFilter { public: UTF8HebrewPoints(); virtual ~UTF8HebrewPoints(); virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0); }; Index: utilxml.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/utilxml.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** utilxml.h 26 Jun 2003 04:33:31 -0000 1.5 --- utilxml.h 5 Jul 2003 04:58:42 -0000 1.6 *************** *** 30,35 **** SWORD_NAMESPACE_START ! typedef std::map MapStringPair; ! typedef std::list ListString; /** Simple XML helper class. --- 30,35 ---- SWORD_NAMESPACE_START ! typedef std::map StringPairMap; ! typedef std::list StringList; /** Simple XML helper class. *************** *** 42,46 **** mutable bool empty; mutable bool endTag; ! mutable MapStringPair attributes; mutable SWBuf junkBuf; --- 42,46 ---- mutable bool empty; mutable bool endTag; ! mutable StringPairMap attributes; mutable SWBuf junkBuf; *************** *** 64,68 **** inline bool isEndTag() const { return endTag; } ! const ListString getAttributeNames() const; int getAttributePartCount(const char *attribName, char partSplit = '|') const; const char *getAttribute(const char *attribName, int partNum = -1, char partSplit = '|') const; --- 64,68 ---- inline bool isEndTag() const { return endTag; } ! const StringList getAttributeNames() const; int getAttributePartCount(const char *attribName, char partSplit = '|') const; const char *getAttribute(const char *attribName, int partNum = -1, char partSplit = '|') const; From sword@www.crosswire.org Sat Jul 5 04:58:45 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Fri, 4 Jul 2003 21:58:45 -0700 Subject: [sword-cvs] sword/src/modules/filters swoptfilter.cpp,NONE,1.1 Makefile.am,1.21,1.22 gbffootnotes.cpp,1.18,1.19 gbfheadings.cpp,1.9,1.10 gbfmorph.cpp,1.10,1.11 gbfredletterwords.cpp,1.6,1.7 gbfstrongs.cpp,1.22,1.23 osisfootnotes.cpp,1.9,1.10 osisheadings.cpp,1.6,1.7 osislemma.cpp,1.2,1.3 osismorph.cpp,1.7,1.8 osisredletterwords.cpp,1.4,1.5 osisscripref.cpp,1.2,1.3 osisstrongs.cpp,1.7,1.8 plainfootnotes.cpp,1.11,1.12 thmlfootnotes.cpp,1.11,1.12 thmlheadings.cpp,1.10,1.11 thmllemma.cpp,1.8,1.9 thmlmorph.cpp,1.13,1.14 thmlscripref.cpp,1.11,1.12 thmlstrongs.cpp,1.16,1.17 utf8cantillation.cpp,1.7,1.8 utf8greekaccents.cpp,1.9,1.10 utf8hebrewpoints.cpp,1.9,1.10 Message-ID: <200307050458.h654wjj07782@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/modules/filters In directory www:/tmp/cvs-serv7690/src/modules/filters Modified Files: Makefile.am gbffootnotes.cpp gbfheadings.cpp gbfmorph.cpp gbfredletterwords.cpp gbfstrongs.cpp osisfootnotes.cpp osisheadings.cpp osislemma.cpp osismorph.cpp osisredletterwords.cpp osisscripref.cpp osisstrongs.cpp plainfootnotes.cpp thmlfootnotes.cpp thmlheadings.cpp thmllemma.cpp thmlmorph.cpp thmlscripref.cpp thmlstrongs.cpp utf8cantillation.cpp utf8greekaccents.cpp utf8hebrewpoints.cpp Added Files: swoptfilter.cpp Log Message: Added SWOptionFilter --- NEW FILE: swoptfilter.cpp --- /****************************************************************************** * * osisstrongs - SWFilter descendant to hide or show strongs number * in a OSIS module. */ #include SWORD_NAMESPACE_START SWOptionFilter::SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues) { optName = oName; optTip = oTip; optValues = oValues; } SWOptionFilter::~SWOptionFilter() { } void SWOptionFilter::setOptionValue(const char *ival) { for (StringList::const_iterator loop = optValues->begin(); loop != optValues->end(); loop++) { if (!stricmp(loop->c_str(), ival)) { optionValue = *loop; option = (!stricmp(ival, "On")); // convenience for boolean filters break; } } } const char *SWOptionFilter::getOptionValue() { return optionValue; } SWORD_NAMESPACE_END Index: Makefile.am =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/Makefile.am,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.am 27 Jun 2003 09:51:01 -0000 1.21 --- Makefile.am 5 Jul 2003 04:58:42 -0000 1.22 *************** *** 2,5 **** --- 2,6 ---- libsword_la_SOURCES += $(filtersdir)/swbasicfilter.cpp + libsword_la_SOURCES += $(filtersdir)/swoptfilter.cpp libsword_la_SOURCES += $(filtersdir)/gbfhtml.cpp Index: gbffootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbffootnotes.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gbffootnotes.cpp 27 Jun 2003 06:13:16 -0000 1.18 --- gbffootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.19 *************** *** 15,28 **** SWORD_NAMESPACE_START ! const char GBFFootnotes::on[] = "On"; ! const char GBFFootnotes::off[] = "Off"; ! const char GBFFootnotes::optName[] = "Footnotes"; ! const char GBFFootnotes::optTip[] = "Toggles Footnotes On and Off if they exist"; ! GBFFootnotes::GBFFootnotes() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 15,27 ---- SWORD_NAMESPACE_START ! const char oName[] = "Footnotes"; ! const char oTip[] = "Toggles Footnotes On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! ! GBFFootnotes::GBFFootnotes() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 31,43 **** } - void GBFFootnotes::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } - - const char *GBFFootnotes::getOptionValue() - { - return (option) ? on:off; - } char GBFFootnotes::processText (SWBuf &text, const SWKey *key, const SWModule *module) --- 30,33 ---- Index: gbfheadings.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfheadings.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gbfheadings.cpp 27 Jun 2003 06:13:16 -0000 1.9 --- gbfheadings.cpp 5 Jul 2003 04:58:42 -0000 1.10 *************** *** 16,29 **** ! const char GBFHeadings::on[] = "On"; ! const char GBFHeadings::off[] = "Off"; ! const char GBFHeadings::optName[] = "Headings"; ! const char GBFHeadings::optTip[] = "Toggles Headings On and Off if they exist"; ! GBFHeadings::GBFHeadings() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 16,27 ---- ! const char oName[] = "Headings"; ! const char oTip[] = "Toggles Headings On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 32,47 **** } - void GBFHeadings::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *GBFHeadings::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char GBFHeadings::processText (SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want headings char token[2048]; // cheese. Fix. --- 30,35 ---- } ! char GBFHeadings::processText (SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want headings char token[2048]; // cheese. Fix. Index: gbfmorph.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfmorph.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gbfmorph.cpp 27 Jun 2003 06:13:16 -0000 1.10 --- gbfmorph.cpp 5 Jul 2003 04:58:42 -0000 1.11 *************** *** 15,28 **** SWORD_NAMESPACE_START ! const char GBFMorph::on[] = "On"; ! const char GBFMorph::off[] = "Off"; ! const char GBFMorph::optName[] = "Morphological Tags"; ! const char GBFMorph::optTip[] = "Toggles Morphological Tags On and Off if they exist"; ! GBFMorph::GBFMorph() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 15,26 ---- SWORD_NAMESPACE_START ! const char oName[] = "Morphological Tags"; ! const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 31,43 **** } - void GBFMorph::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } - - const char *GBFMorph::getOptionValue() - { - return (option) ? on:off; - } char GBFMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) { --- 29,32 ---- Index: gbfredletterwords.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfredletterwords.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gbfredletterwords.cpp 27 Jun 2003 06:13:16 -0000 1.6 --- gbfredletterwords.cpp 5 Jul 2003 04:58:42 -0000 1.7 *************** *** 17,30 **** SWORD_NAMESPACE_START ! const char GBFRedLetterWords::on[] = "On"; ! const char GBFRedLetterWords::off[] = "Off"; ! const char GBFRedLetterWords::optName[] = "Words of Christ in Red"; ! const char GBFRedLetterWords::optTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; ! GBFRedLetterWords::GBFRedLetterWords() { ! option = true; ! options.push_back(on); ! options.push_back(off); } --- 17,28 ---- SWORD_NAMESPACE_START ! const char oName[] = "Words of Christ in Red"; ! const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 33,48 **** } - void GBFRedLetterWords::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *GBFRedLetterWords::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char GBFRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { /** This function removes the red letter words in Bible like the WEB * The words are marked by as start and as end tag. --- 31,36 ---- } ! char GBFRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) { /** This function removes the red letter words in Bible like the WEB * The words are marked by as start and as end tag. Index: gbfstrongs.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfstrongs.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** gbfstrongs.cpp 27 Jun 2003 06:13:16 -0000 1.22 --- gbfstrongs.cpp 5 Jul 2003 04:58:42 -0000 1.23 *************** *** 17,30 **** SWORD_NAMESPACE_START ! const char GBFStrongs::on[] = "On"; ! const char GBFStrongs::off[] = "Off"; ! const char GBFStrongs::optName[] = "Strong's Numbers"; ! const char GBFStrongs::optTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! GBFStrongs::GBFStrongs() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 17,28 ---- SWORD_NAMESPACE_START ! const char oName[] = "Strong's Numbers"; ! const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 33,48 **** } - void GBFStrongs::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *GBFStrongs::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { char token[2048]; // cheese. Fix. int tokpos = 0; --- 31,36 ---- } ! char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { char token[2048]; // cheese. Fix. int tokpos = 0; Index: osisfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisfootnotes.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** osisfootnotes.cpp 5 Jul 2003 01:16:46 -0000 1.9 --- osisfootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.10 *************** *** 19,32 **** SWORD_NAMESPACE_START ! const char OSISFootnotes::on[] = "On"; ! const char OSISFootnotes::off[] = "Off"; ! const char OSISFootnotes::optName[] = "Footnotes"; ! const char OSISFootnotes::optTip[] = "Toggles Footnotes On and Off if they exist"; ! OSISFootnotes::OSISFootnotes() { ! option = true; ! options.push_back(on); ! options.push_back(off); } --- 19,30 ---- SWORD_NAMESPACE_START ! const char oName[] = "Footnotes"; ! const char oTip[] = "Toggles Footnotes On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 35,47 **** } - void OSISFootnotes::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } - - const char *OSISFootnotes::getOptionValue() - { - return (option) ? on:off; - } char OSISFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) { --- 33,36 ---- *************** *** 89,94 **** if (module->isProcessEntryAttributes()) { sprintf(buf, "%i", footnoteNum++); ! ListString attributes = startTag.getAttributeNames(); ! for (ListString::iterator it = attributes.begin(); it != attributes.end(); it++) { module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str()); } --- 78,83 ---- if (module->isProcessEntryAttributes()) { sprintf(buf, "%i", footnoteNum++); ! StringList attributes = startTag.getAttributeNames(); ! for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) { module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str()); } Index: osisheadings.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisheadings.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** osisheadings.cpp 27 Jun 2003 06:13:16 -0000 1.6 --- osisheadings.cpp 5 Jul 2003 04:58:42 -0000 1.7 *************** *** 17,30 **** SWORD_NAMESPACE_START ! const char OSISHeadings::on[] = "On"; ! const char OSISHeadings::off[] = "Off"; ! const char OSISHeadings::optName[] = "Headings"; ! const char OSISHeadings::optTip[] = "Toggles Headings On and Off if they exist"; ! OSISHeadings::OSISHeadings() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 17,28 ---- SWORD_NAMESPACE_START ! const char oName[] = "Headings"; ! const char oTip[] = "Toggles Headings On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 33,48 **** } - void OSISHeadings::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *OSISHeadings::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char OSISHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { SWBuf token; bool intoken = false; --- 31,36 ---- } ! char OSISHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; Index: osislemma.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osislemma.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osislemma.cpp 27 Jun 2003 21:51:50 -0000 1.2 --- osislemma.cpp 5 Jul 2003 04:58:42 -0000 1.3 *************** *** 16,29 **** SWORD_NAMESPACE_START ! const char OSISLemma::on[] = "On"; ! const char OSISLemma::off[] = "Off"; ! const char OSISLemma::optName[] = "Lemmas"; ! const char OSISLemma::optTip[] = "Toggles Lemmas On and Off if they exist"; ! OSISLemma::OSISLemma() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 16,27 ---- SWORD_NAMESPACE_START ! const char oName[] = "Lemmas"; ! const char oTip[] = "Toggles Lemmas On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 32,47 **** } - void OSISLemma::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *OSISLemma::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want lemmas const char *from; --- 30,35 ---- } ! char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want lemmas const char *from; Index: osismorph.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osismorph.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** osismorph.cpp 27 Jun 2003 06:13:16 -0000 1.7 --- osismorph.cpp 5 Jul 2003 04:58:42 -0000 1.8 *************** *** 16,29 **** SWORD_NAMESPACE_START ! const char OSISMorph::on[] = "On"; ! const char OSISMorph::off[] = "Off"; ! const char OSISMorph::optName[] = "Morphological Tags"; ! const char OSISMorph::optTip[] = "Toggles Morphological Tags On and Off if they exist"; ! OSISMorph::OSISMorph() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 16,27 ---- SWORD_NAMESPACE_START ! const char oName[] = "Morphological Tags"; ! const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 32,47 **** } - void OSISMorph::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *OSISMorph::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want morph tags const char *from; --- 30,35 ---- } ! char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want morph tags const char *from; Index: osisredletterwords.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisredletterwords.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** osisredletterwords.cpp 28 Jun 2003 19:20:53 -0000 1.4 --- osisredletterwords.cpp 5 Jul 2003 04:58:42 -0000 1.5 *************** *** 17,30 **** SWORD_NAMESPACE_START ! const char OSISRedLetterWords::on[] = "On"; ! const char OSISRedLetterWords::off[] = "Off"; ! const char OSISRedLetterWords::optName[] = "Words of Christ in Red"; ! const char OSISRedLetterWords::optTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; ! OSISRedLetterWords::OSISRedLetterWords() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 17,28 ---- SWORD_NAMESPACE_START ! const char oName[] = "Words of Christ in Red"; ! const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("On"); } *************** *** 33,48 **** } - void OSISRedLetterWords::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *OSISRedLetterWords::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char OSISRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { SWBuf token; bool intoken = false; --- 31,36 ---- } ! char OSISRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) { SWBuf token; bool intoken = false; Index: osisscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisscripref.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** osisscripref.cpp 5 Jul 2003 01:16:46 -0000 1.2 --- osisscripref.cpp 5 Jul 2003 04:58:42 -0000 1.3 *************** *** 17,29 **** SWORD_NAMESPACE_START ! const char OSISScripref::on[] = "On"; ! const char OSISScripref::off[] = "Off"; ! const char OSISScripref::optName[] = "Scripture Cross-references"; ! const char OSISScripref::optTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! OSISScripref::OSISScripref() { ! option = true; ! options.push_back(on); ! options.push_back(off); } --- 17,28 ---- SWORD_NAMESPACE_START ! const char oName[] = "Scripture Cross-references"; ! const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ! ! OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("On"); } *************** *** 32,44 **** } - void OSISScripref::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } - - const char *OSISScripref::getOptionValue() - { - return (option) ? on:off; - } char OSISScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) { --- 31,34 ---- Index: osisstrongs.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisstrongs.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** osisstrongs.cpp 27 Jun 2003 21:51:50 -0000 1.7 --- osisstrongs.cpp 5 Jul 2003 04:58:42 -0000 1.8 *************** *** 17,30 **** SWORD_NAMESPACE_START ! const char OSISStrongs::on[] = "On"; ! const char OSISStrongs::off[] = "Off"; ! const char OSISStrongs::optName[] = "Strong's Numbers"; ! const char OSISStrongs::optTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! OSISStrongs::OSISStrongs() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 17,29 ---- SWORD_NAMESPACE_START ! const char oName[] = "Strong's Numbers"; ! const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ! OSISStrongs::OSISStrongs() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 33,48 **** } - void OSISStrongs::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *OSISStrongs::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { const char *from; char token[2048]; // cheese. Fix. --- 32,37 ---- } ! char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { const char *from; char token[2048]; // cheese. Fix. Index: plainfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/plainfootnotes.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** plainfootnotes.cpp 27 Jun 2003 01:41:07 -0000 1.11 --- plainfootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.12 *************** *** 27,58 **** SWORD_NAMESPACE_START ! const char PLAINFootnotes::on[] = "On"; ! const char PLAINFootnotes::off[] = "Off"; ! const char PLAINFootnotes::optName[] = "Footnotes"; ! const char PLAINFootnotes::optTip[] = "Toggles Footnotes On and Off In Bible Texts If They Exist"; ! ! PLAINFootnotes::PLAINFootnotes(){ ! option = false; ! options.push_back(on); ! options.push_back(off); ! } ! ! PLAINFootnotes::~PLAINFootnotes(){ ! } ! void PLAINFootnotes::setOptionValue(const char *ival) ! { ! option = (!stricmp(ival, on)); } ! const char *PLAINFootnotes::getOptionValue() ! { ! return (option) ? on:off; } ! char PLAINFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want footnotes //char token[2048]; --- 27,45 ---- SWORD_NAMESPACE_START ! const char oName[] = "Footnotes"; ! const char oTip[] = "Toggles Footnotes On and Off In Bible Texts If They Exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! PLAINFootnotes::PLAINFootnotes() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } ! PLAINFootnotes::~PLAINFootnotes(){ } ! char PLAINFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want footnotes //char token[2048]; Index: thmlfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlfootnotes.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** thmlfootnotes.cpp 27 Jun 2003 06:13:16 -0000 1.11 --- thmlfootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.12 *************** *** 15,28 **** SWORD_NAMESPACE_START ! const char ThMLFootnotes::on[] = "On"; ! const char ThMLFootnotes::off[] = "Off"; ! const char ThMLFootnotes::optName[] = "Footnotes"; ! const char ThMLFootnotes::optTip[] = "Toggles Footnotes On and Off if they exist"; ! ThMLFootnotes::ThMLFootnotes() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 15,26 ---- SWORD_NAMESPACE_START ! const char oName[] = "Footnotes"; ! const char oTip[] = "Toggles Footnotes On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 31,46 **** } - void ThMLFootnotes::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *ThMLFootnotes::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char ThMLFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want footnotes bool intoken = false; --- 29,34 ---- } ! char ThMLFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want footnotes bool intoken = false; Index: thmlheadings.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlheadings.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** thmlheadings.cpp 27 Jun 2003 06:13:16 -0000 1.10 --- thmlheadings.cpp 5 Jul 2003 04:58:42 -0000 1.11 *************** *** 19,32 **** SWORD_NAMESPACE_START ! const char ThMLHeadings::on[] = "On"; ! const char ThMLHeadings::off[] = "Off"; ! const char ThMLHeadings::optName[] = "Headings"; ! const char ThMLHeadings::optTip[] = "Toggles Headings On and Off if they exist"; ! ThMLHeadings::ThMLHeadings() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 19,30 ---- SWORD_NAMESPACE_START ! const char oName[] = "Headings"; ! const char oTip[] = "Toggles Headings On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 35,50 **** } - void ThMLHeadings::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *ThMLHeadings::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char ThMLHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want headings SWBuf token; --- 33,38 ---- } ! char ThMLHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want headings SWBuf token; Index: thmllemma.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmllemma.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** thmllemma.cpp 27 Jun 2003 06:13:16 -0000 1.8 --- thmllemma.cpp 5 Jul 2003 04:58:42 -0000 1.9 *************** *** 15,27 **** SWORD_NAMESPACE_START ! const char ThMLLemma::on[] = "On"; ! const char ThMLLemma::off[] = "Off"; ! const char ThMLLemma::optName[] = "Lemmas"; ! const char ThMLLemma::optTip[] = "Toggles Lemmas On and Off if they exist"; ! ThMLLemma::ThMLLemma() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 15,26 ---- SWORD_NAMESPACE_START ! const char oName[] = "Lemmas"; ! const char oTip[] = "Toggles Lemmas On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ! ! ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 30,45 **** } - void ThMLLemma::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *ThMLLemma::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char ThMLLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want lemmas bool intoken = false; --- 29,34 ---- } ! char ThMLLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want lemmas bool intoken = false; Index: thmlmorph.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlmorph.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** thmlmorph.cpp 27 Jun 2003 06:13:16 -0000 1.13 --- thmlmorph.cpp 5 Jul 2003 04:58:42 -0000 1.14 *************** *** 15,28 **** SWORD_NAMESPACE_START ! const char ThMLMorph::on[] = "On"; ! const char ThMLMorph::off[] = "Off"; ! const char ThMLMorph::optName[] = "Morphological Tags"; ! const char ThMLMorph::optTip[] = "Toggles Morphological Tags On and Off if they exist"; ! ThMLMorph::ThMLMorph() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 15,26 ---- SWORD_NAMESPACE_START ! const char oName[] = "Morphological Tags"; ! const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 31,46 **** } - void ThMLMorph::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *ThMLMorph::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char ThMLMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want morph tags bool intoken = false; --- 29,34 ---- } ! char ThMLMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want morph tags bool intoken = false; Index: thmlscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlscripref.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** thmlscripref.cpp 27 Jun 2003 06:13:16 -0000 1.11 --- thmlscripref.cpp 5 Jul 2003 04:58:42 -0000 1.12 *************** *** 15,28 **** SWORD_NAMESPACE_START ! const char ThMLScripref::on[] = "On"; ! const char ThMLScripref::off[] = "Off"; ! const char ThMLScripref::optName[] = "Scripture Cross-references"; ! const char ThMLScripref::optTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! ThMLScripref::ThMLScripref() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 15,26 ---- SWORD_NAMESPACE_START ! const char oName[] = "Scripture Cross-references"; ! const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 31,46 **** } - void ThMLScripref::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *ThMLScripref::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char ThMLScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { // if we don't want scriprefs bool intoken = false; --- 29,34 ---- } ! char ThMLScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { // if we don't want scriprefs bool intoken = false; Index: thmlstrongs.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlstrongs.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** thmlstrongs.cpp 27 Jun 2003 06:13:16 -0000 1.16 --- thmlstrongs.cpp 5 Jul 2003 04:58:42 -0000 1.17 *************** *** 18,31 **** SWORD_NAMESPACE_START ! const char ThMLStrongs::on[] = "On"; ! const char ThMLStrongs::off[] = "Off"; ! const char ThMLStrongs::optName[] = "Strong's Numbers"; ! const char ThMLStrongs::optTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! ThMLStrongs::ThMLStrongs() { ! option = false; ! options.push_back(on); ! options.push_back(off); } --- 18,29 ---- SWORD_NAMESPACE_START ! const char oName[] = "Strong's Numbers"; ! const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; + const SWBuf choices[2] = {"On", "Off"}; + const StringList oValues(&choices[0], &choices[1]); ! ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } *************** *** 34,46 **** } - void ThMLStrongs::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } - - const char *ThMLStrongs::getOptionValue() - { - return (option) ? on:off; - } char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) { --- 32,35 ---- Index: utf8cantillation.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/utf8cantillation.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** utf8cantillation.cpp 27 Jun 2003 06:13:16 -0000 1.7 --- utf8cantillation.cpp 5 Jul 2003 04:58:42 -0000 1.8 *************** *** 12,40 **** SWORD_NAMESPACE_START ! const char UTF8Cantillation::on[] = "On"; ! const char UTF8Cantillation::off[] = "Off"; ! const char UTF8Cantillation::optName[] = "Hebrew Cantillation"; ! const char UTF8Cantillation::optTip[] = "Toggles Hebrew Cantillation Marks"; ! UTF8Cantillation::UTF8Cantillation() { ! option = false; ! options.push_back(on); ! options.push_back(off); } - UTF8Cantillation::~UTF8Cantillation(){}; ! void UTF8Cantillation::setOptionValue(const char *ival) ! { ! option = (!stricmp(ival, on)); ! } - const char *UTF8Cantillation::getOptionValue() - { - return (option) ? on:off; - } ! char UTF8Cantillation::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { //The UTF-8 range 0xD6 0x90 to 0xD6 0xAF and 0xD7 0x84 consist of Hebrew cantillation marks so block those out. --- 12,30 ---- SWORD_NAMESPACE_START ! const char oName[] = "Hebrew Cantillation"; ! const char oTip[] = "Toggles Hebrew Cantillation Marks"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ! ! UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("Off"); } ! UTF8Cantillation::~UTF8Cantillation(){}; ! char UTF8Cantillation::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { //The UTF-8 range 0xD6 0x90 to 0xD6 0xAF and 0xD7 0x84 consist of Hebrew cantillation marks so block those out. Index: utf8greekaccents.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/utf8greekaccents.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** utf8greekaccents.cpp 27 Jun 2003 06:13:16 -0000 1.9 --- utf8greekaccents.cpp 5 Jul 2003 04:58:42 -0000 1.10 *************** *** 12,37 **** SWORD_NAMESPACE_START ! const char UTF8GreekAccents::on[] = "On"; ! const char UTF8GreekAccents::off[] = "Off"; ! const char UTF8GreekAccents::optName[] = "Greek Accents"; ! const char UTF8GreekAccents::optTip[] = "Toggles Greek Accents"; ! UTF8GreekAccents::UTF8GreekAccents() { ! option = true; ! options.push_back(on); ! options.push_back(off); } UTF8GreekAccents::~UTF8GreekAccents(){}; - void UTF8GreekAccents::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } - - const char *UTF8GreekAccents::getOptionValue() - { - return (option) ? on:off; - } char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule *module) { --- 12,27 ---- SWORD_NAMESPACE_START ! const char oName[] = "Greek Accents"; ! const char oTip[] = "Toggles Greek Accents"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ! ! UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("On"); } UTF8GreekAccents::~UTF8GreekAccents(){}; char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule *module) { Index: utf8hebrewpoints.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/utf8hebrewpoints.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** utf8hebrewpoints.cpp 27 Jun 2003 06:13:16 -0000 1.9 --- utf8hebrewpoints.cpp 5 Jul 2003 04:58:42 -0000 1.10 *************** *** 12,40 **** SWORD_NAMESPACE_START ! const char UTF8HebrewPoints::on[] = "On"; ! const char UTF8HebrewPoints::off[] = "Off"; ! const char UTF8HebrewPoints::optName[] = "Hebrew Vowel Points"; ! const char UTF8HebrewPoints::optTip[] = "Toggles Hebrew Vowel Points"; ! UTF8HebrewPoints::UTF8HebrewPoints() { ! option = true; ! options.push_back(on); ! options.push_back(off); } UTF8HebrewPoints::~UTF8HebrewPoints(){}; - void UTF8HebrewPoints::setOptionValue(const char *ival) - { - option = (!stricmp(ival, on)); - } ! const char *UTF8HebrewPoints::getOptionValue() ! { ! return (option) ? on:off; ! } ! ! char UTF8HebrewPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) ! { if (!option) { //The UTF-8 range 0xD6 0xB0 to 0xD6 0xBF excluding 0xD6 0x consist of Hebrew cantillation marks so block those out. --- 12,29 ---- SWORD_NAMESPACE_START ! const char oName[] = "Hebrew Vowel Points"; ! const char oTip[] = "Toggles Hebrew Vowel Points"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ! ! UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, &oValues) { ! setOptionValue("On"); } UTF8HebrewPoints::~UTF8HebrewPoints(){}; ! char UTF8HebrewPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) { if (!option) { //The UTF-8 range 0xD6 0xB0 to 0xD6 0xBF excluding 0xD6 0x consist of Hebrew cantillation marks so block those out. From sword@www.crosswire.org Sat Jul 5 08:53:07 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sat, 5 Jul 2003 01:53:07 -0700 Subject: [sword-cvs] sword/include swoptfilter.h,1.1,1.2 Message-ID: <200307050853.h658r7j23161@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv23139/include Modified Files: swoptfilter.h Log Message: Martin: changed class docs for swoptfilter. Developers, please always write proper documentation while coding. Index: swoptfilter.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/swoptfilter.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** swoptfilter.h 5 Jul 2003 04:58:42 -0000 1.1 --- swoptfilter.h 5 Jul 2003 08:53:05 -0000 1.2 *************** *** 26,30 **** SWORD_NAMESPACE_START ! /** This Filter shows/hides strong's numbers in a OSIS text */ class SWDLLEXPORT SWOptionFilter : public SWFilter { --- 26,30 ---- SWORD_NAMESPACE_START ! /** Base class for all option filters. */ class SWDLLEXPORT SWOptionFilter : public SWFilter { From sword@www.crosswire.org Sat Jul 5 08:53:07 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sat, 5 Jul 2003 01:53:07 -0700 Subject: [sword-cvs] sword/src/modules/filters swoptfilter.cpp,1.1,1.2 Message-ID: <200307050853.h658r7j23162@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/modules/filters In directory www:/tmp/cvs-serv23139/src/modules/filters Modified Files: swoptfilter.cpp Log Message: Martin: changed class docs for swoptfilter. Developers, please always write proper documentation while coding. Index: swoptfilter.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/swoptfilter.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** swoptfilter.cpp 5 Jul 2003 04:58:42 -0000 1.1 --- swoptfilter.cpp 5 Jul 2003 08:53:05 -0000 1.2 *************** *** 1,6 **** /****************************************************************************** * ! * osisstrongs - SWFilter descendant to hide or show strongs number ! * in a OSIS module. */ --- 1,5 ---- /****************************************************************************** * ! * swoptfilter - SWFilter descendant and base class for all option filters */ From sword@www.crosswire.org Mon Jul 7 00:26:01 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 17:26:01 -0700 Subject: [sword-cvs] sword/include installmgr.h,1.7,1.8 utf8transliterator.h,1.18,1.19 Message-ID: <200307070026.h670Q1i20809@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv20766/include Modified Files: installmgr.h utf8transliterator.h Log Message: More install code into engine Index: installmgr.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/installmgr.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** installmgr.h 27 Jun 2003 02:21:05 -0000 1.7 --- installmgr.h 7 Jul 2003 00:25:59 -0000 1.8 *************** *** 6,9 **** --- 6,11 ---- #include #include + #include + #include SWORD_NAMESPACE_START *************** *** 42,72 **** SWBuf directory; SWBuf caption; SWMgr *mgr; }; ! int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream); ! int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); ! ! //public stuff ! ! ! // probably change to group these ftp functions into some kind of FTPSession ! // class, and open/close functions become c_tor/d_tor. - void *FTPOpenSession(); - void FTPCloseSession(void *session); - char FTPURLGetFile(void *session, const char *dest, const char *sourceurl, bool passive = true, void (*status_callback)(double dltotal, double dlnow)=0); ! // probably change to not expose struct ftpparse. We probably need our ! // own FTPFile class or something that contains things like file name, ! // size, type (dir, file, special). Then change to vector of this class ! // instead of ftpparse ! std::vector FTPURLGetDir(void *session, const char *dirurl, bool passive = true); ! int removeModule(SWMgr *manager, const char *modName); ! int installModule(const char *fromLocation, const char *modName, InstallSource *is); ! int copyFileToSWORDInstall(SWMgr *manager, const char *sourceDir, const char *fName); --- 44,86 ---- SWBuf directory; SWBuf caption; + SWBuf localShadow; SWMgr *mgr; + void *userData; }; + typedef std::map < SWBuf, InstallSource * >InstallSourceMap; + class InstallMgr { + protected: + char *privatePath; + // probably change to group these ftp functions into some kind of FTPSession + // class, and open/close functions become c_tor/d_tor. + public: + SWConfig *installConf; + InstallSourceMap sources; + void *FTPOpenSession(); + void FTPCloseSession(void *session); + char FTPURLGetFile(void *session, const char *dest, const char *sourceurl); ! // probably change to not expose struct ftpparse. We probably need our ! // own FTPFile class or something that contains things like file name, ! // size, type (dir, file, special). Then change to vector of this class ! // instead of ftpparse ! std::vector FTPURLGetDir(void *session, const char *dirurl); ! public: ! InstallMgr(const char *privatePath = "./"); ! virtual ~InstallMgr(); ! bool passive; ! bool terminate; ! virtual int removeModule(SWMgr *manager, const char *modName); ! virtual int FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = ""); ! virtual int installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is = 0); ! virtual int copyFileToSWORDInstall(SWMgr *manager, const char *sourceDir, const char *fName); ! virtual void statusUpdate(double dltotal, double dlnow); ! virtual void preDownloadStatus(long totalBytes, long completedBytes, const char *message); ! }; Index: utf8transliterator.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/utf8transliterator.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** utf8transliterator.h 20 Feb 2003 07:25:20 -0000 1.18 --- utf8transliterator.h 7 Jul 2003 00:25:59 -0000 1.19 *************** *** 71,75 **** static const char SW_RB_RULE[]; static const char SW_RESDATA[]; ! OptionsList options; static SWTransMap transMap; UErrorCode utf8status; --- 71,75 ---- static const char SW_RB_RULE[]; static const char SW_RESDATA[]; ! StringList options; static SWTransMap transMap; UErrorCode utf8status; *************** *** 87,91 **** virtual void setOptionValue(const char *ival); virtual const char *getOptionValue(); ! virtual OptionsList getOptionValues() { return options; } }; --- 87,91 ---- virtual void setOptionValue(const char *ival); virtual const char *getOptionValue(); ! virtual StringList getOptionValues() { return options; } }; From sword@www.crosswire.org Mon Jul 7 00:26:01 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 17:26:01 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr MainFrm.cpp,1.19,1.20 MainFrm.h,1.8,1.9 StatusFrm.cpp,1.16,1.17 StatusFrm.h,1.10,1.11 Message-ID: <200307070026.h670Q1i20810@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr In directory www:/tmp/cvs-serv20766/apps/windoze/CBuilder5/InstallMgr Modified Files: MainFrm.cpp MainFrm.h StatusFrm.cpp StatusFrm.h Log Message: More install code into engine Index: MainFrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** MainFrm.cpp 27 Jun 2003 01:41:06 -0000 1.19 --- MainFrm.cpp 7 Jul 2003 00:25:59 -0000 1.20 *************** *** 30,35 **** TMainForm *MainForm; ! __fastcall InstallSourceTab::InstallSourceTab(TComponent *Owner, const char *confEnt, const char *type) : TControl(Owner), is(confEnt, type) { } --- 30,69 ---- TMainForm *MainForm; + int InstallMgrWin::FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { + StatusForm->is = is; + StatusForm->src = src; + StatusForm->dest = dest; + StatusForm->suffix = suffix; + StatusForm->dirTransfer = dirTransfer; + Application->ProcessMessages(); + if (StatusForm->ShowModal() == mrCancel) + return -1; + else return 0; + } ! void InstallMgrWin::preDownloadStatus(long totalBytes, long completedBytes, const char *message) { ! StatusForm->totalBytes = totalBytes; ! StatusForm->completedBytes = completedBytes; ! StatusForm->buffer = message; ! StatusForm->PreDownload1(); ! Application->ProcessMessages(); ! } ! ! void InstallMgrWin::statusUpdate(double dltotal, double dlnow) { ! if (!dltotal) ! return; // prevent division by zero error below ! int filePercent = (int)((float)(dlnow + 1) / (float)(dltotal) * 100); ! int totalPercent = (int)((float)(dlnow + StatusForm->completedBytes + 1) / (float)(StatusForm->totalBytes) * 100); ! StatusForm->statusBar->Caption = ::IntToStr((long)dlnow) + " bytes out of " + ::IntToStr((long)dltotal) + " transferred (file: " + IntToStr(filePercent) + "% / total: " + IntToStr(totalPercent) + "%)"; ! StatusForm->fileProgress->Position = filePercent; ! StatusForm->totalProgress->Position = totalPercent; ! ! StatusForm->statusBar->Repaint(); ! Application->ProcessMessages(); ! } ! ! ! __fastcall InstallSourceTab::InstallSourceTab(TComponent *Owner, InstallSource *is) : TControl(Owner) { ! this->is = is; } *************** *** 47,51 **** manager = new SWMgr(); } ! installConf = new SWConfig("./InstallMgr.conf"); localMgr = 0; } --- 81,85 ---- manager = new SWMgr(); } ! installMgr = new InstallMgrWin("./installMgr"); localMgr = 0; } *************** *** 55,61 **** { delete manager; - delete installConf; if (localMgr) delete localMgr; } --- 89,95 ---- { delete manager; if (localMgr) delete localMgr; + delete installMgr; } *************** *** 70,81 **** fillInstallTree(); ! fillSourceTree(getLocalDir(), localTree); } void TMainForm::refreshPageControl() { ! SectionMap::iterator sources; ! ConfigEntMap::iterator sourceBegin; ! ConfigEntMap::iterator sourceEnd; while (PageControl1->PageCount > 1) { --- 104,113 ---- fillInstallTree(); ! fillSourceTree(localTree); } void TMainForm::refreshPageControl() { ! InstallSourceMap::iterator source; while (PageControl1->PageCount > 1) { *************** *** 83,100 **** } ! sources = installConf->Sections.find("Sources"); ! passive = (!stricmp((*installConf)["General"]["PassiveFTP"].c_str(), "true")); ! ! if (sources != installConf->Sections.end()) { ! sourceBegin = sources->second.lower_bound("FTPSource"); ! sourceEnd = sources->second.upper_bound("FTPSource"); ! ! if (sourceBegin != sourceEnd) { ! while (sourceBegin != sourceEnd) { ! InstallSourceTab *ist = new InstallSourceTab(this, sourceBegin->second.c_str(), "FTP"); ! addSource(ist); ! sourceBegin++; ! } ! } } } --- 115,122 ---- } ! for (source = installMgr->sources.begin(); source != installMgr->sources.end(); source++) { ! InstallSourceTab *ist = new InstallSourceTab(this, source->second); ! source->second->userData = (void *)ist; ! addSource(ist); } } *************** *** 110,115 **** SectionMap::iterator sit; ! newtab->Caption = ist->is.caption.c_str(); ! newtab->Hint = ist->is.source.c_str(); newtab->ShowHint = true; newtab->PageControl = PageControl1; --- 132,137 ---- SectionMap::iterator sit; ! newtab->Caption = ist->is->caption.c_str(); ! newtab->Hint = ist->is->source.c_str(); newtab->ShowHint = true; newtab->PageControl = PageControl1; *************** *** 133,151 **** newtree->Images = ImageList1; newtree->StateImages = ImageList2; ! SWBuf parent = (SWBuf)"./sources/" + ist->is.source + "/file"; ! FileMgr::createParent(parent.c_str()); ! parent = (SWBuf)"./sources/" + ist->is.source; ! fillSourceTree(parent.c_str(), newtree); } ! const char *TMainForm::getLocalDir() ! { ConfigEntMap::iterator entry; ! entry = installConf->Sections["Sources"].find("LocalPath"); ! if (entry == installConf->Sections["Sources"].end()) { ! installConf->Sections["Sources"].insert(ConfigEntMap::value_type("LocalPath", "d:/sword")); ! entry = installConf->Sections["Sources"].find("LocalPath"); } return entry->second.c_str(); --- 155,169 ---- newtree->Images = ImageList1; newtree->StateImages = ImageList2; ! fillSourceTree(newtree, ist->is); } ! const char *TMainForm::getLocalDir() { ConfigEntMap::iterator entry; ! entry = installMgr->installConf->Sections["Sources"].find("LocalPath"); ! if (entry == installMgr->installConf->Sections["Sources"].end()) { ! installMgr->installConf->Sections["Sources"].insert(ConfigEntMap::value_type("LocalPath", "d:/sword")); ! entry = installMgr->installConf->Sections["Sources"].find("LocalPath"); } return entry->second.c_str(); *************** *** 154,160 **** ! void TMainForm::setLocalDir(const char *idir) ! { ! installConf->Sections["Sources"].erase("LocalPath"); installConf->Sections["Sources"].insert(ConfigEntMap::value_type("LocalPath", idir)); } --- 172,177 ---- ! void TMainForm::setLocalDir(const char *idir) { ! (*(installMgr->installConf))["Sources"]["LocalPath"] = idir; } *************** *** 163,193 **** void __fastcall TMainForm::LocalPath1Click(TObject *Sender) { ! AnsiString Dir = "C:"; ! WideString Root = getLocalDir(); ! SelectDirectory("Select Local Path", Root , Dir); ! ! /* ! localPathDlg->Title = "Select a file in the directory to choose"; ! localPathDlg->InitialDir = getLocalDir(); ! if (localPathDlg->Execute()) { ! char *buf = new char [ strlen(localPathDlg->FileName.c_str()) + 1 ]; ! ! strcpy(buf, localPathDlg->FileName.c_str()); ! int end = strlen(buf) - 1; ! while (end) { ! if ((buf[end] == '/') || (buf[end] == '\\')) ! break; ! end--; ! } ! buf[end+1] = 0; ! setLocalDir(buf); ! delete [] buf; ! } ! */ ! setLocalDir(Dir.c_str()); ! installConf->Save(); ! fillSourceTree(getLocalDir(), localTree); } //--------------------------------------------------------------------------- --- 180,191 ---- void __fastcall TMainForm::LocalPath1Click(TObject *Sender) { ! AnsiString Dir = "C:"; ! WideString Root = getLocalDir(); ! SelectDirectory("Select Local Path", Root , Dir); ! setLocalDir(Dir.c_str()); ! installMgr->installConf->Save(); ! fillSourceTree(localTree); } //--------------------------------------------------------------------------- *************** *** 229,234 **** ! void TMainForm::fillSourceTree(const char *sourceConf, TTreeView *tree) ! { ModMap::iterator mods; TTreeNode *node; --- 227,231 ---- ! void TMainForm::fillSourceTree(TTreeView *tree, InstallSource *is) { ModMap::iterator mods; TTreeNode *node; *************** *** 248,258 **** if (localMgr) delete localMgr; ! mgr = localMgr = new SWMgr(sourceConf); } else { InstallSourceTab *ist = (InstallSourceTab *) tree->Parent->Controls[0]; ! if (ist->is.mgr) ! delete ist->is.mgr; ! mgr = ist->is.mgr = new SWMgr(sourceConf); } --- 245,255 ---- if (localMgr) delete localMgr; ! mgr = localMgr = new SWMgr(getLocalDir()); } else { InstallSourceTab *ist = (InstallSourceTab *) tree->Parent->Controls[0]; ! if (ist->is->mgr) ! delete ist->is->mgr; ! mgr = ist->is->mgr = new SWMgr(is->localShadow.c_str()); } *************** *** 421,438 **** //--------------------------------------------------------------------------- - int TMainForm::removeModule(const char *modName) - { - return sword::removeModule(manager, modName); - } - - void TMainForm::fillAllSourceTrees() { ! fillSourceTree(getLocalDir(), localTree); for (int i = 1; i < PageControl1->PageCount; i++) { InstallSourceTab *ist = (InstallSourceTab *) MainForm->PageControl1->Pages[i]->Controls[0]; ! SWBuf parent = (SWBuf)"./sources/" + ist->is.source; ! fillSourceTree(parent.c_str(), ist->tree); } } --- 418,428 ---- //--------------------------------------------------------------------------- void TMainForm::fillAllSourceTrees() { ! fillSourceTree(localTree); for (int i = 1; i < PageControl1->PageCount; i++) { InstallSourceTab *ist = (InstallSourceTab *) MainForm->PageControl1->Pages[i]->Controls[0]; ! fillSourceTree(ist->tree, ist->is); } } *************** *** 444,448 **** if (node) { if (node->Parent) { ! removeModule((const char *)node->Data); delete manager; manager = new SWMgr(); --- 434,438 ---- if (node) { if (node->Parent) { ! installMgr->removeModule(manager, (const char *)node->Data); delete manager; manager = new SWMgr(); *************** *** 493,497 **** CipherForm->cipherEdit->Text = ""; if ((node->ImageIndex == 2) || (node->ImageIndex == 4)) { // if this is an upgrade ! removeModule((const char *)node->Data); } // install module --- 483,487 ---- CipherForm->cipherEdit->Text = ""; if ((node->ImageIndex == 2) || (node->ImageIndex == 4)) { // if this is an upgrade ! installMgr->removeModule(manager, (const char *)node->Data); } // install module *************** *** 499,504 **** statusBar->Repaint(); if (tree == localTree) ! abort = installModule((const char *)node->Data); ! else abort = installModule((const char *)node->Data, (InstallSourceTab *) PageControl1->ActivePage->Controls[0]); if (abort) break; --- 489,494 ---- statusBar->Repaint(); if (tree == localTree) ! abort = installMgr->installModule(manager, getLocalDir(), (const char *)node->Data, 0); ! else abort = installMgr->installModule(manager, 0, (const char *)node->Data, ((InstallSourceTab *) PageControl1->ActivePage->Controls[0])->is); if (abort) break; *************** *** 515,533 **** - int TMainForm::FTPCopy(InstallSourceTab *ist, const char *src, const char *dest, bool dirTransfer, const char *suffix) - { - StatusForm->ist = ist; - StatusForm->src = src; - StatusForm->dest = dest; - StatusForm->suffix = suffix; - StatusForm->dirTransfer = dirTransfer; - StatusForm->passive = passive; - Application->ProcessMessages(); - if (StatusForm->ShowModal() == mrCancel) - return -1; - else return 0; - } - - void __fastcall TMainForm::RefreshRemoteSource(TObject *Sender) { --- 505,508 ---- *************** *** 538,543 **** SWBuf modDir; SWBuf modFile; ! SWBuf root = "./sources/"; ! root += ist->is.source.c_str(); SWBuf target = root + "/mods.d"; --- 513,518 ---- SWBuf modDir; SWBuf modFile; ! SWBuf root = "./installMgr/"; ! root += ist->is->source.c_str(); SWBuf target = root + "/mods.d"; *************** *** 556,571 **** ! SWBuf archive = root + "/mods.d.tar.gz"; ! if (!FTPCopy(ist, "mods.d.tar.gz", archive.c_str(), false)) { ! int fd = open(archive.c_str(), O_RDONLY|O_BINARY); ! untargz(fd, root.c_str()); ! close(fd); ! } ! else FTPCopy(ist, "mods.d", target.c_str(), true, ".conf"); ! ! target = "./sources/"; ! target += ist->is.source.c_str(); ! fillSourceTree(target.c_str(), ist->tree); } --- 531,543 ---- ! SWBuf archive = root + "/mods.d.tar.gz"; ! if (!installMgr->FTPCopy(ist->is, "mods.d.tar.gz", archive.c_str(), false)) { ! int fd = open(archive.c_str(), O_RDONLY|O_BINARY); ! untargz(fd, root.c_str()); ! close(fd); ! } ! else installMgr->FTPCopy(ist->is, "mods.d", target.c_str(), true, ".conf"); ! fillSourceTree(ist->tree, ist->is); } *************** *** 580,586 **** InfoForm->ShowModal(); if (RemoteMntForm->ShowModal() == mrOk) { ! delete installConf; ! installConf = new SWConfig("./InstallMgr.conf"); ! refreshPageControl(); } --- 552,557 ---- InfoForm->ShowModal(); if (RemoteMntForm->ShowModal() == mrOk) { ! delete installMgr; ! installMgr = new InstallMgrWin("./installMgr"); refreshPageControl(); } *************** *** 605,609 **** if (node->Parent) { if (ist) ! sourceDir = (SWBuf)"./sources/" + ist->is.source; else sourceDir = getLocalDir(); SWMgr *mgr = new SWMgr(sourceDir.c_str()); --- 576,580 ---- if (node->Parent) { if (ist) ! sourceDir = (SWBuf)"./installMgr/" + ist->is->source; else sourceDir = getLocalDir(); SWMgr *mgr = new SWMgr(sourceDir.c_str()); *************** *** 691,695 **** UninstallForm->Label1->Caption = label.c_str(); UninstallForm->Label1->Repaint(); ! removeModule(it->second->Name()); UninstallForm->ProgressBar1->Position = UninstallForm->ProgressBar1->Position + 1; UninstallForm->ProgressBar1->Repaint(); --- 662,666 ---- UninstallForm->Label1->Caption = label.c_str(); UninstallForm->Label1->Repaint(); ! installMgr->removeModule(mgr, it->second->Name()); UninstallForm->ProgressBar1->Position = UninstallForm->ProgressBar1->Position + 1; UninstallForm->ProgressBar1->Repaint(); Index: MainFrm.h =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MainFrm.h 27 Jun 2003 01:41:06 -0000 1.8 --- MainFrm.h 7 Jul 2003 00:25:59 -0000 1.9 *************** *** 28,37 **** class InstallSourceTab : public TControl { public: ! __fastcall InstallSourceTab(TComponent *Owner, const char *confEnt, const char *type); __fastcall ~InstallSourceTab(); ! InstallSource is; TTreeView *tree; }; //--------------------------------------------------------------------------- --- 28,44 ---- class InstallSourceTab : public TControl { public: ! __fastcall InstallSourceTab(TComponent *Owner, InstallSource *is); __fastcall ~InstallSourceTab(); ! InstallSource *is; TTreeView *tree; }; + class InstallMgrWin : public InstallMgr { + public: + InstallMgrWin(const char *privatePath = "./") : InstallMgr(privatePath) {} + virtual int FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = ""); + virtual void statusUpdate(double dltotal, double dlnow); + virtual void preDownloadStatus(long totalBytes, long completedBytes, const char *message); + }; //--------------------------------------------------------------------------- *************** *** 102,106 **** SWMgr *manager; - SWConfig *installConf; const char *getLocalDir(); void setLocalDir(const char *idir); --- 109,112 ---- *************** *** 115,125 **** void __fastcall RefreshRemoteSource(TObject *Sender); int selectAll(TTreeView *tree, bool sel); - int FTPCopy(InstallSourceTab *ist, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = ""); SWMgr *localMgr; ! bool passive; protected: virtual void fillInstallTree(); ! virtual void fillSourceTree(const char *sourceConf, TTreeView *tree); }; --- 121,130 ---- void __fastcall RefreshRemoteSource(TObject *Sender); int selectAll(TTreeView *tree, bool sel); SWMgr *localMgr; ! InstallMgrWin *installMgr; protected: virtual void fillInstallTree(); ! virtual void fillSourceTree(TTreeView *tree, InstallSource *is = 0); }; Index: StatusFrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/StatusFrm.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** StatusFrm.cpp 27 Jun 2003 01:41:06 -0000 1.16 --- StatusFrm.cpp 7 Jul 2003 00:25:59 -0000 1.17 *************** *** 22,47 **** - void status_callback(double dltotal, double dlnow) { - int filePercent = (int)((float)(dlnow + 1) / (float)(dltotal) * 100); - int totalPercent = (int)((float)(dlnow + StatusForm->completedBytes + 1) / (float)(StatusForm->totalBytes) * 100); - StatusForm->statusBar->Caption = ::IntToStr((long)dlnow) + " bytes out of " + ::IntToStr((long)dltotal) + " transferred (file: " + IntToStr(filePercent) + "% / total: " + IntToStr(totalPercent) + "%)"; - StatusForm->fileProgress->Position = filePercent; - StatusForm->totalProgress->Position = totalPercent; - - StatusForm->statusBar->Repaint(); - } - - //--------------------------------------------------------------------------- __fastcall TStatusForm::TStatusForm(TComponent* Owner) : TForm(Owner) { suffix = ""; - passive = false; - ftpCon = new TFTPCon(); } __fastcall TStatusForm::~TStatusForm() { - delete ftpCon; } --- 22,33 ---- *************** *** 50,63 **** void __fastcall TStatusForm::FormShow(TObject *Sender) { ! abort = false; ! ftpThread = new TFTPThread(ist, src.c_str(), dest.c_str(), dirTransfer, passive, true, suffix.c_str()); ftpThread->OnTerminate = Cleanup; ftpThread->Resume(); } //--------------------------------------------------------------------------- ! __fastcall TStatusForm::TFTPThread::TFTPThread(InstallSourceTab *iist, const char *isrc, const char *idest, bool idirTransfer, bool CreateSuspended, bool ipassive, const char *isuffix) : TThread(CreateSuspended) { ! ist = iist; src = isrc; dest = idest; --- 36,48 ---- void __fastcall TStatusForm::FormShow(TObject *Sender) { ! ftpThread = new TFTPThread(is, src.c_str(), dest.c_str(), dirTransfer, true, suffix.c_str()); ftpThread->OnTerminate = Cleanup; ftpThread->Resume(); } //--------------------------------------------------------------------------- ! __fastcall TStatusForm::TFTPThread::TFTPThread(InstallSource *iis, const char *isrc, const char *idest, bool idirTransfer, bool CreateSuspended, const char *isuffix) : TThread(CreateSuspended) { ! is = iis; src = isrc; dest = idest; *************** *** 65,69 **** dirTransfer = idirTransfer; Priority = tpNormal; - passive = ipassive; FreeOnTerminate = true; Synchronize((TThreadMethod)&CreateFTPObject); --- 50,53 ---- *************** *** 75,174 **** ! void __fastcall TStatusForm::TFTPThread::Execute() ! { ! void *session = FTPOpenSession(); Synchronize((TThreadMethod)&PreConnect); - StatusForm->ftpCon->Host = ist->is.source.c_str(); - StatusForm->ftpCon->Username = "ftp"; - StatusForm->ftpCon->Password = "installmgr@user.com"; - StatusForm->ftpCon->Passive = passive; ! ! /* ! try { ! StatusForm->ftpCon->Connect(true, -1); ! StatusForm->ftpCon->TransferType = ftBinary; ! StatusForm->ftpCon->ChangeDir(ist->Directory.c_str()); ! } ! catch(...) { ! MessageBox(0, "Can't connect. Please check your configuration.", "Connection Error", MB_OK); ! StatusForm->Button1Click(0); // abort thread ! } ! */ ! SWBuf url = (SWBuf)"ftp://" + ist->is.source + ist->is.directory.c_str() + "/"; //dont forget the final slash ! if (FTPURLGetFile(session, "dirlist", url.c_str())) { ! MessageBox(0, "Can't connect. Please check your configuration.", "Connection Error", MB_OK); ! StatusForm->Button1Click(0); // abort thread ! } ! if (!Terminated) { ! if (dirTransfer) { ! // StatusForm->ftpCon->ChangeDir(src.c_str()); ! ! ! SWBuf url = (SWBuf)"ftp://" + ist->is.source + ist->is.directory.c_str() + "/" + src + "/"; //dont forget the final slash ! vector dirList = FTPURLGetDir(session, url.c_str(), passive); ! if (!dirList.size()) { MessageBox(0, "Can't connect. Please check your configuration.", "Connection Error", MB_OK); StatusForm->Button1Click(0); // abort thread } ! ! // StatusForm->ftpCon->List(dirText, "*", true); ! // TIdFTPListItems *dirList = StatusForm->ftpCon->DirectoryListing; ! StatusForm->totalBytes = 0; ! for (int i = 0; i < dirList.size(); i++) ! StatusForm->totalBytes += dirList[i].size; ! StatusForm->completedBytes = 0; ! for (int i = 0; i < dirList.size(); i++) { ! if (dirList[i].flagtrycwd != 1) { ! buffer = dest + "/" + (dirList[i].name); ! // files->Strings[i].c_str(); ! if (!strcmp(&buffer.c_str()[buffer.length()-suffix.length()], suffix.c_str())) { ! buffer2 = "Downloading ("; ! buffer2 += IntToStr(i+1).c_str(); ! buffer2 += " of "; ! buffer2 += IntToStr(dirList.size()).c_str(); ! buffer2 += "): "; ! buffer2 += (dirList[i].name); ! // SWLog::systemlog->LogInformation("%s", buffer.c_str()); ! FileMgr::createParent(buffer.c_str()); // make sure parent directory exists ! Synchronize((TThreadMethod)&PreDownload1); ! try { ! // StatusForm->ftpCon->Get(dirList->Items[i]->FileName.c_str(), buffer.c_str(), true, false); ! ! SWBuf url = (SWBuf)"ftp://" + ist->is.source + ist->is.directory.c_str() + "/" + src + "/" + dirList[i].name; //dont forget the final slash ! ! if (FTPURLGetFile(session, buffer.c_str(), url.c_str(), passive, status_callback)) { ! MessageBox(0, "Can't download file. If you have not done so recently, you might try pressing the Refresh from Remote Source button.", "Download Error", MB_OK); ! StatusForm->Button1Click(0); // abort thread ! } ! StatusForm->completedBytes += dirList[i].size; ! } ! catch (...) {} ! if (Terminated) ! break; ! } ! } ! } ! } ! else { ! Synchronize((TThreadMethod)&PreDownload2); ! try { ! // StatusForm->ftpCon->Get(src.c_str(), dest.c_str(), true, false); ! SWBuf url = (SWBuf)"ftp://" + ist->is.source + ist->is.directory.c_str() + "/" + src.c_str(); //dont forget the final slash ! if (FTPURLGetFile(session, dest.c_str(), url.c_str(), status_callback)) { ! MessageBox(0, "Can't connect. Please check your configuration.", "Connection Error", MB_OK); ! StatusForm->Button1Click(0); // abort thread ! } ! } ! catch(...) {StatusForm->abort = true;} ! } ! try { ! // StatusForm->ftpCon->Disconnect(); ! FTPCloseSession(session); ! } ! catch(...){} } } --- 59,78 ---- ! void __fastcall TStatusForm::TFTPThread::Execute() { Synchronize((TThreadMethod)&PreConnect); ! int status = MainForm->installMgr->InstallMgr::FTPCopy(is, src, dest, dirTransfer, suffix); ! if (status == -1) { MessageBox(0, "Can't connect. Please check your configuration.", "Connection Error", MB_OK); StatusForm->Button1Click(0); // abort thread } ! // Synchronize((TThreadMethod)&PreDownload1); ! if (status == -2) { ! MessageBox(0, "Can't download file. If you have not done so recently, you might try pressing the Refresh from Remote Source button.", "Download Error", MB_OK); ! StatusForm->Button1Click(0); // abort thread } + // Synchronize((TThreadMethod)&PreDownload2); } *************** *** 193,200 **** void __fastcall TStatusForm::TFTPThread::PreConnect(void) { ! buffer = "Connecting to server at "; ! buffer += ist->is.source.c_str(); ! buffer += "..."; ! StatusForm->actionBar->Caption = buffer.c_str(); StatusForm->statusBar->Caption = ""; StatusForm->Repaint(); --- 97,104 ---- void __fastcall TStatusForm::TFTPThread::PreConnect(void) { ! StatusForm->buffer = "Connecting to server at "; ! StatusForm->buffer += is->source.c_str(); ! StatusForm->buffer += "..."; ! StatusForm->actionBar->Caption = StatusForm->buffer.c_str(); StatusForm->statusBar->Caption = ""; StatusForm->Repaint(); *************** *** 202,212 **** ! void __fastcall TStatusForm::TFTPThread::PreDownload1(void) ! { // SWLog::systemlog->LogInformation("Creating parent dir: %s", buffer.c_str()); // SWLog::systemlog->LogInformation("Return: %d", ret); ! StatusForm->actionBar->Caption = buffer2.c_str(); ! StatusForm->statusBar->Caption = ""; ! StatusForm->Repaint(); } --- 106,115 ---- ! void __fastcall TStatusForm::PreDownload1(void) { // SWLog::systemlog->LogInformation("Creating parent dir: %s", buffer.c_str()); // SWLog::systemlog->LogInformation("Return: %d", ret); ! actionBar->Caption = StatusForm->buffer2.c_str(); ! statusBar->Caption = ""; ! Repaint(); } *************** *** 214,220 **** void __fastcall TStatusForm::TFTPThread::PreDownload2(void) { ! buffer = "Downloading: "; ! buffer += src.c_str(); ! StatusForm->actionBar->Caption = buffer.c_str(); StatusForm->statusBar->Caption = ""; StatusForm->Repaint(); --- 117,123 ---- void __fastcall TStatusForm::TFTPThread::PreDownload2(void) { ! StatusForm->buffer = "Downloading: "; ! StatusForm->buffer += src.c_str(); ! StatusForm->actionBar->Caption = StatusForm->buffer.c_str(); StatusForm->statusBar->Caption = ""; StatusForm->Repaint(); *************** *** 226,230 **** //void __fastcall TStatusForm::TFTPThread::Cleanup() { ! if (abort) StatusForm->ModalResult = mrCancel; else StatusForm->ModalResult = mrOk; --- 129,133 ---- //void __fastcall TStatusForm::TFTPThread::Cleanup() { ! if (MainForm->installMgr->terminate) StatusForm->ModalResult = mrCancel; else StatusForm->ModalResult = mrOk; *************** *** 241,246 **** void __fastcall TStatusForm::Button1Click(TObject *Sender) { ! abort = true; ! // ftpCon->Abort(); ftpThread->Terminate(); } --- 144,148 ---- void __fastcall TStatusForm::Button1Click(TObject *Sender) { ! MainForm->installMgr->terminate = true; ftpThread->Terminate(); } Index: StatusFrm.h =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/StatusFrm.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** StatusFrm.h 27 Jun 2003 01:41:06 -0000 1.10 --- StatusFrm.h 7 Jul 2003 00:25:59 -0000 1.11 *************** *** 18,33 **** //--------------------------------------------------------------------------- ! class TFTPCon { ! public: ! SWBuf Host; ! SWBuf Username; ! SWBuf Password; ! bool Passive; ! SWBuf cwd; ! ! }; ! ! class TStatusForm : public TForm ! { __published: // IDE-managed Components TPanel *Panel1; --- 18,22 ---- //--------------------------------------------------------------------------- ! class TStatusForm : public TForm { __published: // IDE-managed Components TPanel *Panel1; *************** *** 49,86 **** private: // User declarations class TFTPThread : public TThread { ! bool abort; ! InstallSourceTab *ist; SWBuf src; SWBuf dest; - SWBuf buffer; - SWBuf buffer2; SWBuf suffix; bool dirTransfer; - bool passive; protected: void __fastcall Execute(); public: // TNMFTP *FTPLink; ! __fastcall TFTPThread(InstallSourceTab *iist, const char *isrc, const char *idest, bool idirTransfer = false, bool CreateSuspended = false, bool ipassive = false, const char *suffix = ""); __fastcall TFTPThread::~TFTPThread(); void __fastcall FTPLinkPacketRecvd(TObject *Sender); void __fastcall CreateFTPObject(void); void __fastcall PreConnect(void); - void __fastcall PreDownload1(void); void __fastcall PreDownload2(void); // void __fastcall Cleanup(void); } *ftpThread; public: // User declarations ! TFTPCon *ftpCon; long completedBytes; long totalBytes; ! InstallSourceTab *ist; SWBuf src; SWBuf dest; SWBuf suffix; bool dirTransfer; ! bool passive; ! bool abort; ! void __fastcall UpdateBytes(); __fastcall TStatusForm(TComponent* Owner); __fastcall ~TStatusForm(); --- 38,70 ---- private: // User declarations class TFTPThread : public TThread { ! InstallSource *is; SWBuf src; SWBuf dest; SWBuf suffix; bool dirTransfer; protected: void __fastcall Execute(); public: // TNMFTP *FTPLink; ! __fastcall TFTPThread(InstallSource *iis, const char *isrc, const char *idest, bool idirTransfer = false, bool CreateSuspended = false, const char *suffix = ""); __fastcall TFTPThread::~TFTPThread(); void __fastcall FTPLinkPacketRecvd(TObject *Sender); void __fastcall CreateFTPObject(void); void __fastcall PreConnect(void); void __fastcall PreDownload2(void); // void __fastcall Cleanup(void); } *ftpThread; public: // User declarations ! void __fastcall PreDownload1(void); long completedBytes; long totalBytes; ! InstallSource *is; SWBuf src; SWBuf dest; SWBuf suffix; + SWBuf buffer; + SWBuf buffer2; bool dirTransfer; ! void __fastcall UpdateBytes(); __fastcall TStatusForm(TComponent* Owner); __fastcall ~TStatusForm(); From sword@www.crosswire.org Mon Jul 7 00:26:01 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 17:26:01 -0700 Subject: [sword-cvs] sword/src/modules/filters thmlscripref.cpp,1.12,1.13 Message-ID: <200307070026.h670Q1i20821@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/modules/filters In directory www:/tmp/cvs-serv20766/src/modules/filters Modified Files: thmlscripref.cpp Log Message: More install code into engine Index: thmlscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlscripref.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** thmlscripref.cpp 5 Jul 2003 04:58:42 -0000 1.12 --- thmlscripref.cpp 7 Jul 2003 00:25:59 -0000 1.13 *************** *** 48,56 **** if (!strnicmp(token.c_str(), "scripRef", 8)) { hide = true; ! continue; } else if (!strnicmp(token.c_str(), "/scripRef", 9)) { hide = false; ! continue; } --- 48,56 ---- if (!strnicmp(token.c_str(), "scripRef", 8)) { hide = true; ! continue; } else if (!strnicmp(token.c_str(), "/scripRef", 9)) { hide = false; ! continue; } From sword@www.crosswire.org Mon Jul 7 00:26:01 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 17:26:01 -0700 Subject: [sword-cvs] sword/src/mgr installmgr.cpp,1.7,1.8 Message-ID: <200307070026.h670Q1i20822@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/mgr In directory www:/tmp/cvs-serv20766/src/mgr Modified Files: installmgr.cpp Log Message: More install code into engine Index: installmgr.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/mgr/installmgr.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** installmgr.cpp 27 Jun 2003 02:21:05 -0000 1.7 --- installmgr.cpp 7 Jul 2003 00:25:59 -0000 1.8 *************** *** 35,38 **** --- 35,41 ---- SWORD_NAMESPACE_START + int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream); + int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); + static InstallMgr_init _InstallMgr_init; *************** *** 68,72 **** int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { if (clientp) { ! (*(void (*)(double, double))clientp)(dltotal, dlnow); } return 0; --- 71,75 ---- int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { if (clientp) { ! ((InstallMgr *)clientp)->statusUpdate(dltotal, dlnow); } return 0; *************** *** 74,78 **** ! char FTPURLGetFile(void *session, const char *dest, const char *sourceurl, bool passive, void (*status_callback)(double dltotal, double dlnow)) { char retVal = 0; #ifdef CURLAVAILABLE --- 77,123 ---- ! InstallMgr::InstallMgr(const char *privatePath) { ! this->privatePath = 0; ! stdstr(&(this->privatePath), privatePath); ! installConf = new SWConfig(((SWBuf)privatePath + "/InstallMgr.conf").c_str()); ! ! SectionMap::iterator sourcesSection; ! ConfigEntMap::iterator sourceBegin; ! ConfigEntMap::iterator sourceEnd; ! ! sources.clear(); ! ! sourcesSection = installConf->Sections.find("Sources"); ! passive = (!stricmp((*installConf)["General"]["PassiveFTP"].c_str(), "true")); ! ! if (sourcesSection != installConf->Sections.end()) { ! sourceBegin = sourcesSection->second.lower_bound("FTPSource"); ! sourceEnd = sourcesSection->second.upper_bound("FTPSource"); ! ! while (sourceBegin != sourceEnd) { ! InstallSource *is = new InstallSource(sourceBegin->second.c_str(), "FTP"); ! sources[is->caption] = is; ! SWBuf parent = (SWBuf)privatePath + "/" + is->source + "/file"; ! FileMgr::createParent(parent.c_str()); ! is->localShadow = (SWBuf)privatePath + "/" + is->source; ! sourceBegin++; ! } ! } ! } ! ! ! InstallMgr::~InstallMgr() { ! delete [] privatePath; ! delete installConf; ! } ! ! ! void InstallMgr::statusUpdate(double dltotal, double dlnow) { ! } ! ! void InstallMgr::preDownloadStatus(long totalBytes, long completedBytes, const char *message) { ! } ! ! char InstallMgr::FTPURLGetFile(void *session, const char *dest, const char *sourceurl) { char retVal = 0; #ifdef CURLAVAILABLE *************** *** 90,94 **** curl_easy_setopt(curl, CURLOPT_FTPPORT, "-"); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); ! curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, status_callback); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, my_fprogress); /* Set a pointer to our struct to pass to the callback */ --- 135,139 ---- curl_easy_setopt(curl, CURLOPT_FTPPORT, "-"); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); ! curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, my_fprogress); /* Set a pointer to our struct to pass to the callback */ *************** *** 115,123 **** ! vector FTPURLGetDir(void *session, const char *dirurl, bool passive) { vector dirList; ! if (!FTPURLGetFile(session, "dirlist", dirurl, passive)) { int fd = open("dirlist", O_RDONLY|O_BINARY); long size = lseek(fd, 0, SEEK_END); --- 160,168 ---- ! vector InstallMgr::FTPURLGetDir(void *session, const char *dirurl) { vector dirList; ! if (!FTPURLGetFile(session, "dirlist", dirurl)) { int fd = open("dirlist", O_RDONLY|O_BINARY); long size = lseek(fd, 0, SEEK_END); *************** *** 151,155 **** ! void *FTPOpenSession() { void *retVal = 0; #ifdef CURLAVAILABLE --- 196,200 ---- ! void *InstallMgr::FTPOpenSession() { void *retVal = 0; #ifdef CURLAVAILABLE *************** *** 164,168 **** ! void FTPCloseSession(void *session) { #ifdef CURLAVAILABLE CURL *curl = (CURL *)session; --- 209,213 ---- ! void InstallMgr::FTPCloseSession(void *session) { #ifdef CURLAVAILABLE CURL *curl = (CURL *)session; *************** *** 174,178 **** ! int removeModule(SWMgr *manager, const char *modName) { SectionMap::iterator module; ConfigEntMap::iterator fileBegin; --- 219,223 ---- ! int InstallMgr::removeModule(SWMgr *manager, const char *modName) { SectionMap::iterator module; ConfigEntMap::iterator fileBegin; *************** *** 254,257 **** --- 299,303 ---- this->type = type; mgr = 0; + userData = 0; } *************** *** 263,268 **** ! int installModule(const char *fromLocation, const char *modName, InstallSource *is) { ! /* SectionMap::iterator module, section; ConfigEntMap::iterator fileBegin; --- 309,377 ---- ! int InstallMgr::FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { ! terminate = false; ! void *session = FTPOpenSession(); ! SWBuf url = (SWBuf)"ftp://" + is->source + is->directory.c_str() + "/"; //dont forget the final slash ! if (FTPURLGetFile(session, "dirlist", url.c_str())) { ! return -1; ! } ! if (dirTransfer) { ! SWBuf url = (SWBuf)"ftp://" + is->source + is->directory.c_str() + "/" + src + "/"; //dont forget the final slash ! vector dirList = FTPURLGetDir(session, url.c_str()); ! ! if (!dirList.size()) { ! return -1; ! } ! ! long totalBytes = 0; ! for (int i = 0; i < dirList.size(); i++) ! totalBytes += dirList[i].size; ! long completedBytes = 0; ! for (int i = 0; i < dirList.size(); i++) { ! if (dirList[i].flagtrycwd != 1) { ! SWBuf buffer = (SWBuf)dest + "/" + (dirList[i].name); ! if (!strcmp(&buffer.c_str()[buffer.length()-strlen(suffix)], suffix)) { ! SWBuf buffer2 = "Downloading ("; ! buffer2.appendFormatted("%d", i+1); ! buffer2 += " of "; ! buffer2.appendFormatted("%d", dirList.size()); ! buffer2 += "): "; ! buffer2 += (dirList[i].name); ! preDownloadStatus(totalBytes, completedBytes, buffer2.c_str()); ! FileMgr::createParent(buffer.c_str()); // make sure parent directory exists ! try { ! SWBuf url = (SWBuf)"ftp://" + is->source + is->directory.c_str() + "/" + src + "/" + dirList[i].name; //dont forget the final slash ! if (FTPURLGetFile(session, buffer.c_str(), url.c_str())) { ! return -2; ! } ! completedBytes += dirList[i].size; ! } ! catch (...) {} ! if (terminate) ! break; ! } ! } ! } ! } ! else { ! // Synchronize((TThreadMethod)&PreDownload2); ! try { ! SWBuf url = (SWBuf)"ftp://" + is->source + is->directory.c_str() + "/" + src; //dont forget the final slash ! if (FTPURLGetFile(session, dest, url.c_str())) { ! return -1; ! } ! } ! catch(...) { ! terminate = true; ! } ! } ! try { ! FTPCloseSession(session); ! } ! catch(...){} ! } ! ! ! int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is) { SectionMap::iterator module, section; ConfigEntMap::iterator fileBegin; *************** *** 274,284 **** bool cipher = false; ! sourceDir = fromLocation; ! /* ! if (ist) ! sourceDir = (SWBuf)"./sources/" + ist->is.source; ! else sourceDir = getLocalDir(); ! */ ! /* SWMgr mgr(sourceDir.c_str()); --- 383,391 ---- bool cipher = false; ! ! if (is) ! sourceDir = (SWBuf)privatePath + "/" + is->source; ! else sourceDir = fromLocation; ! SWMgr mgr(sourceDir.c_str()); *************** *** 310,314 **** // DO THE INSTALL while (fileBegin != fileEnd) { ! copyFileToCWD(sourceDir.c_str(), fileBegin->second.c_str()); fileBegin++; } --- 417,421 ---- // DO THE INSTALL while (fileBegin != fileEnd) { ! copyFileToSWORDInstall(destMgr, sourceDir.c_str(), fileBegin->second.c_str()); fileBegin++; } *************** *** 370,374 **** modFile += "/"; modFile += ent->d_name; ! copyFileToSWORDInstall(sourceOrig.c_str(), modFile.c_str()); } } --- 477,481 ---- modFile += "/"; modFile += ent->d_name; ! copyFileToSWORDInstall(destMgr, sourceOrig.c_str(), modFile.c_str()); } } *************** *** 402,410 **** if (config->Sections.find(modName) != config->Sections.end()) { delete config; ! SWBuf targetFile = manager->configPath; //"./mods.d/"; targetFile += "/"; targetFile += ent->d_name; FileMgr::copyFile(modFile.c_str(), targetFile.c_str()); if (cipher) { CipherForm->modName = modName; CipherForm->confFile = targetFile; --- 509,518 ---- if (config->Sections.find(modName) != config->Sections.end()) { delete config; ! SWBuf targetFile = destMgr->configPath; //"./mods.d/"; targetFile += "/"; targetFile += ent->d_name; FileMgr::copyFile(modFile.c_str(), targetFile.c_str()); if (cipher) { + /* CipherForm->modName = modName; CipherForm->confFile = targetFile; *************** *** 413,416 **** --- 521,525 ---- aborted = true; } + */ } } *************** *** 425,434 **** return (aborted) ? -1 : 0; } - */ return 1; } ! int copyFileToSWORDInstall(SWMgr *manager, const char *sourceDir, const char *fName) { SWBuf sourcePath = sourceDir; sourcePath += fName; --- 534,542 ---- return (aborted) ? -1 : 0; } return 1; } ! int InstallMgr::copyFileToSWORDInstall(SWMgr *manager, const char *sourceDir, const char *fName) { SWBuf sourcePath = sourceDir; sourcePath += fName; From sword@www.crosswire.org Mon Jul 7 00:26:01 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 17:26:01 -0700 Subject: [sword-cvs] sword/lib/bcppmake libsword.bpf,1.16,1.17 libsword.bpr,1.23,1.24 Message-ID: <200307070026.h670Q1i20824@www.crosswire.org> Update of /usr/local/cvsroot/sword/lib/bcppmake In directory www:/tmp/cvs-serv20766/lib/bcppmake Modified Files: libsword.bpf libsword.bpr Log Message: More install code into engine Index: libsword.bpf =================================================================== RCS file: /usr/local/cvsroot/sword/lib/bcppmake/libsword.bpf,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** libsword.bpf 27 Jun 2003 06:30:39 -0000 1.16 --- libsword.bpf 7 Jul 2003 00:25:59 -0000 1.17 *************** *** 130,133 **** --- 130,134 ---- USEUNIT("..\..\src\modules\filters\osisscripref.cpp"); USEUNIT("..\..\src\modules\filters\osislemma.cpp"); + USEUNIT("..\..\src\modules\filters\swoptfilter.cpp"); //--------------------------------------------------------------------------- USE("\\ preptext(entrybuf); Index: libsword.bpr =================================================================== RCS file: /usr/local/cvsroot/sword/lib/bcppmake/libsword.bpr,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** libsword.bpr 28 Jun 2003 21:31:20 -0000 1.23 --- libsword.bpr 7 Jul 2003 00:25:59 -0000 1.24 *************** *** 98,102 **** ..\..\src\utilfuns\swversion.obj ..\..\src\modules\filters\osisredletterwords.obj ..\..\src\modules\filters\osisscripref.obj ! ..\..\src\modules\filters\osislemma.obj"/> --- 98,103 ---- ..\..\src\utilfuns\swversion.obj ..\..\src\modules\filters\osisredletterwords.obj ..\..\src\modules\filters\osisscripref.obj ! ..\..\src\modules\filters\osislemma.obj ! ..\..\src\modules\filters\swoptfilter.obj"/> *************** *** 112,116 **** ! --- 113,117 ---- ! *************** *** 135,141 **** -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -D_DEBUG -boa"/> ! ! ! --- 136,142 ---- -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -D_DEBUG -boa"/> ! ! ! *************** *** 206,211 **** [HistoryLists\hlConditionals] Count=8 ! Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG ! Item1=_ICU_;_ICUSWORD_;USBINARY Item2=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG Item3=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE --- 207,212 ---- [HistoryLists\hlConditionals] Count=8 ! Item0=_ICU_;_ICUSWORD_;USBINARY ! Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG Item3=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE From sword@www.crosswire.org Mon Jul 7 01:16:17 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 18:16:17 -0700 Subject: [sword-cvs] sword/src/modules/filters gbffootnotes.cpp,1.19,1.20 gbfheadings.cpp,1.10,1.11 gbfmorph.cpp,1.11,1.12 gbfredletterwords.cpp,1.7,1.8 gbfstrongs.cpp,1.23,1.24 osisfootnotes.cpp,1.10,1.11 osisheadings.cpp,1.7,1.8 osislemma.cpp,1.3,1.4 osismorph.cpp,1.8,1.9 osisredletterwords.cpp,1.5,1.6 osisscripref.cpp,1.3,1.4 osisstrongs.cpp,1.8,1.9 plainfootnotes.cpp,1.12,1.13 thmlfootnotes.cpp,1.12,1.13 thmlheadings.cpp,1.11,1.12 thmllemma.cpp,1.9,1.10 thmlmorph.cpp,1.14,1.15 thmlscripref.cpp,1.13,1.14 thmlstrongs.cpp,1.17,1.18 utf8cantillation.cpp,1.8,1.9 utf8greekaccents.cpp,1.10,1.11 utf8hebrewpoints.cpp,1.10,1.11 Message-ID: <200307070116.h671GHi27327@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/modules/filters In directory www:/tmp/cvs-serv27282 Modified Files: gbffootnotes.cpp gbfheadings.cpp gbfmorph.cpp gbfredletterwords.cpp gbfstrongs.cpp osisfootnotes.cpp osisheadings.cpp osislemma.cpp osismorph.cpp osisredletterwords.cpp osisscripref.cpp osisstrongs.cpp plainfootnotes.cpp thmlfootnotes.cpp thmlheadings.cpp thmllemma.cpp thmlmorph.cpp thmlscripref.cpp thmlstrongs.cpp utf8cantillation.cpp utf8greekaccents.cpp utf8hebrewpoints.cpp Log Message: Index: gbffootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbffootnotes.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** gbffootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.19 --- gbffootnotes.cpp 7 Jul 2003 01:16:15 -0000 1.20 *************** *** 18,23 **** const char oTip[] = "Toggles Footnotes On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); --- 18,23 ---- const char oTip[] = "Toggles Footnotes On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); Index: gbfheadings.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfheadings.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gbfheadings.cpp 5 Jul 2003 04:58:42 -0000 1.10 --- gbfheadings.cpp 7 Jul 2003 01:16:15 -0000 1.11 *************** *** 19,24 **** const char oTip[] = "Toggles Headings On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, &oValues) { --- 19,24 ---- const char oTip[] = "Toggles Headings On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, &oValues) { Index: gbfmorph.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfmorph.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gbfmorph.cpp 5 Jul 2003 04:58:42 -0000 1.11 --- gbfmorph.cpp 7 Jul 2003 01:16:15 -0000 1.12 *************** *** 18,23 **** const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, &oValues) { --- 18,23 ---- const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, &oValues) { Index: gbfredletterwords.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfredletterwords.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gbfredletterwords.cpp 5 Jul 2003 04:58:42 -0000 1.7 --- gbfredletterwords.cpp 7 Jul 2003 01:16:15 -0000 1.8 *************** *** 20,25 **** const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { --- 20,25 ---- const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { Index: gbfstrongs.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/gbfstrongs.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** gbfstrongs.cpp 5 Jul 2003 04:58:42 -0000 1.23 --- gbfstrongs.cpp 7 Jul 2003 01:16:15 -0000 1.24 *************** *** 20,25 **** const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, &oValues) { --- 20,25 ---- const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, &oValues) { Index: osisfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisfootnotes.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** osisfootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.10 --- osisfootnotes.cpp 7 Jul 2003 01:16:15 -0000 1.11 *************** *** 22,27 **** const char oTip[] = "Toggles Footnotes On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, &oValues) { --- 22,27 ---- const char oTip[] = "Toggles Footnotes On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, &oValues) { Index: osisheadings.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisheadings.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** osisheadings.cpp 5 Jul 2003 04:58:42 -0000 1.7 --- osisheadings.cpp 7 Jul 2003 01:16:15 -0000 1.8 *************** *** 20,25 **** const char oTip[] = "Toggles Headings On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, &oValues) { --- 20,25 ---- const char oTip[] = "Toggles Headings On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, &oValues) { Index: osislemma.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osislemma.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osislemma.cpp 5 Jul 2003 04:58:42 -0000 1.3 --- osislemma.cpp 7 Jul 2003 01:16:15 -0000 1.4 *************** *** 19,24 **** const char oTip[] = "Toggles Lemmas On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, &oValues) { --- 19,24 ---- const char oTip[] = "Toggles Lemmas On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, &oValues) { Index: osismorph.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osismorph.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** osismorph.cpp 5 Jul 2003 04:58:42 -0000 1.8 --- osismorph.cpp 7 Jul 2003 01:16:15 -0000 1.9 *************** *** 19,24 **** const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, &oValues) { --- 19,24 ---- const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, &oValues) { Index: osisredletterwords.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisredletterwords.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** osisredletterwords.cpp 5 Jul 2003 04:58:42 -0000 1.5 --- osisredletterwords.cpp 7 Jul 2003 01:16:15 -0000 1.6 *************** *** 20,25 **** const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { --- 20,25 ---- const char oTip[] = "Toggles Red Coloring for Words of Christ On and Off if they are marked"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, &oValues) { Index: osisscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisscripref.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** osisscripref.cpp 5 Jul 2003 04:58:42 -0000 1.3 --- osisscripref.cpp 7 Jul 2003 01:16:15 -0000 1.4 *************** *** 20,25 **** const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, &oValues) { --- 20,25 ---- const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, &oValues) { Index: osisstrongs.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisstrongs.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** osisstrongs.cpp 5 Jul 2003 04:58:42 -0000 1.8 --- osisstrongs.cpp 7 Jul 2003 01:16:15 -0000 1.9 *************** *** 20,25 **** const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); --- 20,25 ---- const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); Index: plainfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/plainfootnotes.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** plainfootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.12 --- plainfootnotes.cpp 7 Jul 2003 01:16:15 -0000 1.13 *************** *** 30,35 **** const char oTip[] = "Toggles Footnotes On and Off In Bible Texts If They Exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); PLAINFootnotes::PLAINFootnotes() : SWOptionFilter(oName, oTip, &oValues) { --- 30,35 ---- const char oTip[] = "Toggles Footnotes On and Off In Bible Texts If They Exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); PLAINFootnotes::PLAINFootnotes() : SWOptionFilter(oName, oTip, &oValues) { Index: thmlfootnotes.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlfootnotes.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** thmlfootnotes.cpp 5 Jul 2003 04:58:42 -0000 1.12 --- thmlfootnotes.cpp 7 Jul 2003 01:16:15 -0000 1.13 *************** *** 18,23 **** const char oTip[] = "Toggles Footnotes On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, &oValues) { --- 18,23 ---- const char oTip[] = "Toggles Footnotes On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, &oValues) { Index: thmlheadings.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlheadings.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** thmlheadings.cpp 5 Jul 2003 04:58:42 -0000 1.11 --- thmlheadings.cpp 7 Jul 2003 01:16:15 -0000 1.12 *************** *** 22,27 **** const char oTip[] = "Toggles Headings On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, &oValues) { --- 22,27 ---- const char oTip[] = "Toggles Headings On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, &oValues) { Index: thmllemma.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmllemma.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** thmllemma.cpp 5 Jul 2003 04:58:42 -0000 1.9 --- thmllemma.cpp 7 Jul 2003 01:16:15 -0000 1.10 *************** *** 18,23 **** const char oTip[] = "Toggles Lemmas On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, &oValues) { --- 18,23 ---- const char oTip[] = "Toggles Lemmas On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, &oValues) { Index: thmlmorph.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlmorph.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** thmlmorph.cpp 5 Jul 2003 04:58:42 -0000 1.14 --- thmlmorph.cpp 7 Jul 2003 01:16:15 -0000 1.15 *************** *** 18,23 **** const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, &oValues) { --- 18,23 ---- const char oTip[] = "Toggles Morphological Tags On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, &oValues) { Index: thmlscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlscripref.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** thmlscripref.cpp 7 Jul 2003 00:25:59 -0000 1.13 --- thmlscripref.cpp 7 Jul 2003 01:16:15 -0000 1.14 *************** *** 18,23 **** const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, &oValues) { --- 18,23 ---- const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, &oValues) { Index: thmlstrongs.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlstrongs.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** thmlstrongs.cpp 5 Jul 2003 04:58:42 -0000 1.17 --- thmlstrongs.cpp 7 Jul 2003 01:16:15 -0000 1.18 *************** *** 21,26 **** const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, &oValues) { --- 21,26 ---- const char oTip[] = "Toggles Strong's Numbers On and Off if they exist"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, &oValues) { Index: utf8cantillation.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/utf8cantillation.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** utf8cantillation.cpp 5 Jul 2003 04:58:42 -0000 1.8 --- utf8cantillation.cpp 7 Jul 2003 01:16:15 -0000 1.9 *************** *** 15,20 **** const char oTip[] = "Toggles Hebrew Cantillation Marks"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, &oValues) { --- 15,20 ---- const char oTip[] = "Toggles Hebrew Cantillation Marks"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, &oValues) { Index: utf8greekaccents.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/utf8greekaccents.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** utf8greekaccents.cpp 5 Jul 2003 04:58:42 -0000 1.10 --- utf8greekaccents.cpp 7 Jul 2003 01:16:15 -0000 1.11 *************** *** 15,20 **** const char oTip[] = "Toggles Greek Accents"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, &oValues) { --- 15,20 ---- const char oTip[] = "Toggles Greek Accents"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, &oValues) { Index: utf8hebrewpoints.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/utf8hebrewpoints.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** utf8hebrewpoints.cpp 5 Jul 2003 04:58:42 -0000 1.10 --- utf8hebrewpoints.cpp 7 Jul 2003 01:16:15 -0000 1.11 *************** *** 15,20 **** const char oTip[] = "Toggles Hebrew Vowel Points"; ! const SWBuf choices[2] = {"On", "Off"}; ! const StringList oValues(&choices[0], &choices[1]); UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, &oValues) { --- 15,20 ---- const char oTip[] = "Toggles Hebrew Vowel Points"; ! const SWBuf choices[3] = {"On", "Off", ""}; ! const StringList oValues(&choices[0], &choices[2]); UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, &oValues) { From sword@www.crosswire.org Mon Jul 7 01:18:05 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 18:18:05 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr/installMgr - New directory Message-ID: <200307070118.h671I5i27647@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/installMgr In directory www:/tmp/cvs-serv27634/installMgr Log Message: Directory /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/installMgr added to the repository From sword@www.crosswire.org Mon Jul 7 01:24:18 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 18:24:18 -0700 Subject: [sword-cvs] sword/src/modules/filters osisscripref.cpp,1.4,1.5 thmlscripref.cpp,1.14,1.15 Message-ID: <200307070124.h671OIi29169@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/modules/filters In directory www:/tmp/cvs-serv29148 Modified Files: osisscripref.cpp thmlscripref.cpp Log Message: Index: osisscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisscripref.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** osisscripref.cpp 7 Jul 2003 01:16:15 -0000 1.4 --- osisscripref.cpp 7 Jul 2003 01:24:16 -0000 1.5 *************** *** 17,21 **** SWORD_NAMESPACE_START ! const char oName[] = "Scripture Cross-references"; const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; --- 17,21 ---- SWORD_NAMESPACE_START ! const char oName[] = "Cross-references"; const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; Index: thmlscripref.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/modules/filters/thmlscripref.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** thmlscripref.cpp 7 Jul 2003 01:16:15 -0000 1.14 --- thmlscripref.cpp 7 Jul 2003 01:24:16 -0000 1.15 *************** *** 15,19 **** SWORD_NAMESPACE_START ! const char oName[] = "Scripture Cross-references"; const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; --- 15,19 ---- SWORD_NAMESPACE_START ! const char oName[] = "Cross-references"; const char oTip[] = "Toggles Scripture Cross-references On and Off if they exist"; From sword@www.crosswire.org Mon Jul 7 02:04:43 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 19:04:43 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr installmgr.conf,1.9,NONE Message-ID: <200307070204.h6724hi05776@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr In directory www:/tmp/cvs-serv5762/apps/windoze/CBuilder5/InstallMgr Removed Files: installmgr.conf Log Message: 1.5.6pre7 --- installmgr.conf DELETED --- From sword@www.crosswire.org Mon Jul 7 02:04:43 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 19:04:43 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr/installMgr installmgr.conf,NONE,1.1 Message-ID: <200307070204.h6724hi05780@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/installMgr In directory www:/tmp/cvs-serv5762/apps/windoze/CBuilder5/InstallMgr/installMgr Added Files: installmgr.conf Log Message: 1.5.6pre7 --- NEW FILE: installmgr.conf --- [General] PassiveFTP=true [Sources] FTPSource=crosswire|ftp.crosswire.org|/pub/sword/raw/ FTPSource=host|192.168.32.123|/pub/sword FTPSource=CrossWire Beta|sword.cx|/pub/sword/betaraw/ LocalPath= From sword@www.crosswire.org Mon Jul 7 02:04:43 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 19:04:43 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/BibleCS AboutBoxfrm.cpp,1.13,1.14 AboutBoxfrm.dfm,1.52,1.53 AboutBoxfrm.h,1.5,1.6 mainfrm.cpp,1.125,1.126 sword.bpr,1.119,1.120 sword.res,1.106,1.107 Message-ID: <200307070204.h6724hi05781@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS In directory www:/tmp/cvs-serv5762/apps/windoze/CBuilder5/BibleCS Modified Files: AboutBoxfrm.cpp AboutBoxfrm.dfm AboutBoxfrm.h mainfrm.cpp sword.bpr sword.res Log Message: 1.5.6pre7 Index: AboutBoxfrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AboutBoxfrm.cpp 27 Jun 2003 11:31:41 -0000 1.13 --- AboutBoxfrm.cpp 7 Jul 2003 02:04:41 -0000 1.14 *************** *** 144,149 **** --- 144,155 ---- CreditAbout->ScrollBars = ssVertical; CreditAbout->ReadOnly = true; + ModulesAbout->OnURLClick = RTFURLClick; + CreditAbout->OnURLClick = RTFURLClick; } //--------------------------------------------------------------------------- + + void __fastcall TAboutBox::RTFURLClick(TObject *Sender, const AnsiString URLText, TMouseButton Button) { + ShellExecute(this->Handle, "open", URLText.c_str(), NULL, NULL, SW_SHOWNORMAL); + } Index: AboutBoxfrm.dfm =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** AboutBoxfrm.dfm 28 Jun 2003 19:04:32 -0000 1.52 --- AboutBoxfrm.dfm 7 Jul 2003 02:04:41 -0000 1.53 *************** *** 104,108 **** Height = 21 AutoSize = False ! Caption = 'v1.5.6pre6' IsControl = True end --- 104,108 ---- Height = 21 AutoSize = False ! Caption = 'v1.5.6pre7' IsControl = True end Index: AboutBoxfrm.h =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AboutBoxfrm.h 30 Apr 2003 08:18:45 -0000 1.5 --- AboutBoxfrm.h 7 Jul 2003 02:04:41 -0000 1.6 *************** *** 37,40 **** --- 37,41 ---- TRxRichEditX *CreditAbout; public: + void __fastcall RTFURLClick(TObject *Sender, const AnsiString URLText, TMouseButton Button); virtual __fastcall TAboutBox(TComponent* AOwner); }; Index: mainfrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** mainfrm.cpp 5 Jul 2003 01:16:46 -0000 1.125 --- mainfrm.cpp 7 Jul 2003 02:04:41 -0000 1.126 *************** *** 693,698 **** } ! OptionsList options = mainmgr->getGlobalOptions(); ! for (OptionsList::iterator it = options.begin(); it != options.end(); it++) { SWBuf value = mainmgr->getGlobalOption(it->c_str()); (*layoutconf)["ModuleOptions"][it->c_str()] = value; --- 693,698 ---- } ! StringList options = mainmgr->getGlobalOptions(); ! for (StringList::iterator it = options.begin(); it != options.end(); it++) { SWBuf value = mainmgr->getGlobalOption(it->c_str()); (*layoutconf)["ModuleOptions"][it->c_str()] = value; *************** *** 1190,1195 **** // Add options to Options Main Menu choice sit = layoutconf->Sections.find("ModuleOptions"); ! OptionsList options = mainmgr->getGlobalOptions(); ! for (OptionsList::iterator it = options.begin(); it != options.end(); it++) { TMenuItem *newitem = new TMenuItem(MainMenu1); newitem->Caption = it->c_str(); --- 1190,1195 ---- // Add options to Options Main Menu choice sit = layoutconf->Sections.find("ModuleOptions"); ! StringList options = mainmgr->getGlobalOptions(); ! for (StringList::iterator it = options.begin(); it != options.end(); it++) { TMenuItem *newitem = new TMenuItem(MainMenu1); newitem->Caption = it->c_str(); *************** *** 1201,1206 **** mainmgr->setGlobalOption(it->c_str(), eit->second.c_str()); } ! OptionsList values = mainmgr->getGlobalOptionValues(it->c_str()); ! for (OptionsList::iterator it2 = values.begin(); it2 != values.end(); it2++) { TMenuItem *newitem2 = new TMenuItem(MainMenu1); newitem2->Caption = it2->c_str(); --- 1201,1206 ---- mainmgr->setGlobalOption(it->c_str(), eit->second.c_str()); } ! StringList values = mainmgr->getGlobalOptionValues(it->c_str()); ! for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) { TMenuItem *newitem2 = new TMenuItem(MainMenu1); newitem2->Caption = it2->c_str(); Index: sword.bpr =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.bpr,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** sword.bpr 28 Jun 2003 21:31:19 -0000 1.119 --- sword.bpr 7 Jul 2003 02:04:41 -0000 1.120 *************** *** 46,50 **** ! --- 46,50 ---- ! *************** *** 58,66 **** -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/> ! ! ! ! --- 58,66 ---- -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/> ! ! ! ! *************** *** 76,80 **** MinorVer=5 Release=5 ! Build=52 Debug=0 PreRelease=0 --- 76,80 ---- MinorVer=5 Release=5 ! Build=54 Debug=0 PreRelease=0 *************** *** 88,92 **** CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project ! FileVersion=1.5.5.52 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License --- 88,92 ---- CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project ! FileVersion=1.5.5.54 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License *************** *** 94,98 **** OriginalFilename= ProductName=The SWORD Project ! ProductVersion=1.5.6pre6 Comments=Seek Him and you will find Him --- 94,98 ---- OriginalFilename= ProductName=The SWORD Project ! ProductVersion=1.5.6pre7 Comments=Seek Him and you will find Him *************** *** 133,138 **** [HistoryLists\hlConditionals] Count=8 ! Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG ! Item1=_ICU_;_ICUSWORD_;USBINARY Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY Item3=_ICU_;_ICUSWORD_;_DEBUG --- 133,138 ---- [HistoryLists\hlConditionals] Count=8 ! Item0=_ICU_;_ICUSWORD_;USBINARY ! Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY Item3=_ICU_;_ICUSWORD_;_DEBUG Index: sword.res =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/sword.res,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 Binary files /tmp/cvsJknfrB and /tmp/cvssw26tW differ From sword@www.crosswire.org Mon Jul 7 02:50:07 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 19:50:07 -0700 Subject: [sword-cvs] sword/apps/windoze/CBuilder5/InstallMgr MainFrm.cpp,1.20,1.21 Message-ID: <200307070250.h672o7i07009@www.crosswire.org> Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr In directory www:/tmp/cvs-serv6997/apps/windoze/CBuilder5/InstallMgr Modified Files: MainFrm.cpp Log Message: no message Index: MainFrm.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/InstallMgr/MainFrm.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MainFrm.cpp 7 Jul 2003 00:25:59 -0000 1.20 --- MainFrm.cpp 7 Jul 2003 02:50:05 -0000 1.21 *************** *** 3,9 **** #pragma hdrstop - extern "C" { - #include - } #include "MainFrm.h" --- 3,6 ---- *************** *** 51,55 **** void InstallMgrWin::statusUpdate(double dltotal, double dlnow) { ! if (!dltotal) return; // prevent division by zero error below int filePercent = (int)((float)(dlnow + 1) / (float)(dltotal) * 100); --- 48,52 ---- void InstallMgrWin::statusUpdate(double dltotal, double dlnow) { ! if (!dltotal || !StatusForm->totalBytes) return; // prevent division by zero error below int filePercent = (int)((float)(dlnow + 1) / (float)(dltotal) * 100); *************** *** 249,255 **** else { InstallSourceTab *ist = (InstallSourceTab *) tree->Parent->Controls[0]; ! if (ist->is->mgr) ! delete ist->is->mgr; ! mgr = ist->is->mgr = new SWMgr(is->localShadow.c_str()); } --- 246,250 ---- else { InstallSourceTab *ist = (InstallSourceTab *) tree->Parent->Controls[0]; ! mgr = ist->is->getMgr(); } *************** *** 505,542 **** ! void __fastcall TMainForm::RefreshRemoteSource(TObject *Sender) ! { InstallSourceTab *ist = (InstallSourceTab *) MainForm->PageControl1->ActivePage->Controls[0]; ! DIR *dir; ! struct dirent *ent; ! ConfigEntMap::iterator entry; ! SWBuf modDir; ! SWBuf modFile; ! SWBuf root = "./installMgr/"; ! root += ist->is->source.c_str(); ! SWBuf target = root + "/mods.d"; ! ! if (dir = opendir(target.c_str())) { ! rewinddir(dir); ! while ((ent = readdir(dir))) { ! if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { ! modFile = target; ! modFile += "/"; ! modFile += ent->d_name; ! remove(modFile.c_str()); ! } ! } ! closedir(dir); ! } ! ! ! SWBuf archive = root + "/mods.d.tar.gz"; ! if (!installMgr->FTPCopy(ist->is, "mods.d.tar.gz", archive.c_str(), false)) { ! int fd = open(archive.c_str(), O_RDONLY|O_BINARY); ! untargz(fd, root.c_str()); ! close(fd); ! } ! else installMgr->FTPCopy(ist->is, "mods.d", target.c_str(), true, ".conf"); ! fillSourceTree(ist->tree, ist->is); } --- 500,506 ---- ! void __fastcall TMainForm::RefreshRemoteSource(TObject *Sender) { InstallSourceTab *ist = (InstallSourceTab *) MainForm->PageControl1->ActivePage->Controls[0]; ! installMgr->refreshRemoteSource(ist->is); fillSourceTree(ist->tree, ist->is); } *************** *** 558,563 **** } ! void __fastcall TMainForm::SpeedButton5Click(TObject *Sender) ! { TTreeView *tree; InstallSourceTab *ist = 0; --- 522,527 ---- } ! ! void __fastcall TMainForm::SpeedButton5Click(TObject *Sender) { TTreeView *tree; InstallSourceTab *ist = 0; From sword@www.crosswire.org Mon Jul 7 02:50:07 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 19:50:07 -0700 Subject: [sword-cvs] sword/include installmgr.h,1.8,1.9 zconf.h,1.3,1.4 Message-ID: <200307070250.h672o7i07013@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv6997/include Modified Files: installmgr.h zconf.h Log Message: no message Index: installmgr.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/installmgr.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** installmgr.h 7 Jul 2003 00:25:59 -0000 1.8 --- installmgr.h 7 Jul 2003 02:50:05 -0000 1.9 *************** *** 34,37 **** --- 34,38 ---- class InstallSource { + SWMgr *mgr; public: InstallSource(const char *confEnt, const char *type); *************** *** 45,50 **** SWBuf caption; SWBuf localShadow; - SWMgr *mgr; void *userData; }; --- 46,52 ---- SWBuf caption; SWBuf localShadow; void *userData; + SWMgr *getMgr(); + void flush() { if (mgr) delete mgr; mgr = 0; } }; *************** *** 80,83 **** --- 82,86 ---- virtual int installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is = 0); virtual int copyFileToSWORDInstall(SWMgr *manager, const char *sourceDir, const char *fName); + virtual void refreshRemoteSource(InstallSource *is); virtual void statusUpdate(double dltotal, double dlnow); virtual void preDownloadStatus(long totalBytes, long completedBytes, const char *message); Index: zconf.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/zconf.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zconf.h 7 Oct 2002 22:48:50 -0000 1.3 --- zconf.h 7 Jul 2003 02:50:05 -0000 1.4 *************** *** 221,225 **** # define Bytef Byte FAR #else ! typedef Byte FAR Bytef; #endif typedef char FAR charf; --- 221,225 ---- # define Bytef Byte FAR #else ! typedef unsigned char FAR Bytef; #endif typedef char FAR charf; From sword@www.crosswire.org Mon Jul 7 02:50:07 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Sun, 6 Jul 2003 19:50:07 -0700 Subject: [sword-cvs] sword/src/mgr installmgr.cpp,1.8,1.9 Message-ID: <200307070250.h672o7i07014@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/mgr In directory www:/tmp/cvs-serv6997/src/mgr Modified Files: installmgr.cpp Log Message: no message Index: installmgr.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/mgr/installmgr.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** installmgr.cpp 7 Jul 2003 00:25:59 -0000 1.8 --- installmgr.cpp 7 Jul 2003 02:50:05 -0000 1.9 *************** *** 6,9 **** --- 6,17 ---- + // stupid hack to make untgz stuff compile + #define VCL + + extern "C" { + #include + } + + #include #include *************** *** 308,312 **** } ! int InstallMgr::FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { terminate = false; --- 316,324 ---- } ! SWMgr *InstallSource::getMgr() { ! if (!mgr) ! mgr = new SWMgr(localShadow.c_str()); ! return mgr; ! } int InstallMgr::FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { terminate = false; *************** *** 551,554 **** --- 563,600 ---- } + + void InstallMgr::refreshRemoteSource(InstallSource *is) { + DIR *dir; + struct dirent *ent; + ConfigEntMap::iterator entry; + SWBuf modDir; + SWBuf modFile; + SWBuf root = privatePath; + root += (SWBuf)"/" + is->source.c_str(); + SWBuf target = root + "/mods.d"; + + if (dir = opendir(target.c_str())) { + rewinddir(dir); + while ((ent = readdir(dir))) { + if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) { + modFile = target; + modFile += "/"; + modFile += ent->d_name; + remove(modFile.c_str()); + } + } + closedir(dir); + } + + + SWBuf archive = root + "/mods.d.tar.gz"; + if (!FTPCopy(is, "mods.d.tar.gz", archive.c_str(), false)) { + int fd = open(archive.c_str(), O_RDONLY|O_BINARY); + untargz(fd, root.c_str()); + close(fd); + } + else FTPCopy(is, "mods.d", target.c_str(), true, ".conf"); + is->flush(); + } SWORD_NAMESPACE_END From sword@www.crosswire.org Mon Jul 7 14:16:27 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Mon, 7 Jul 2003 07:16:27 -0700 Subject: [sword-cvs] sword/include installmgr.h,1.9,1.10 untgz.h,1.1,1.2 Message-ID: <200307071416.h67EGRi16070@www.crosswire.org> Update of /usr/local/cvsroot/sword/include In directory www:/tmp/cvs-serv15875/include Modified Files: installmgr.h untgz.h Log Message: Added InstallMgr basic feature for remote source installation Index: installmgr.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/installmgr.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** installmgr.h 7 Jul 2003 02:50:05 -0000 1.9 --- installmgr.h 7 Jul 2003 14:16:25 -0000 1.10 *************** *** 36,40 **** SWMgr *mgr; public: ! InstallSource(const char *confEnt, const char *type); virtual ~InstallSource(); SWBuf getConfEnt() { --- 36,40 ---- SWMgr *mgr; public: ! InstallSource(const char *type, const char *confEnt = 0); virtual ~InstallSource(); SWBuf getConfEnt() { *************** *** 48,52 **** void *userData; SWMgr *getMgr(); ! void flush() { if (mgr) delete mgr; mgr = 0; } }; --- 48,52 ---- void *userData; SWMgr *getMgr(); ! void flush(); }; Index: untgz.h =================================================================== RCS file: /usr/local/cvsroot/sword/include/untgz.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** untgz.h 23 Mar 2001 09:00:15 -0000 1.1 --- untgz.h 7 Jul 2003 14:16:25 -0000 1.2 *************** *** 7,9 **** int untar(gzFile in, const char *dest); ! #endif \ No newline at end of file --- 7,10 ---- int untar(gzFile in, const char *dest); ! #endif ! From sword@www.crosswire.org Mon Jul 7 14:16:27 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Mon, 7 Jul 2003 07:16:27 -0700 Subject: [sword-cvs] sword configure.ac,1.19,1.20 Message-ID: <200307071416.h67EGRi16066@www.crosswire.org> Update of /usr/local/cvsroot/sword In directory www:/tmp/cvs-serv15875 Modified Files: configure.ac Log Message: Added InstallMgr basic feature for remote source installation Index: configure.ac =================================================================== RCS file: /usr/local/cvsroot/sword/configure.ac,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** configure.ac 1 Mar 2003 19:51:12 -0000 1.19 --- configure.ac 7 Jul 2003 14:16:25 -0000 1.20 *************** *** 63,85 **** # --------------------------------------------------------------------- - # Check for curl for installmgr suport - # --------------------------------------------------------------------- - - CURL_CFLAGS= - CURL_LIBS= - if test x$enable_installmgr = xyes; then - AC_PATH_PROG(CURL_CONFIG, curl-config, no) - if test "$CURL_CONFIG" = "no" ; then - echo "*** The curl-config script installed by curl could not be found" - echo "*** compiling without install manager support" - enable_installmgr=no - else - echo "curl found - install manager support ok" - CURL_CFLAGS=`$CURL_CONFIG --cflags` - CURL_LIBS=`$CURL_CONFIG --libs` - fi - fi - - # --------------------------------------------------------------------- # Debug and profile # --------------------------------------------------------------------- --- 63,66 ---- *************** *** 114,117 **** --- 95,117 ---- CXXFLAGS="$CXXFLAGS -g -finstrument-functions" LIBS="$LIBS -g -finstrument-functions -lfnccheck" + fi + + # --------------------------------------------------------------------- + # Check for curl for installmgr suport + # --------------------------------------------------------------------- + + CURL_CFLAGS= + CURL_LIBS= + AC_PATH_PROG(CURL_CONFIG, curl-config, no) + if test "$CURL_CONFIG" = "no" ; then + echo "*** The curl-config script installed by curl could not be found" + echo "*** compiling without install manager support" + enable_installmgr=no + else + echo "curl found - remote install options available" + CURL_CFLAGS=`$CURL_CONFIG --cflags` + CURL_LIBS=`$CURL_CONFIG --libs` + CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE" + CFLAGS="$CFLAGS -DCURLAVAILABLE" fi From sword@www.crosswire.org Mon Jul 7 14:16:27 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Mon, 7 Jul 2003 07:16:27 -0700 Subject: [sword-cvs] sword/src/utilfuns Makefile.am,1.8,1.9 Message-ID: <200307071416.h67EGRi16086@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/utilfuns In directory www:/tmp/cvs-serv15875/src/utilfuns Modified Files: Makefile.am Log Message: Added InstallMgr basic feature for remote source installation Index: Makefile.am =================================================================== RCS file: /usr/local/cvsroot/sword/src/utilfuns/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 1 Jun 2003 14:32:09 -0000 1.8 --- Makefile.am 7 Jul 2003 14:16:25 -0000 1.9 *************** *** 10,13 **** --- 10,14 ---- libsword_la_SOURCES += $(utilfunsdir)/swbuf.cpp libsword_la_SOURCES += $(utilfunsdir)/ftpparse.c + libsword_la_SOURCES += $(utilfunsdir)/zlib/untgz.c if MINGW From sword@www.crosswire.org Mon Jul 7 14:16:27 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Mon, 7 Jul 2003 07:16:27 -0700 Subject: [sword-cvs] sword/src/mgr installmgr.cpp,1.9,1.10 Message-ID: <200307071416.h67EGRi16073@www.crosswire.org> Update of /usr/local/cvsroot/sword/src/mgr In directory www:/tmp/cvs-serv15875/src/mgr Modified Files: installmgr.cpp Log Message: Added InstallMgr basic feature for remote source installation Index: installmgr.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/src/mgr/installmgr.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** installmgr.cpp 7 Jul 2003 02:50:05 -0000 1.9 --- installmgr.cpp 7 Jul 2003 14:16:25 -0000 1.10 *************** *** 6,12 **** - // stupid hack to make untgz stuff compile - #define VCL - extern "C" { #include --- 6,9 ---- *************** *** 104,108 **** while (sourceBegin != sourceEnd) { ! InstallSource *is = new InstallSource(sourceBegin->second.c_str(), "FTP"); sources[is->caption] = is; SWBuf parent = (SWBuf)privatePath + "/" + is->source + "/file"; --- 101,105 ---- while (sourceBegin != sourceEnd) { ! InstallSource *is = new InstallSource("FTP", sourceBegin->second.c_str()); sources[is->caption] = is; SWBuf parent = (SWBuf)privatePath + "/" + is->source + "/file"; *************** *** 297,311 **** ! InstallSource::InstallSource(const char *confEnt, const char *type) { ! char *buf = 0; ! stdstr(&buf, confEnt); ! ! caption = strtok(buf, "|"); ! source = strtok(0, "|"); ! directory = strtok(0, "|"); ! delete [] buf; this->type = type; mgr = 0; userData = 0; } --- 294,310 ---- ! InstallSource::InstallSource(const char *type, const char *confEnt) { this->type = type; mgr = 0; userData = 0; + if (confEnt) { + char *buf = 0; + stdstr(&buf, confEnt); + + caption = strtok(buf, "|"); + source = strtok(0, "|"); + directory = strtok(0, "|"); + delete [] buf; + } } *************** *** 316,319 **** --- 315,327 ---- } + + void InstallSource::flush() { + if (mgr) { + delete mgr; + mgr = 0; + } + } + + SWMgr *InstallSource::getMgr() { if (!mgr) *************** *** 321,324 **** --- 329,334 ---- return mgr; } + + int InstallMgr::FTPCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) { terminate = false; *************** *** 382,385 **** --- 392,396 ---- } catch(...){} + return 0; } *************** *** 399,402 **** --- 410,416 ---- sourceDir = (SWBuf)privatePath + "/" + is->source; else sourceDir = fromLocation; + + if (sourceDir[sourceDir.length()-1] != '/') + sourceDir += '/'; SWMgr mgr(sourceDir.c_str()); From sword@www.crosswire.org Mon Jul 7 14:16:28 2003 From: sword@www.crosswire.org (sword@www.crosswire.org) Date: Mon, 7 Jul 2003 07:16:28 -0700 Subject: [sword-cvs] sword/utilities Makefile.am,1.18,1.19 installmgr.cpp,1.1,1.2 osis2mod.cpp,1.2,1.3 Message-ID: <200307071416.h67EGSi16092@www.crosswire.org> Update of /usr/local/cvsroot/sword/utilities In directory www:/tmp/cvs-serv15875/utilities Modified Files: Makefile.am installmgr.cpp osis2mod.cpp Log Message: Added InstallMgr basic feature for remote source installation Index: Makefile.am =================================================================== RCS file: /usr/local/cvsroot/sword/utilities/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Makefile.am 30 May 2003 19:22:32 -0000 1.18 --- Makefile.am 7 Jul 2003 14:16:25 -0000 1.19 *************** *** 24,27 **** --- 24,28 ---- lexdump_SOURCES = lexdump.c lexdump_LDADD = -lstdc++ + installmgr_LDADD = $(CURL_LIBS) $(LDADD) mkfastmod_SOURCES = mkfastmod.cpp mod2vpl_SOURCES = mod2vpl.cpp Index: installmgr.cpp =================================================================== RCS file: /usr/local/cvsroot/sword/utilities/installmgr.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installmgr.cpp 30 May 2003 19:25:20 -0000 1.1 --- installmgr.cpp 7 Jul 2003 14:16:25 -0000 1.2 *************** *** 1,40 **** #include #include #include using namespace sword; using std::cout; void usage(const char *progName) { ! fprintf(stderr, "usage: %s