Amaya/amaya/fetchXMLname.c - diff

Return to fetchXMLname.c CVS log

Up to [Public] / Amaya / amaya

version 1.25, 2000/09/04 13:44:33	version 1.26, 2000/09/05 13:44:44
Line 222 Document doc;	Line 222 Document doc;
int i;	int i;
ElemMapping *ptr;	ElemMapping *ptr;
STRING name;	STRING name;
	ThotBool invalid = FALSE;

if (elType.ElTypeNum > 0)	if (elType.ElTypeNum > 0)
{	{
Line 240 Document doc;	Line 241 Document doc;
{	{
if (ptr[i].ThotType == elType.ElTypeNum)	if (ptr[i].ThotType == elType.ElTypeNum)
{	{
if (ptr[i].Level <= ParsingLevel[doc])	if (doc == 0 \|\| ptr[i].Level <= ParsingLevel[doc])
return ptr[i].XMLname;	return ptr[i].XMLname;
else	else
return TEXT("???");	invalid = TRUE;
}	}
i++;	i++;
}	}
while (ptr[i].XMLname[0] != WC_EOS);	while (ptr[i].XMLname[0] != WC_EOS);
}	}
return TEXT("???");	if (invalid)
	return TEXT("");
	else
	return TEXT("???");
}	}


Line 353 Document doc;	Line 357 Document doc;
{	{
if (ptr[i].ThotAttribute == attrType.AttrTypeNum)	if (ptr[i].ThotAttribute == attrType.AttrTypeNum)
{	{
if (ptr[i].Level <= ParsingLevel[doc])	if (doc == 0 \|\| ptr[i].Level <= ParsingLevel[doc])
return ptr[i].XMLattribute;	return ptr[i].XMLattribute;
else	else
return TEXT("???");	return TEXT("???");