Fix dtinfo search engine

This commit is contained in:
Ulrich Wilkens
2014-04-01 04:45:33 +02:00
committed by Jon Trulson
parent 0254ebc0b4
commit 38dfc9e235
68 changed files with 252 additions and 135 deletions

View File

@@ -129,6 +129,7 @@ buildNCF(BookCaseDB& db, const char *base_name, int compressed)
const char *stitle;
const char *style;
int dupID = 0;
string outstr;
OLIAS_DB mmdb_handle;
info_lib *mmdb =
@@ -199,6 +200,7 @@ buildNCF(BookCaseDB& db, const char *base_name, int compressed)
stylesheet_smart_ptr sheet(base_ptr, style);
ostringstream strout;
sheet.its_oid().asciiOut(strout);
outstr = strout.str();
ncf->insert(STRING_CODE, nodeLocator,
STRING_CODE, title,
@@ -206,7 +208,7 @@ buildNCF(BookCaseDB& db, const char *base_name, int compressed)
COMPRESSED_STRING_CODE, comp_agent, "",
STRING_CODE, bookLocator,
OID_CODE, "0.0", /* pointer to Book/CCF/DOC object */
OID_CODE, (char *)strout.str().c_str(),
OID_CODE, (char *)outstr.c_str(),
NULL);
}

View File

@@ -2378,9 +2378,11 @@ case 10:
CC_String *val = (CC_String *)hd->findValue( &key );
if ( !val ) {
NeedRemote = 1;
#ifdef REMOTE_DEBUG
cerr << "(WARNING) Unresolved link = " << (const char *)key << endl
<< " file = " << current_file_name << endl
<< " line no. = " << current_line_num << "\n\n";
#endif
}
// cleanup and reset

View File

@@ -88,7 +88,7 @@ SGMLName::intern(const char *name, int upcase)
const char *src;
char *dest;
for(src = name, dest=buf; *src; src++, dest++){
*dest = toupper(*src);
*dest = toupper((unsigned char) *src);
}
*dest = 0;

View File

@@ -1596,8 +1596,8 @@ buildBookcase(char *cmdSrc, char *dirName)
dieRWD(-1, "%s: Cannot find %s: %s\n",
EXEC_NAME, newDir, strerror(errno));
snprintf(cmd, sizeof(cmd), "dtsrcreate %s-o -l%d %s",
(gStruct->verbose) ? "" : "-q ",
snprintf(cmd, sizeof(cmd), "dtsrcreate %s-o -a%d -l%d %s",
(gStruct->verbose) ? "" : "-q ", 210,
langtbl[gStruct->dtsridx].dtsrlang, bookCaseName);
runShellCmd(cmd);
@@ -1717,7 +1717,7 @@ validateBookCaseName(char *bookCaseName)
for (i = 0; bookCaseName[i] != '\0'; i++)
{
if (!isalnum(bookCaseName[i]))
if (!isalnum((unsigned char) bookCaseName[i]))
break;
}
@@ -1823,7 +1823,7 @@ editMapFile(char *bookCaseName, char *bookCaseMap)
for (i = 1; fileVector[i] != (char *)NULL; i++)
{
if ((strncmp(fileVector[i], bookCaseName, bcNameLen) == 0) &&
(!isalnum(fileVector[i][bcNameLen])) &&
(!isalnum((unsigned char) fileVector[i][bcNameLen])) &&
(fileVector[i][bcNameLen] != '_'))
{
if (!replaced)
@@ -1996,8 +1996,9 @@ makeTOC(char *id, char *title)
tocTitle = sgmlData(title);
for (i = 0; id[i] != '\0'; i++)
{
if ((!isalnum(id[i])) && (id[i] != '.') && (id[i] != '-'))
die(-1, "bad ID: %s\n", id);
if ((!isalnum((unsigned char) id[i])) &&
(id[i] != '.') && (id[i] != '-'))
die(-1, "bad ID: %s\n", id);
}
fileIn = buildPath("%s/NodeMeta", makeWorkDir());

View File

@@ -73,7 +73,7 @@ int main( int argc, char** argv )
int ok = 0;
DtMmdbInit();
if ( argc == 1 || 0==isdigit(argv[1][0]) ) {
if ( argc == 1 || 0==isdigit((unsigned char) argv[1][0]) ) {
usage(argc, argv);
} else
switch ( atoi(argv[1]) ) {