← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/data_home.cc

  • Committer: Stewart Smith
  • Date: 2011-12-27 06:49:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2485.
  • Revision ID: stewart@flamingspork.com-20111227064923-tw8ccr27tpx98waq
Partially move towards using LOCAL catalog in all path generation by removing getDataHomeCatalog() and instead using catalog::local_identifier() around the place. We do a bit of prep work in the schema engine too. Next step is to remove chdir to 'local' and generate local as part of path to all objects.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/data_home.cc
1
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2011 Brian Aker
 
4
 *  Copyright (C) 2011 Brian Aker, Stewart Smith
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
22
22
#include <boost/filesystem.hpp>
23
23
#include <drizzled/configmake.h>
24
24
#include <drizzled/data_home.h>
 
25
#include <drizzled/catalog.h>
25
26
 
26
27
namespace drizzled {
27
28
 
28
29
static boost::filesystem::path data_home(LOCALSTATEDIR);
29
30
static boost::filesystem::path full_data_home(LOCALSTATEDIR);
30
 
static boost::filesystem::path data_home_catalog(LOCALSTATEDIR);
31
31
 
32
32
const boost::filesystem::path& getFullDataHome()
33
33
{
39
39
  return data_home;
40
40
}
41
41
 
42
 
const boost::filesystem::path& getDataHomeCatalog()
43
 
{
44
 
  return data_home_catalog;
45
 
}
46
 
 
47
42
boost::filesystem::path& getMutableDataHome()
48
43
{
49
44
  return data_home;
54
49
  full_data_home= v;
55
50
}
56
51
 
57
 
void setDataHomeCatalog(const boost::filesystem::path& v)
58
 
{
59
 
  data_home_catalog= v;
60
 
}
61
 
 
62
52
} // namespace drizzled