X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=xml-tree.cpp;h=82f00b0af86742bfd66720272e51c0fd9e650c26;hb=HEAD;hp=b33383e6dcd41e08542f8633c4fa62671a8e5b1b;hpb=9775b1833487a525901cf968d91a9e7f193395c5;p=SXSI%2FXMLTree.git

diff --git a/xml-tree.cpp b/xml-tree.cpp
index b33383e..82f00b0 100644
--- a/xml-tree.cpp
+++ b/xml-tree.cpp
@@ -317,7 +317,7 @@ xml_tree* xml_tree::load(int fd, char* name, bool load_tc, int sf)
 
   //tree->tags = static_sequence_bs::load(fp);
   ufread(&tree->bits_per_tag, sizeof(uint), 1, fp);
-  fprintf(stderr, "\nBits per tag: %u\n", tree->bits_per_tag);
+  //fprintf(stderr, "\nBits per tag: %u\n", tree->bits_per_tag);
   ufread(&tree->tag_seq_len, sizeof(uint), 1, fp);
   size_t size = uint_len(tree->bits_per_tag, tree->tag_seq_len);
   tree->tag_seq = new uint[size];
@@ -387,7 +387,7 @@ std::pair<int32_t, int32_t> xml_tree::text_id_range(xml_tree::node_t x) const
   else
     i = text_positions->rank1(x-1);
   j = text_positions->rank1(y);
-//  fprintf(stderr, "Rank of node %i is %i, rank of closing %i is %i\n", x, i, y, j);
+
   if (i == j)
     return std::make_pair(xml_tree::NIL, xml_tree::NIL);
   else
@@ -399,9 +399,9 @@ int32_t xml_tree::text_id(xml_tree::node_t x) const
   return (int32_t) text_positions->rank1(x) - 1;
 }
 
-unsigned char* xml_tree::get_text(int32_t id) const
+const char* xml_tree::get_text(int32_t id) const
 {
-  unsigned char * s = text_collection->GetText(id);
+  const char * s = reinterpret_cast<const char*>(text_collection->GetText(id));
   return s + (s[0] == 1);
 }
 
@@ -582,11 +582,11 @@ void xml_tree::print(xml_tree::node_t x, int fd, bool no_text)
             label = tag(n);
           } else
             uputc('>', fd);
-        } else {
+          } else {
           uputs("/>", fd);
           n++;
           label = tag(n);
-        };
+          };
       };
     } else do {
       uputs("</", fd);