From 806bef044cdb34e9bf4cd375d336bf08f65618d2 Mon Sep 17 00:00:00 2001
From: nvalimak <nvalimak@3cdefd35-fc62-479d-8e8d-bae585ffb9ca>
Date: Wed, 27 Oct 2010 13:34:42 +0000
Subject: [PATCH] Added filename to Save() and Load()

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/XMLTree@924 3cdefd35-fc62-479d-8e8d-bae585ffb9ca
---
 XMLTree.cpp        | 10 ++++------
 XMLTree.h          |  4 ++--
 XMLTreeBuilder.cpp |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/XMLTree.cpp b/XMLTree.cpp
index 248185d..764e910 100644
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -209,7 +209,7 @@ void XMLTree::print_stats()
  }
 
 // Save: saves XML tree data structure to file. 
-void XMLTree::Save(int fd) 
+void XMLTree::Save(int fd, char *filename) 
  {
     FILE *fp;
     char filenameaux[1024];
@@ -241,16 +241,14 @@ void XMLTree::Save(int fd)
     
     // stores the texts   
     if (!disable_tc) {
-      Text->Save(fp);
+        Text->Save(fp, filename);
     };
-
-
  }
 
 
 // Load: loads XML tree data structure from file. Returns
 // a pointer to the loaded data structure
-XMLTree *XMLTree::Load(int fd, bool load_tc,int sample_factor) 
+XMLTree *XMLTree::Load(int fd, char *filename, bool load_tc,int sample_factor) 
  {
 
     FILE *fp;
@@ -331,7 +329,7 @@ XMLTree *XMLTree::Load(int fd, bool load_tc,int sample_factor)
     // Not used  
     // loads the texts
     if (!XML_Tree->disable_tc){
-        XML_Tree->Text = TextCollection::Load(fp, TextCollection::index_mode_default, sample_factor);
+        XML_Tree->Text = TextCollection::Load(fp, filename, TextCollection::index_mode_default, sample_factor);
     }
     else XML_Tree->Text = NULL;
     STOPTIMER(Loading);
diff --git a/XMLTree.h b/XMLTree.h
index 6d11d78..1eddbb0 100644
--- a/XMLTree.h
+++ b/XMLTree.h
@@ -477,11 +477,11 @@ public:
    }
    
    /** Save: saves XML tree data structure to file. */
-   void Save(int fd);
+   void Save(int fd, char *filename);
       
    /** Load: loads XML tree data structure from file. sample_rate_text 
     * indicates the sample rate for the text search data structure. */
-   static XMLTree *Load(int fd,bool load_tc, int sample_factor);   
+   static XMLTree *Load(int fd, char *filename, bool load_tc, int sample_factor);   
 
    void insertTag(TagType tag, uint position);
    
diff --git a/XMLTreeBuilder.cpp b/XMLTreeBuilder.cpp
index 9f7d060..3115e4d 100644
--- a/XMLTreeBuilder.cpp
+++ b/XMLTreeBuilder.cpp
@@ -39,7 +39,7 @@ int XMLTreeBuilder::OpenDocument(bool empty_texts, int sample_rate_text, bool dt
     if (disable_tc)
         TextBuilder = 0;
     else 
-      TextBuilder = new TextCollectionBuilder((unsigned)sample_rate_text);
+        TextBuilder = TextCollectionBuilder::create((unsigned)sample_rate_text, TextCollectionBuilder::index_type_default);
     Text = 0;
     empty_texts_aux = (unsigned int *)ucalloc(sizeof(unsigned int),1);
     eta_size = sizeof(unsigned int);
-- 
2.17.1