From: Moritz Bunkus Date: Wed, 5 Jun 2013 08:48:28 +0000 (+0200) Subject: Vorkommen von "LxOffice" (und andere Schreibweisen) durch "kivitendo" ersetzen X-Git-Tag: release-3.1.0beta1~331^2~66 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0674bc84625f8968ae558027c48af5815ce5f4be;p=kivitendo-erp.git Vorkommen von "LxOffice" (und andere Schreibweisen) durch "kivitendo" ersetzen --- diff --git a/SL/DB.pm b/SL/DB.pm index 47f597d5f..f20e189a4 100644 --- a/SL/DB.pm +++ b/SL/DB.pm @@ -50,10 +50,10 @@ sub _register_db { my $initial_sql; if (!%::myconfig) { - $type = 'LXOFFICE_EMPTY'; + $type = 'KIVITENDO_EMPTY'; %connect_settings = ( driver => 'Pg' ); - } elsif ($type eq 'LXOFFICE_AUTH') { + } elsif ($type eq 'KIVITENDO_AUTH') { %connect_settings = ( driver => $::myconfig{dbdriver} || 'Pg', database => $::auth->{DB_config}->{db}, host => $::auth->{DB_config}->{host} || 'localhost', @@ -82,7 +82,7 @@ sub _register_db { my %flattened_settings = _flatten_settings(%connect_settings); - $domain = 'LXOFFICE' if $type =~ m/^LXOFFICE/; + $domain = 'KIVITENDO' if $type =~ m/^KIVITENDO/; $type .= join($SUBSCRIPT_SEPARATOR, map { ($_, $flattened_settings{$_} || '') } sort grep { $_ ne 'dbpasswd' } keys %flattened_settings); my $idx = "${domain}::${type}"; diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm index 81f451248..d1f297190 100644 --- a/SL/DB/Helper/Mappings.pm +++ b/SL/DB/Helper/Mappings.pm @@ -11,13 +11,13 @@ our @EXPORT_OK = qw(get_table_for_package get_package_for_table get_package_name # these will not be managed as Rose::DB models, because they are not normalized, # significant changes are needed to get them done, or they were done by CRM. -my @lxoffice_blacklist_permanent = qw( +my @kivitendo_blacklist_permanent = qw( leads ); # these are not managed _yet_, but will hopefully at some point. # if you are confident that one of these works, remove it here. -my @lxoffice_blacklist_temp = qw( +my @kivitendo_blacklist_temp = qw( ); # tables created by crm module @@ -29,12 +29,12 @@ my @cash_register_blacklist = qw( ekartikel ekbon ekkunde ektext erptasten ); -my @lxoffice_blacklist = (@lxoffice_blacklist_permanent, @lxoffice_blacklist_temp, @crm_blacklist, @cash_register_blacklist); +my @kivitendo_blacklist = (@kivitendo_blacklist_permanent, @kivitendo_blacklist_temp, @crm_blacklist, @cash_register_blacklist); # map table names to their models. # unlike rails we have no singular<->plural magic. # remeber: tables should be named as the plural of the model name. -my %lxoffice_package_names = ( +my %kivitendo_package_names = ( acc_trans => 'acc_transaction', audittrail => 'audit_trail', 'auth.clients' => 'auth_client', @@ -112,42 +112,42 @@ my %lxoffice_package_names = ( vendor => 'vendor', ); -my (%lxoffice_tables_to_packages, %lxoffice_tables_to_manager_packages, %lxoffice_packages_to_tables); +my (%kivitendo_tables_to_packages, %kivitendo_tables_to_manager_packages, %kivitendo_packages_to_tables); sub get_blacklist { - return LXOFFICE => \@lxoffice_blacklist; + return KIVITENDO => \@kivitendo_blacklist; } sub get_package_names { - return LXOFFICE => \%lxoffice_package_names; + return KIVITENDO => \%kivitendo_package_names; } sub get_package_for_table { - %lxoffice_tables_to_packages = map { ($_ => "SL::DB::" . camelify($lxoffice_package_names{$_})) } keys %lxoffice_package_names - unless %lxoffice_tables_to_packages; + %kivitendo_tables_to_packages = map { ($_ => "SL::DB::" . camelify($kivitendo_package_names{$_})) } keys %kivitendo_package_names + unless %kivitendo_tables_to_packages; - return $lxoffice_tables_to_packages{ $_[0] }; + return $kivitendo_tables_to_packages{ $_[0] }; } sub get_manager_package_for_table { - %lxoffice_tables_to_manager_packages = map { ($_ => "SL::DB::Manager::" . camelify($lxoffice_package_names{$_})) } keys %lxoffice_package_names - unless %lxoffice_tables_to_manager_packages; + %kivitendo_tables_to_manager_packages = map { ($_ => "SL::DB::Manager::" . camelify($kivitendo_package_names{$_})) } keys %kivitendo_package_names + unless %kivitendo_tables_to_manager_packages; - return $lxoffice_tables_to_manager_packages{ $_[0] }; + return $kivitendo_tables_to_manager_packages{ $_[0] }; } sub get_table_for_package { - get_package_for_table('dummy') if !%lxoffice_tables_to_packages; - %lxoffice_packages_to_tables = reverse %lxoffice_tables_to_packages unless %lxoffice_packages_to_tables; + get_package_for_table('dummy') if !%kivitendo_tables_to_packages; + %kivitendo_packages_to_tables = reverse %kivitendo_tables_to_packages unless %kivitendo_packages_to_tables; my $package = $_[0] =~ m/^SL::DB::/ ? $_[0] : "SL::DB::" . $_[0]; - return $lxoffice_packages_to_tables{ $package }; + return $kivitendo_packages_to_tables{ $package }; } sub db { my $string = $_[0]; - my $lookup = $lxoffice_package_names{$_[0]} || - plurify($lxoffice_package_names{singlify($_[0])}); + my $lookup = $kivitendo_package_names{$_[0]} || + plurify($kivitendo_package_names{singlify($_[0])}); for my $thing ($string, $lookup) { diff --git a/SL/DB/Object.pm b/SL/DB/Object.pm index 8b86e9711..c072e9011 100755 --- a/SL/DB/Object.pm +++ b/SL/DB/Object.pm @@ -26,7 +26,7 @@ sub new { sub init_db { my $class_or_self = shift; my $class = ref($class_or_self) || $class_or_self; - my $type = $class =~ m/::Auth/ ? 'LXOFFICE_AUTH' : 'LXOFFICE'; + my $type = $class =~ m/::Auth/ ? 'KIVITENDO_AUTH' : 'KIVITENDO'; return SL::DB::create(undef, $type); } diff --git a/modules/override/Rose/DBx/Cache/Anywhere.pm b/modules/override/Rose/DBx/Cache/Anywhere.pm index 9580e06b4..abc87c759 100644 --- a/modules/override/Rose/DBx/Cache/Anywhere.pm +++ b/modules/override/Rose/DBx/Cache/Anywhere.pm @@ -43,8 +43,8 @@ sub prepare_db { return; } - # if this a dummy lx office dbh, don't try to actually prepare this. - if ($db->type =~ /LXOFFICE_EMPTY/) { + # if this a dummy kivitendo dbh, don't try to actually prepare this. + if ($db->type =~ /KIVITENDO_EMPTY/) { return; } diff --git a/scripts/rose_auto_create_model.pl b/scripts/rose_auto_create_model.pl index 1850f4599..e935facbd 100755 --- a/scripts/rose_auto_create_model.pl +++ b/scripts/rose_auto_create_model.pl @@ -222,10 +222,10 @@ sub usage { sub make_tables { my @tables; if ($config{all}) { - my $db = SL::DB::create(undef, 'LXOFFICE'); + my $db = SL::DB::create(undef, 'KIVITENDO'); @tables = - map { $package_names{LXOFFICE}->{$_} ? "$_=" . $package_names{LXOFFICE}->{$_} : $_ } - grep { my $table = $_; !any { $_ eq $table } @{ $blacklist{LXOFFICE} } } + map { $package_names{KIVITENDO}->{$_} ? "$_=" . $package_names{KIVITENDO}->{$_} : $_ } + grep { my $table = $_; !any { $_ eq $table } @{ $blacklist{KIVITENDO} } } $db->list_tables; } elsif (@ARGV) { @tables = @ARGV; @@ -251,7 +251,7 @@ my @tables = make_tables(); for my $table (@tables) { # add default model name unless model name is given or no defaults exists - $table .= '=' . $package_names{LXOFFICE}->{lc $table} if $table !~ /=/ && $package_names{LXOFFICE}->{lc $table}; + $table .= '=' . $package_names{KIVITENDO}->{lc $table} if $table !~ /=/ && $package_names{KIVITENDO}->{lc $table}; process_table($table); }