Changeset 343 for trunk

Timestamp:

May 19, 2007, 3:58:19 PM (16 years ago)

Author:

Peter Johansson

Message:

refs #169

Location:

trunk/lib

Files:

• Directory.cc (modified) (3 diffs)
• Directory.h (modified) (1 diff)
• File.cc (modified) (2 diffs)
• File.h (modified) (1 diff)
• Node.cc (modified) (1 diff)
• Node.h (modified) (3 diffs)

trunk/lib/Directory.cc

@@ -54 +54 @@
     : Node(level,path,output)
   {
+    output_dir_=local_path();
+    if (!output_dir_.empty())
+      output_dir_+="/";
+
     using namespace std;
     DIR* directory=opendir(path.c_str());    // C API from dirent.h
@@ -106 +110 @@
   }
 
+
+  std::string Directory::node_type(void) const
+  {
+    return std::string("file");
+  }
+
+
+  std::string Directory::output_path(void) const
+  {
+    return output_dir()+"index.html";
+  }
+
   const Stats& Directory::parse(const bool verbose)
   {
@@ -114 +130 @@
         stats_ += (*i)->parse(verbose);
     return stats_;
-  }
-
-
-  const std::string Directory::node_type(void) const
-  {
-    return std::string("directory");
   }
 

trunk/lib/Directory.h

@@ -75 +75 @@
     /// @return directory
     ///
-    const std::string node_type(void) const;
+    std::string node_type(void) const;
+
+    /**
+       @return output path for example 'lib/File.h.html' for this file
+     */
+    std::string output_path(void) const;
 
     const Stats& parse(const bool verbose=false);

trunk/lib/File.cc

@@ -44 +44 @@
              const std::string& output) 
     : Node(level,path,output) 
-  {}
+  {
+    output_dir_=output;
+    if (!output_dir_.empty())
+      output_dir_+="/";
+  }
 
 
@@ -53 +57 @@
 
 
-  const std::string File::node_type(void) const
+  std::string File::node_type(void) const
   {
     return std::string("file");
+  }
+
+
+  std::string File::output_dir(void) const
+  {
+    return std::string();
+  }
+
+
+  std::string File::output_path(void) const
+  {
+    return local_path_+".html";
   }
 

trunk/lib/File.h

@@ -53 +53 @@
     /// @return file
     ///
-    const std::string node_type(void) const;
+    std::string node_type(void) const;
+
+    /**
+       @return output dir for example 'lib' for this file
+     */
+    std::string output_dir(void) const;
+
+    /**
+       @return output path for example 'lib/File.h.html' for this file
+     */
+    std::string output_path(void) const;
 
     ///

trunk/lib/Node.cc

@@ -107 +107 @@
        << "<td>" << author() << "</td>\n"
        << "</tr>\n";
+  }
+
+
+  std::string Node::output_dir(void) const
+  {
+    return output_dir_;
   }
 

trunk/lib/Node.h

@@ -116 +116 @@
     /// @return file or directory
     ///
-    virtual const std::string node_type(void) const=0;
+    virtual std::string node_type(void) const=0;
 
     ///
@@ -129 +129 @@
     ///
     inline std::string name(void) const { return file_name(path_); }
+
+    /**
+       @return output dir for example 'lib' for this file
+     */
+    std::string output_dir(void) const;
+
+    /**
+       @return output path for example 'lib/File.h.html' for this file
+     */
+    virtual std::string output_path(void) const=0;
 
     ///
@@ -175 +185 @@
     u_int level_;
     std::string local_path_; // path from root
+    std::string output_dir_;
     std::string path_; // absolute path
     static std::string project_;