{\r
initialized = true;\r
finished = false;\r
+ found_attributes = false;\r
npar = 0;\r
parArraySize = 1;\r
- ntagnames = 0; \r
+ ntagnames = 2; \r
\r
indexing_empty_texts = empty_texts;\r
\r
return NULLT;\r
}\r
\r
- TagName = NULL;\r
+ TagName = (unsigned char **) malloc(2*sizeof(unsigned char*));\r
+ if (!TagName){\r
+ fprintf(stderr, "Error: not enough memory\n");\r
+ return NULLT;\r
+ }\r
+\r
+ TagName[0] = (unsigned char *) malloc(4*sizeof(unsigned char));\r
+ strcpy((char *) TagName[0], "<@>");\r
+\r
+ if (!TagName[0]){\r
+ fprintf(stderr, "Error: not enough memory\n");\r
+ return NULLT;\r
+ }\r
+\r
+ TagName[1] = (unsigned char *) malloc(4*sizeof(unsigned char));\r
+ if (!TagName[1]){\r
+ fprintf(stderr, "Error: not enough memory\n");\r
+ return NULLT;\r
+ }\r
+\r
+ strcpy((char *) TagName[1], "<$>");\r
+\r
\r
if (!indexing_empty_texts) {\r
empty_texts_aux = (unsigned int *)malloc(sizeof(unsigned int));\r
static_permutation_builder * pmb = new static_permutation_builder_mrrr(PERM_SAMPLE, bmb);\r
static_sequence_builder * ssb = new static_sequence_builder_gmr_chunk(bmb, pmb);\r
\r
- Tags = new static_sequence_gmr((uint *) tags_aux, (uint) npar-1,2*ntagnames, bmb, ssb);\r
+\r
+ // If we found an attribute then "<@>" is present in the tree\r
+ // if we didn't then it is not. "<$>" is never present in the tree\r
+ int ntagsize = found_attributes ? 2*ntagnames-1 : 2*ntagnames - 2;\r
+\r
+ Tags = new static_sequence_gmr((uint *) tags_aux, (uint) npar-1,ntagsize, bmb, ssb);\r
\r
delete bmb;\r
delete pmb;\r
// transforms the tagname into a tag identifier. If the tag is new, we insert\r
// it in the table.\r
for (i=0; i<ntagnames; i++)\r
- if (strcmp((const char *)tagname,(const char *)TagName[i])==0) break;\r
+ if (strcmp((const char *)tagname,(const char *)TagName[i])==0) break;\r
\r
+\r
+ // NewOpenTag("<@>") was called\r
+ if (i==0) \r
+ found_attributes=true;\r
+\r
if (i==ntagnames) { // the tag is a new one, then we insert it\r
TagName = (unsigned char **)realloc(TagName, sizeof(char *)*(ntagnames+1));\r
\r
}\r
\r
\r
-\r
+TagType XMLTree::RegisterTag(unsigned char *tagname)\r
+{\r
+ if (!finished)\r
+ return NULLT;\r
+ \r
+\r
+ TagType id = XMLTree::GetTagId(tagname);\r
+ if (id == NULLT){\r
+ id = ntagnames;\r
+ ntagnames = ntagnames + 1; \r
+ TagName = (unsigned char **) realloc(TagName,ntagnames*(sizeof(unsigned char*)));\r
+ strcpy((char*)TagName[id], (const char *)tagname); \r
+ };\r
+\r
+ return id;\r
+}\r