cleaned out idiotic commenting of FUNCDEF, which had been done when a strict compile

[feisty_meow.git] / nucleus / library / filesystem / directory_tree.cpp

diff --git a/nucleus/library/filesystem/directory_tree.cpp b/nucleus/library/filesystem/directory_tree.cpp
index dc78832fb64d13d977724ede7afabed1543c53ac..68b82b7fc7d3cdbf41e27182acf178596f6a0d86 100644 (file)
--- a/nucleus/library/filesystem/directory_tree.cpp
+++ b/nucleus/library/filesystem/directory_tree.cpp
@@ -34,7 +34,7 @@ using namespace nodes;
 using namespace structures;
 using namespace textual;
 
-//#define DEBUG_DIRECTORY_TREE
+#define DEBUG_DIRECTORY_TREE
   // uncomment for noisier version.
 
 #undef LOG
@@ -224,12 +224,18 @@ void directory_tree::traverse(const astring &path, const char *pattern,
 
 bool directory_tree::reset(const astring &path, const char *pattern)
 {
+  FUNCDEF("reset");
   _scanned_okay = false;
   WHACK(_real_tree);
+//  filename temp_path(path);
+//  temp_path.canonicalize();
   *_path = path;
+//temp_path.raw();
   *_pattern = pattern;
   _real_tree = new filename_tree;
 
+LOG(astring("dirtree::reset to path: ") + path);
+
   // check that the top-level is healthy.
   directory curr(path, "*");
   if (!curr.good()) return false;
@@ -438,7 +444,7 @@ filename_tree *directory_tree::seek(const astring &dir_name_in,
       filename current(check->_dirname);
       if (!current.is_normal()) {
 //#ifdef DEBUG_DIRECTORY_TREE
-        LOG(astring("skipping abnormal dir:  ") + current);
+        LOG(astring("skipping abnormal dir: \"") + current + "\"");
 //#endif
         continue;
       }
@@ -500,7 +506,7 @@ bool directory_tree::calculate(filename_tree *start, bool just_size)
   while (directory_tree::current_dir(*ted, curr)) {
     if (!curr.is_normal()) {
 //#ifdef DEBUG_DIRECTORY_TREE
-      LOG(astring("skipping abnormal dir:  ") + curr);
+      LOG(astring("skipping abnormal dir: \"") + curr + "\"");
 //#endif
       directory_tree::next(*ted);
       continue;  // scary non-simple file type.
@@ -518,7 +524,7 @@ bool directory_tree::calculate(filename_tree *start, bool just_size)
 #endif
       if (!curr_file.is_normal()) {
 //#ifdef DEBUG_DIRECTORY_TREE
-        LOG(astring("skipping abnormal file:  ") + curr);
+        LOG(astring("skipping abnormal file: \"") + curr + "\"");
 //#endif
         continue;
       }
@@ -617,6 +623,11 @@ bool directory_tree::compare_trees(const directory_tree &source,
     if (target_start.raw().t()) {
       corresponding_name = filename(target_start.raw()
           + filename::default_separator() + corresponding_name.raw());
+/*doesn't help, not right yet.    } else {
+      // if they didn't give us a place to start, we start at the top.
+      corresponding_name = filename(target.path()
+          + filename::default_separator() + corresponding_name.raw());
+*/
     }
 #ifdef DEBUG_DIRECTORY_TREE
     LOG(astring("target with start is: ") + corresponding_name);