From 2220c6ca1fb8ebefd48d6f5d9a6be3afc7325da5 Mon Sep 17 00:00:00 2001
From: kim <kim@3cdefd35-fc62-479d-8e8d-bae585ffb9ca>
Date: Thu, 29 Jan 2009 03:50:17 +0000
Subject: [PATCH] Debugged the save/load functions

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/XMLTree@90 3cdefd35-fc62-479d-8e8d-bae585ffb9ca
---
 XMLTree.cpp | 79 +++++++++++++++++++++++++++++++++++++++--------------
 XMLTree.h   |  6 ++++
 2 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/XMLTree.cpp b/XMLTree.cpp
index ecc9a27..a696d7f 100644
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -1,6 +1,7 @@
 #include "XMLTree.h"
 #include <cstring>
-// functions to convert tag positions to the corresponding tree node and viceversa. 
+
+ // functions to convert tag positions to the corresponding tree node and viceversa. 
 // These are implemented in order to be able to change the tree and Tags representations, 
 // without affecting the code so much.
 // Current implementation corresponds to balanced-parentheses representation for
@@ -16,6 +17,24 @@ inline int node2tagpos(treeNode x) {
    return (int)x;
 }
 
+// to prevent suprious "unused result" warnings
+
+inline void ufread(void *ptr, size_t size, size_t nmemb, FILE *stream){
+  size_t res;
+  res = fread(ptr,size,nmemb,stream);
+  if (res < nmemb)
+    throw "ufread I/O error";
+
+  return;
+}
+inline void ufwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream){
+  size_t res;
+  res = fwrite(ptr,size,nmemb,stream);
+  if (res < nmemb)
+    throw "ufwrite I/O error";
+  return;
+}
+
 // Save: saves XML tree data structure to file. 
 void XMLTree::Save(unsigned char *filename) 
  {
@@ -35,14 +54,16 @@ void XMLTree::Save(unsigned char *filename)
     saveTree(Par, fp);
  
     // stores the table with tag names
-    fwrite(&ntagnames, sizeof(int), 1, fp);
+    ufwrite(&ntagnames, sizeof(int), 1, fp);
     for (i=0; i<ntagnames;i++)
-       fprintf(fp, "%s\n",TagName[i]);
+      fprintf(fp, "%s\n",TagName[i]);
+    
     
     // stores the flags
-    fwrite(&indexing_empty_texts, sizeof(bool), 1, fp);
-    fwrite(&initialized, sizeof(bool), 1, fp);
-    fwrite(&finished, sizeof(bool), 1, fp);
+    ufwrite(&indexing_empty_texts, sizeof(bool), 1, fp);
+    ufwrite(&initialized, sizeof(bool), 1, fp);
+    ufwrite(&finished, sizeof(bool), 1, fp);
+    ufwrite(&disable_tc, sizeof(bool),1,fp);
     
     if (!indexing_empty_texts) EBVector->save(fp);
     
@@ -50,7 +71,8 @@ void XMLTree::Save(unsigned char *filename)
     Tags->save(fp);
 
     // stores the texts   
-    Text->Save(fp);
+    if (!disable_tc)
+      Text->Save(fp);
 
     fclose(fp);
 
@@ -82,32 +104,47 @@ XMLTree *XMLTree::Load(unsigned char *filename, int sample_rate_text)
     loadTree(XML_Tree->Par, fp); 
     
     // stores the table with tag names
-    fread(&XML_Tree->ntagnames, sizeof(int), 1, fp);
-
+    ufread(&XML_Tree->ntagnames, sizeof(int), 1, fp);
     XML_Tree->TagName = (unsigned char **)malloc(XML_Tree->ntagnames*sizeof(unsigned char *));
 
     for (i=0; i<XML_Tree->ntagnames;i++) {
-       int k = feof(fp);
-       fscanf(fp, "%s\n",filenameaux);
-       XML_Tree->TagName[i] = (unsigned char *)malloc(sizeof(unsigned char)*(strlen((const char *)filenameaux)+1));
-       strcpy((char *)XML_Tree->TagName[i], (const char *)filenameaux);
+      
+      // Kim is it needed ?
+      int k = feof(fp);
+       // fscanf chokes ont "\n" which is the case for the root element
+       char * r = fgets(filenameaux,1023,fp);
+       //       int r = fscanf(fp, "<%s>\n",filenameaux);
+       if (r==NULL)
+	 throw "Cannot read tag list";
+
+
+       int len = strlen((const char*)filenameaux);
+       XML_Tree->TagName[i] = (unsigned char *)calloc(len,sizeof(char));
+
+       //XML_Tree->TagName[i] = (unsigned char *)malloc(sizeof(unsigned char)*(strlen((const char *)filenameaux)+1));
+       //the - 1 removes the trailing \n
+       strncpy((char *)XML_Tree->TagName[i], (const char *)filenameaux,len - 1);
     }
 	
     // loads the flags
-    fread(&(XML_Tree->indexing_empty_texts), sizeof(bool), 1, fp);
-    fread(&(XML_Tree->initialized), sizeof(bool), 1, fp);
-    fread(&(XML_Tree->finished), sizeof(bool), 1, fp);
-    
+    ufread(&(XML_Tree->indexing_empty_texts), sizeof(bool), 1, fp);
+    ufread(&(XML_Tree->initialized), sizeof(bool), 1, fp);
+    ufread(&(XML_Tree->finished), sizeof(bool), 1, fp);
+    ufread(&(XML_Tree->disable_tc), sizeof(bool), 1, fp);
     if (!(XML_Tree->indexing_empty_texts)) XML_Tree->EBVector = static_bitsequence_rrr02::load(fp);
 
     // loads the tags
     XML_Tree->Tags = static_sequence::load(fp);
 
-    // loads the texts   
-    XML_Tree->Text->Load(fp,sample_rate_text);
+    // loads the texts
+    if (!XML_Tree->disable_tc){
+      XML_Tree->Text = TextCollection::InitTextCollection(sample_rate_text);
+      XML_Tree->Text->Load(fp,sample_rate_text);
+    }
+    else
+      XML_Tree->Text = NULL;
 
     fclose(fp);
-    
     return XML_Tree;
  }
 
@@ -147,7 +184,7 @@ XMLTree::~XMLTree()
 treeNode XMLTree::Root() 
  {
     if (!finished) {
-       fprintf(stderr, "Error: data structure has not been constructed properly\n");
+       fprintf(stderr, "Root() : Error: data structure has not been constructed properly\n");
        exit(1);
     }
     return root_node(Par);
diff --git a/XMLTree.h b/XMLTree.h
index c054b01..759aff8 100644
--- a/XMLTree.h
+++ b/XMLTree.h
@@ -25,6 +25,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstring>
+
+//clash between TextCollection/Tools.h and libcds/includes/basics.h
+#undef W
+#undef WW
+#undef Wminusone
+
 #include "bp.h"
 #include <static_bitsequence.h>
 #include <alphabet_mapper.h>
-- 
2.17.1