← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/load_file.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/function/str/load_file.cc
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
4
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
5
 *  Copyright (C) 2011 Stewart Smith
5
6
 *
6
7
 *  This program is free software; you can redistribute it and/or modify
7
8
 *  it under the terms of the GNU General Public License as published by
21
22
#include <drizzled/function/str/strfunc.h>
22
23
#include <drizzled/function/str/load_file.h>
23
24
#include <drizzled/error.h>
24
 
#include <drizzled/data_home.h>
 
25
#include <drizzled/catalog/local.h>
25
26
#include <drizzled/session.h>
26
27
#include <drizzled/internal/my_sys.h>
27
28
#include <drizzled/sys_var.h>
52
53
    return 0;
53
54
  }
54
55
 
55
 
  fs::path target_path(fs::system_complete(getDataHomeCatalog()));
 
56
  fs::path target_path(fs::system_complete(catalog::local_identifier().getPath()));
56
57
  fs::path to_file(file_name->c_ptr());
57
58
  if (not to_file.has_root_directory())
58
59
  {