[sword-svn] r1802 - trunk/utilities/diatheke
scribe at crosswire.org
scribe at crosswire.org
Fri May 6 02:06:36 MST 2005
Author: scribe
Date: 2005-05-06 02:06:35 -0700 (Fri, 06 May 2005)
New Revision: 1802
Modified:
trunk/utilities/diatheke/corediatheke.cpp
trunk/utilities/diatheke/diatheke.cpp
Log:
Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp 2005-05-06 05:35:04 UTC (rev 1801)
+++ trunk/utilities/diatheke/corediatheke.cpp 2005-05-06 09:06:35 UTC (rev 1802)
@@ -23,7 +23,7 @@
bool types = false, descriptions = false, names = false;
- if (!stricmp(key, "localelist")) {
+ if (!::stricmp(key, "localelist")) {
LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr();
list<SWBuf> loclist = lm->getAvailableLocales();
list<SWBuf>::iterator li = loclist.begin();
@@ -31,15 +31,15 @@
*output << li->c_str() << endl;
}
}
- else if (!stricmp(key, "modulelist")) {
+ else if (!::stricmp(key, "modulelist")) {
types = true;
descriptions = true;
names = true;
}
- else if (!stricmp(key, "modulelistnames")) {
+ else if (!::stricmp(key, "modulelistnames")) {
names = true;
}
- else if (!stricmp(key, "modulelistdescriptions")) {
+ else if (!::stricmp(key, "modulelistdescriptions")) {
descriptions = true;
}
@@ -98,7 +98,7 @@
VerseKey vk;
//deal with queries to "system"
- if (!stricmp(text, "system")) {
+ if (!::stricmp(text, "system")) {
querytype = QT_SYSTEM;
systemquery(ref, output);
}
@@ -120,11 +120,11 @@
if ((sit = manager.config->Sections.find((*it).second->Name())) != manager.config->Sections.end()) {
if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) {
- if (!stricmp((char *)(*eit).second.c_str(), "GBF"))
+ if (!::stricmp((char *)(*eit).second.c_str(), "GBF"))
inputformat = FMT_GBF;
- else if (!stricmp((char *)(*eit).second.c_str(), "ThML"))
+ else if (!::stricmp((char *)(*eit).second.c_str(), "ThML"))
inputformat = FMT_THML;
- else if (!stricmp((char *)(*eit).second.c_str(), "OSIS"))
+ else if (!::stricmp((char *)(*eit).second.c_str(), "OSIS"))
inputformat = FMT_OSIS;
}
encoding = ((eit = (*sit).second.find("Encoding")) != (*sit).second.end()) ? (*eit).second : (SWBuf)"";
Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp 2005-05-06 05:35:04 UTC (rev 1801)
+++ trunk/utilities/diatheke/diatheke.cpp 2005-05-06 09:06:35 UTC (rev 1802)
@@ -57,49 +57,49 @@
// (a querytype & text = 1 and a ref = 2)
for (int i = 1; i < argc; i++) {
- if (!stricmp("-b", argv[i])) {
+ if (!::stricmp("-b", argv[i])) {
if (i+1 <= argc) {
text = argv[i+1];
i++;
runquery |= RQ_BOOK;
}
}
- else if (!stricmp("-s", argv[i])) {
+ else if (!::stricmp("-s", argv[i])) {
if (i+1 <= argc) {
- if (!stricmp("phrase", argv[i+1])) {
+ if (!::stricmp("phrase", argv[i+1])) {
searchtype = ST_PHRASE;
i++;
}
- else if (!stricmp("regex", argv[i+1])) {
+ else if (!::stricmp("regex", argv[i+1])) {
searchtype = ST_REGEX;
i++;
}
- else if (!stricmp("multiword", argv[i+1])) {
+ else if (!::stricmp("multiword", argv[i+1])) {
searchtype = ST_MULTIWORD;
i++;
}
else i++;
}
}
- else if (!stricmp("-r", argv[i])) {
+ else if (!::stricmp("-r", argv[i])) {
if (i+1 <= argc) {
range = argv[i+1];
i++;
}
}
- else if (!stricmp("-l", argv[i])) {
+ else if (!::stricmp("-l", argv[i])) {
if (i+1 <= argc) {
locale = argv[i+1];
i++;
}
}
- else if (!stricmp("-m", argv[i])) {
+ else if (!::stricmp("-m", argv[i])) {
if (i+1 <= argc) {
maxverses = atoi(argv[i+1]);
i++;
}
}
- else if (!stricmp("-o", argv[i])) {
+ else if (!::stricmp("-o", argv[i])) {
if (i+1 <= argc) {
if (strchr(argv[i+1], 'f'))
optionfilters |= OP_FOOTNOTES;
@@ -128,61 +128,61 @@
i++;
}
}
- else if (!stricmp("-f", argv[i])) {
+ else if (!::stricmp("-f", argv[i])) {
if (i+1 <= argc) {
- if (!stricmp("thml", argv[i+1])) {
+ if (!::stricmp("thml", argv[i+1])) {
outputformat = FMT_THML;
i++;
}
- else if (!stricmp("cgi", argv[i+1])) {
+ else if (!::stricmp("cgi", argv[i+1])) {
outputformat = FMT_CGI;
i++;
}
- else if (!stricmp("gbf", argv[i+1])) {
+ else if (!::stricmp("gbf", argv[i+1])) {
outputformat = FMT_GBF;
i++;
}
- else if (!stricmp("html", argv[i+1])) {
+ else if (!::stricmp("html", argv[i+1])) {
outputformat = FMT_HTML;
i++;
}
- else if (!stricmp("rtf", argv[i+1])) {
+ else if (!::stricmp("rtf", argv[i+1])) {
outputformat = FMT_RTF;
i++;
}
- else if (!stricmp("osis", argv[i+1])) {
+ else if (!::stricmp("osis", argv[i+1])) {
outputformat = FMT_OSIS;
i++;
}
else i++;
}
}
- else if (!stricmp("-e", argv[i])) {
+ else if (!::stricmp("-e", argv[i])) {
if (i+1 <= argc) {
- if (!stricmp("utf8", argv[i+1])) {
+ if (!::stricmp("utf8", argv[i+1])) {
outputencoding = ENC_UTF8;
i++;
}
- else if (!stricmp("rtf", argv[i+1])) {
+ else if (!::stricmp("rtf", argv[i+1])) {
outputencoding = ENC_RTF;
i++;
}
- else if (!stricmp("html", argv[i+1])) {
+ else if (!::stricmp("html", argv[i+1])) {
outputencoding = ENC_HTML;
i++;
}
- else if (!stricmp("latin1", argv[i+1])) {
+ else if (!::stricmp("latin1", argv[i+1])) {
outputencoding = ENC_LATIN1;
i++;
}
- else if (!stricmp("utf16", argv[i+1])) {
+ else if (!::stricmp("utf16", argv[i+1])) {
outputencoding = ENC_UTF16;
i++;
}
else i++;
}
}
- else if (!stricmp("-k", argv[i])) {
+ else if (!::stricmp("-k", argv[i])) {
i++;
if (i < argc) {
SWBuf key = argv[i];
@@ -195,14 +195,14 @@
runquery |= RQ_REF;
}
}
- else if (!stricmp("-v", argv[i])) {
+ else if (!::stricmp("-v", argv[i])) {
if (i+1 <= argc) {
variants = atoi(argv[i+1]);
optionfilters |= OP_VARIANTS;
i++;
}
}
- else if (!stricmp("-t", argv[i])) {
+ else if (!::stricmp("-t", argv[i])) {
if (i+1 <= argc) {
script = argv[i+1];
optionfilters |= OP_TRANSLITERATOR;
More information about the sword-cvs
mailing list