Paso el block_data a BTree en lugar de Clave.

[z.facultad/75.52/treemulator.git] / viewer / view_properties.cpp

diff --git a/viewer/view_properties.cpp b/viewer/view_properties.cpp
index 8f92d5f7ac574ee0de510365a9b91c5fc7d0561b..0e789df53b51a265edc6664801e6ef87c283e8a4 100644 (file)
--- a/viewer/view_properties.cpp
+++ b/viewer/view_properties.cpp
@@ -113,17 +113,28 @@ void ViewProperties::ShowItem (BTreeData *data, BTreeNodeHeader &header)
 std::string ViewProperties::ToRaw (BTreeData *p)
 {
        std::stringstream ss;
 std::string ViewProperties::ToRaw (BTreeData *p)
 {
        std::stringstream ss;

-       uint size = p->Size (), i;
-       uchar *arr = p->ToArray ();
+       uint size = 0, i;
+       uchar *arr = NULL;
+       if (p->GetKey ()) {
+               arr = p->GetKey ()->ToRaw (size);
+       }

 
        for (i=0; i < size; i++) {
 
        for (i=0; i < size; i++) {

-               if (isalnum (arr[i]))
+               if (isalnum (arr[i]) || (arr[i] == ']') || (arr[i] == '|') ||
+                       (arr[i] == '[') || (arr[i] == '-'))

                        ss << arr[i];
                else
                        ss << ".";
        }
 
                        ss << arr[i];
                else
                        ss << ".";
        }
 

-       delete [] arr;
+       if (p->GetChild () != 0) {
+               ss << "(";
+               ss << p->GetChild ();
+               ss << ")";
+       }
+
+       if (arr)
+               delete [] arr;

        return ss.str ();
 }
 
        return ss.str ();
 }