#include "XMLTree.h"\r
#include <cstring>\r
-// functions to convert tag positions to the corresponding tree node and viceversa. \r
+\r
+ // functions to convert tag positions to the corresponding tree node and viceversa. \r
// These are implemented in order to be able to change the tree and Tags representations, \r
// without affecting the code so much.\r
// Current implementation corresponds to balanced-parentheses representation for\r
return (int)x;\r
}\r
\r
+// to prevent suprious "unused result" warnings\r
+\r
+inline void ufread(void *ptr, size_t size, size_t nmemb, FILE *stream){\r
+ size_t res;\r
+ res = fread(ptr,size,nmemb,stream);\r
+ if (res < nmemb)\r
+ throw "ufread I/O error";\r
+\r
+ return;\r
+}\r
+inline void ufwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream){\r
+ size_t res;\r
+ res = fwrite(ptr,size,nmemb,stream);\r
+ if (res < nmemb)\r
+ throw "ufwrite I/O error";\r
+ return;\r
+}\r
+\r
// Save: saves XML tree data structure to file. \r
void XMLTree::Save(unsigned char *filename) \r
{\r
saveTree(Par, fp);\r
\r
// stores the table with tag names\r
- fwrite(&ntagnames, sizeof(int), 1, fp);\r
+ ufwrite(&ntagnames, sizeof(int), 1, fp);\r
for (i=0; i<ntagnames;i++)\r
- fprintf(fp, "%s\n",TagName[i]);\r
+ fprintf(fp, "%s\n",TagName[i]);\r
+ \r
\r
// stores the flags\r
- fwrite(&indexing_empty_texts, sizeof(bool), 1, fp);\r
- fwrite(&initialized, sizeof(bool), 1, fp);\r
- fwrite(&finished, sizeof(bool), 1, fp);\r
+ ufwrite(&indexing_empty_texts, sizeof(bool), 1, fp);\r
+ ufwrite(&initialized, sizeof(bool), 1, fp);\r
+ ufwrite(&finished, sizeof(bool), 1, fp);\r
+ ufwrite(&disable_tc, sizeof(bool),1,fp);\r
\r
if (!indexing_empty_texts) EBVector->save(fp);\r
\r
Tags->save(fp);\r
\r
// stores the texts \r
- Text->Save(fp);\r
+ if (!disable_tc)\r
+ Text->Save(fp);\r
\r
fclose(fp);\r
\r
loadTree(XML_Tree->Par, fp); \r
\r
// stores the table with tag names\r
- fread(&XML_Tree->ntagnames, sizeof(int), 1, fp);\r
-\r
+ ufread(&XML_Tree->ntagnames, sizeof(int), 1, fp);\r
XML_Tree->TagName = (unsigned char **)malloc(XML_Tree->ntagnames*sizeof(unsigned char *));\r
\r
for (i=0; i<XML_Tree->ntagnames;i++) {\r
- int k = feof(fp);\r
- fscanf(fp, "%s\n",filenameaux);\r
- XML_Tree->TagName[i] = (unsigned char *)malloc(sizeof(unsigned char)*(strlen((const char *)filenameaux)+1));\r
- strcpy((char *)XML_Tree->TagName[i], (const char *)filenameaux);\r
+ \r
+ // Kim is it needed ?\r
+ int k = feof(fp);\r
+ // fscanf chokes ont "\n" which is the case for the root element\r
+ char * r = fgets(filenameaux,1023,fp);\r
+ // int r = fscanf(fp, "<%s>\n",filenameaux);\r
+ if (r==NULL)\r
+ throw "Cannot read tag list";\r
+\r
+\r
+ int len = strlen((const char*)filenameaux);\r
+ XML_Tree->TagName[i] = (unsigned char *)calloc(len,sizeof(char));\r
+\r
+ //XML_Tree->TagName[i] = (unsigned char *)malloc(sizeof(unsigned char)*(strlen((const char *)filenameaux)+1));\r
+ //the - 1 removes the trailing \n\r
+ strncpy((char *)XML_Tree->TagName[i], (const char *)filenameaux,len - 1);\r
}\r
\r
// loads the flags\r
- fread(&(XML_Tree->indexing_empty_texts), sizeof(bool), 1, fp);\r
- fread(&(XML_Tree->initialized), sizeof(bool), 1, fp);\r
- fread(&(XML_Tree->finished), sizeof(bool), 1, fp);\r
- \r
+ ufread(&(XML_Tree->indexing_empty_texts), sizeof(bool), 1, fp);\r
+ ufread(&(XML_Tree->initialized), sizeof(bool), 1, fp);\r
+ ufread(&(XML_Tree->finished), sizeof(bool), 1, fp);\r
+ ufread(&(XML_Tree->disable_tc), sizeof(bool), 1, fp);\r
if (!(XML_Tree->indexing_empty_texts)) XML_Tree->EBVector = static_bitsequence_rrr02::load(fp);\r
\r
// loads the tags\r
XML_Tree->Tags = static_sequence::load(fp);\r
\r
- // loads the texts \r
- XML_Tree->Text->Load(fp,sample_rate_text);\r
+ // loads the texts\r
+ if (!XML_Tree->disable_tc){\r
+ XML_Tree->Text = TextCollection::InitTextCollection(sample_rate_text);\r
+ XML_Tree->Text->Load(fp,sample_rate_text);\r
+ }\r
+ else\r
+ XML_Tree->Text = NULL;\r
\r
fclose(fp);\r
- \r
return XML_Tree;\r
}\r
\r
treeNode XMLTree::Root() \r
{\r
if (!finished) {\r
- fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
+ fprintf(stderr, "Root() : Error: data structure has not been constructed properly\n");\r
exit(1);\r
}\r
return root_node(Par);\r