more fixes

git-svn-id: svn://10.0.0.236/trunk@18970 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
guha%netscape.com
1999-01-29 00:49:35 +00:00
parent b59f150b13
commit 7dbeeb5ef9
3 changed files with 12 additions and 7 deletions

View File

@@ -24,6 +24,7 @@
void describeItem (WriteClientProc callBack, void* obj, RDF_Resource u) ;
void describeItemSimple (WriteClientProc callBack, void* obj, RDF_Resource u) ;
extern int startsWith(const char* prefix, const char* pattern);
RDF_Resource
getNodeFromQuery (char* query) {
@@ -87,6 +88,7 @@ Init () {
if (!gInited) {
int n = 0;
FILE *templateFile = fopen("template.html", "r");
if (!templateFile) printf("Could not open template!\n");
gInited = 1;
gNarrow = RDF_GetResource("narrow", 1);
gLink = RDF_GetResource("link", 1);
@@ -95,7 +97,7 @@ Init () {
gDesc = RDF_GetResource("description", 1);
gEditor = RDF_GetResource("editor", 1);
gNewsGroup = RDF_GetResource("newsGroup", 1);
gTemplate = malloc(MAX_TEMPLATE_SIZE+1);
gTemplate = (char*) malloc(MAX_TEMPLATE_SIZE+1);
memset(gTemplate, '\0', MAX_TEMPLATE_SIZE);
n = fread(gTemplate, 1, MAX_TEMPLATE_SIZE, templateFile);
gTemplate[n] = '\0';
@@ -165,7 +167,7 @@ AnswerOpenDirQuery (WriteClientProc callBack, void* obj, char *query, char* cook
size_t n = 0;
char buff[MAX_TEMPLATE_SIZE];
char* pbegin = 0;
char* begin;
char* begin;
Init();
begin = gTemplate;
while (pbegin = strstr(begin, "&Topic")) {

View File

@@ -135,8 +135,10 @@ int main(int argc, char **argv)
if (argc == 0) {
RDF_ReadFile("three_level");
} else {
while (n <= argc) {
RDF_ReadFile(argv[n++]);
while (n < argc) {
char* name = argv[n++];
printf("Reading %s\n", name);
RDF_ReadFile(name);
}
}
printf("done");

View File

@@ -85,12 +85,13 @@ void readRDFFile (char* file) {
printf("Error in RDF File\n");
}
}
printf("Finished reading %s\n", file);
freeMem(rf->line);
freeMem(rf->line);
rf->line = NULL;
freeMem(rf->holdOver);
rf->holdOver = NULL;
free(buff);
printf("Finished reading %s\n", file);
} else printf("Could not find %s\n", file);
}
@@ -248,7 +249,7 @@ parseNextRDFXMLBlobInt(RDFT f, char* blob, int size) {
c = blob[++n];
if ((c == '\n') || (c == '\r')) lineNumber++;
}
while ((m < RDF_BUF_SIZE) && (c != '<') && (c != '>')) {
while ((m < RDF_BUF_SIZE-1) && (c != '<') && (c != '>')) {
f->line[m] = c;
m++;
somethingseenp = (somethingseenp || (!(wsCharp(c))));