diff -crB ns-3-80211n/src/contrib/stats/data-output-interface.cc ns-3-allinone/ns-3-dev/src/contrib/stats/data-output-interface.cc
*** ns-3-80211n/src/contrib/stats/data-output-interface.cc	2009-05-02 00:10:55.000000000 +0200
--- ns-3-allinone/ns-3-dev/src/contrib/stats/data-output-interface.cc	2009-04-09 23:21:29.000000000 +0200
***************
*** 45,60 ****
    Object::DoDispose();
    // end DataOutputInterface::DoDispose
  }
- 
- void
- DataOutputInterface::SetFilePrefix(const std::string prefix)
- {
-   m_filePrefix = prefix;
- }
- 
- std::string
- DataOutputInterface::GetFilePrefix() const
- {
-   return m_filePrefix;
- }
- 
--- 45,47 ----
diff -crB ns-3-80211n/src/contrib/stats/data-output-interface.h ns-3-allinone/ns-3-dev/src/contrib/stats/data-output-interface.h
*** ns-3-80211n/src/contrib/stats/data-output-interface.h	2009-05-02 00:15:21.000000000 +0200
--- ns-3-allinone/ns-3-dev/src/contrib/stats/data-output-interface.h	2009-04-09 23:21:29.000000000 +0200
***************
*** 37,48 ****
  
      virtual void Output(DataCollector &dc) = 0;
  
-     void SetFilePrefix(const std::string prefix);
-     std::string GetFilePrefix() const;
-     
    protected:
      virtual void DoDispose();
!     std::string m_filePrefix;
      // end class DataOutputInterface
    };
  
--- 37,45 ----
  
      virtual void Output(DataCollector &dc) = 0;
  
    protected:
      virtual void DoDispose();
! 
      // end class DataOutputInterface
    };
  
diff -crB ns-3-80211n/src/contrib/stats/omnet-data-output.cc ns-3-allinone/ns-3-dev/src/contrib/stats/omnet-data-output.cc
*** ns-3-80211n/src/contrib/stats/omnet-data-output.cc	2009-05-02 00:18:37.000000000 +0200
--- ns-3-allinone/ns-3-dev/src/contrib/stats/omnet-data-output.cc	2009-04-09 23:21:29.000000000 +0200
***************
*** 34,42 ****
  
  //--------------------------------------------------------------
  //----------------------------------------------
! OmnetDataOutput::OmnetDataOutput() 
  {
-   m_filePrefix = "data";
    NS_LOG_FUNCTION_NOARGS();
  }
  OmnetDataOutput::~OmnetDataOutput()
--- 34,42 ----
  
  //--------------------------------------------------------------
  //----------------------------------------------
! OmnetDataOutput::OmnetDataOutput() :
!   m_filePrefix("data")
  {
    NS_LOG_FUNCTION_NOARGS();
  }
  OmnetDataOutput::~OmnetDataOutput()
***************
*** 52,57 ****
--- 52,67 ----
    // end OmnetDataOutput::DoDispose
  }
  
+ void
+ OmnetDataOutput::SetFilePrefix(const std::string prefix)
+ {
+   m_filePrefix = prefix;
+ }
+ std::string
+ OmnetDataOutput::GetFilePrefix() const
+ {
+   return m_filePrefix;
+ }
  
  //----------------------------------------------
  void
diff -crB ns-3-80211n/src/contrib/stats/omnet-data-output.h ns-3-allinone/ns-3-dev/src/contrib/stats/omnet-data-output.h
*** ns-3-80211n/src/contrib/stats/omnet-data-output.h	2009-05-02 00:10:08.000000000 +0200
--- ns-3-allinone/ns-3-dev/src/contrib/stats/omnet-data-output.h	2009-04-09 23:21:29.000000000 +0200
***************
*** 37,42 ****
--- 37,45 ----
  
      virtual void Output(DataCollector &dc);
  
+     void SetFilePrefix(const std::string prefix);
+     std::string GetFilePrefix() const;
+ 
    protected:
      virtual void DoDispose();
  
***************
*** 70,75 ****
--- 73,79 ----
        // end class OmnetOutputCallback
      };
  
+     std::string m_filePrefix;
      // end class OmnetDataOutput
    };
  
diff -crB ns-3-80211n/src/contrib/stats/sqlite-data-output.cc ns-3-allinone/ns-3-dev/src/contrib/stats/sqlite-data-output.cc
*** ns-3-80211n/src/contrib/stats/sqlite-data-output.cc	2009-05-02 00:22:50.000000000 +0200
--- ns-3-allinone/ns-3-dev/src/contrib/stats/sqlite-data-output.cc	2009-04-09 23:21:29.000000000 +0200
***************
*** 35,43 ****
  
  //--------------------------------------------------------------
  //----------------------------------------------
! SqliteDataOutput::SqliteDataOutput()
  {
-   m_filePrefix = "data";
    NS_LOG_FUNCTION_NOARGS();
  }
  SqliteDataOutput::~SqliteDataOutput()
--- 35,43 ----
  
  //--------------------------------------------------------------
  //----------------------------------------------
! SqliteDataOutput::SqliteDataOutput() :
!   m_dbFile("data.db")
  {
    NS_LOG_FUNCTION_NOARGS();
  }
  SqliteDataOutput::~SqliteDataOutput()
***************
*** 53,58 ****
--- 53,69 ----
    // end SqliteDataOutput::DoDispose
  }
  
+ void
+ SqliteDataOutput::SetDBFile(const std::string file)
+ {
+   m_dbFile = file;
+ }
+ std::string
+ SqliteDataOutput::GetDBFile() const
+ {
+   return m_dbFile;
+ }
+ 
  int
  SqliteDataOutput::Exec(std::string exe) {
    int res;
***************
*** 100,107 ****
  void
  SqliteDataOutput::Output(DataCollector &dc)
  {
!   std::string m_dbFile = m_filePrefix + ".db";
!   
    if (sqlite3_open(m_dbFile.c_str(), &m_db)) {
      NS_LOG_ERROR("Could not open sqlite3 database \"" << m_dbFile << "\"");
      NS_LOG_ERROR("sqlite3 error \"" << sqlite3_errmsg(m_db) << "\"");
--- 111,117 ----
  void
  SqliteDataOutput::Output(DataCollector &dc)
  {
! 
    if (sqlite3_open(m_dbFile.c_str(), &m_db)) {
      NS_LOG_ERROR("Could not open sqlite3 database \"" << m_dbFile << "\"");
      NS_LOG_ERROR("sqlite3 error \"" << sqlite3_errmsg(m_db) << "\"");
diff -crB ns-3-80211n/src/contrib/stats/sqlite-data-output.h ns-3-allinone/ns-3-dev/src/contrib/stats/sqlite-data-output.h
*** ns-3-80211n/src/contrib/stats/sqlite-data-output.h	2009-05-02 00:29:26.000000000 +0200
--- ns-3-allinone/ns-3-dev/src/contrib/stats/sqlite-data-output.h	2009-04-09 23:21:29.000000000 +0200
***************
*** 40,45 ****
--- 40,48 ----
  
      virtual void Output(DataCollector &dc);
  
+     void SetDBFile(const std::string file);
+     std::string GetDBFile() const;
+ 
    protected:
      virtual void DoDispose();
  
***************
*** 79,84 ****
--- 82,88 ----
      sqlite3 *m_db;
      int Exec(std::string exe);
  
+     std::string m_dbFile;
      // end class SqliteDataOutput
    };