Datenmodell bei Autoren geändert

diff --git a/lib/FrBr/Books/Controller/Autor.pm b/lib/FrBr/Books/Controller/Autor.pm
index 19e4723ddb440ae38895a58ad5eacffbf3c925fc..1efb318ebfb83d0316b1ea51104293c393476e0c 100644 (file)
--- a/lib/FrBr/Books/Controller/Autor.pm
+++ b/lib/FrBr/Books/Controller/Autor.pm
@@ -113,7 +113,7 @@ sub form_new : Path('new') {
 
     $c->stash->{'autor_edit'} = {} unless $c->stash->{'autor_edit'};
     $self->autor_session2stash($c);
-    $c->stash->{'autor_edit'}{'name'} = "Neuer Autor" unless $c->stash->{'autor_edit'}{'name'};
+    $c->stash->{'autor_edit'}{'nachname'} = "Neuer Autor" unless $c->stash->{'autor_edit'}{'nachname'};
 
     return 1 unless $c->request->params->{'autor_form_sent'} and $c->request->params->{'do_save'};
 
@@ -158,8 +158,8 @@ sub check_formparams : Private {
         return undef;
     }
 
-    unless ( $c->stash->{'autor_edit'}{'name'} ) {
-        $c->stash->{'error_message'} = "Kein Name des Autors angegeben.";
+    unless ( $c->stash->{'autor_edit'}{'nachname'} ) {
+        $c->stash->{'error_message'} = "Kein Nachname des Autors angegeben.";
         return undef;
     }
 
@@ -175,9 +175,14 @@ sub autor_session2stash : Private {
     my $K = ( caller(0) )[3] . "(): ";
 
     $c->stash->{'autor_edit'} = {} unless $c->stash->{'autor_edit'};
-    $c->stash->{'autor_edit'}{'id'}   = $c->session->{'autor_data_edit'}{'id'}   if $c->session->{'autor_data_edit'}{'id'};
-    $c->stash->{'autor_edit'}{'name'} = $c->session->{'autor_data_edit'}{'name'} if $c->session->{'autor_data_edit'}{'name'};
-    $c->stash->{'autor_edit'}{'desc'} = $c->session->{'autor_data_edit'}{'desc'} if $c->session->{'autor_data_edit'}{'desc'};
+
+    $c->stash->{'autor_edit'}{'id'}          = $c->session->{'autor_data_edit'}{'id'}          if $c->session->{'autor_data_edit'}{'id'};
+    $c->stash->{'autor_edit'}{'titel'}       = $c->session->{'autor_data_edit'}{'titel'}       if exists $c->session->{'autor_data_edit'}{'titel'};
+    $c->stash->{'autor_edit'}{'vorname'}     = $c->session->{'autor_data_edit'}{'vorname'}     if exists $c->session->{'autor_data_edit'}{'vorname'};
+    $c->stash->{'autor_edit'}{'mittelname'}  = $c->session->{'autor_data_edit'}{'mittelname'}  if exists $c->session->{'autor_data_edit'}{'mittelname'};
+    $c->stash->{'autor_edit'}{'nachname'}    = $c->session->{'autor_data_edit'}{'nachname'}    if $c->session->{'autor_data_edit'}{'nachname'};
+    $c->stash->{'autor_edit'}{'name_suffix'} = $c->session->{'autor_data_edit'}{'name_suffix'} if exists $c->session->{'autor_data_edit'}{'name_suffix'};
+    $c->stash->{'autor_edit'}{'desc'}        = $c->session->{'autor_data_edit'}{'desc'}        if exists $c->session->{'autor_data_edit'}{'desc'};
 
     $c->stash->{'return_target_autor_save'} = $c->session->{'return_target_autor_save'} || $c->web_path('/autor');
 
@@ -202,15 +207,51 @@ sub autor_cgi2session : Private {
     # Autor-Id eintragen, wenn notwendig
     $c->session->{'autor_data_edit'}{'id'} = $c->request->params->{'autor_id'} if $c->request->params->{'autor_id'};
 
-    # Name des Autors
-    if ( defined $c->request->params->{'autor_name'} ) {
-        my $name = $c->request->params->{'autor_name'};
+    # Titel des Autors
+    if ( defined $c->request->params->{'autor_titel'} ) {
+        my $titel = $c->request->params->{'autor_titel'};
+        $titel =~ s/^\s+//;
+        $titel =~ s/\s+$//;
+        $titel = undef if $titel eq '';
+        $c->session->{'autor_data_edit'}{'titel'} = $titel;
+    }
+
+    # Vorname des Autors
+    if ( defined $c->request->params->{'autor_vorname'} ) {
+        my $vorname = $c->request->params->{'autor_vorname'};
+        $vorname =~ s/^\s+//;
+        $vorname =~ s/\s+$//;
+        $vorname = undef if $vorname eq '';
+        $c->session->{'autor_data_edit'}{'vorname'} = $vorname;
+    }
+
+    # Mittelname des Autors
+    if ( defined $c->request->params->{'autor_mittelname'} ) {
+        my $name = $c->request->params->{'autor_mittelname'};
         $name =~ s/^\s+//;
         $name =~ s/\s+$//;
-        $c->session->{'autor_data_edit'}{'name'} = $name;
+        $name = undef if $name eq '';
+        $c->session->{'autor_data_edit'}{'mittelname'} = $name;
+    }
+
+    # Nachname des Autors
+    if ( defined $c->request->params->{'autor_nachname'} ) {
+        my $name = $c->request->params->{'autor_nachname'};
+        $name =~ s/^\s+//;
+        $name =~ s/\s+$//;
+        $c->session->{'autor_data_edit'}{'nachname'} = $name;
+    }
+
+    # Namens-Suffix des Autors
+    if ( defined $c->request->params->{'autor_name_suffix'} ) {
+        my $suffix = $c->request->params->{'autor_name_suffix'};
+        $suffix =~ s/^\s+//;
+        $suffix =~ s/\s+$//;
+        $suffix = undef if $suffix eq '';
+        $c->session->{'autor_data_edit'}{'name_suffix'} = $suffix;
     }
 
-    # Untertitel
+    # Genauere Beschreibung des Autors
     $c->session->{'autor_data_edit'}{'desc'} = $c->request->params->{'autor_desc'} if defined $c->request->params->{'autor_desc'};
 
     return 1;

diff --git a/lib/FrBr/Books/Controller/Books.pm b/lib/FrBr/Books/Controller/Books.pm
index 17239e27738a7778879b248c2908e7ec430e5ea8..7a420c81248e6ee20654586011833603d0cd46ec 100644 (file)
--- a/lib/FrBr/Books/Controller/Books.pm
+++ b/lib/FrBr/Books/Controller/Books.pm
@@ -237,7 +237,7 @@ sub bookdata_session2stash : Private {
     $c->log->debug( get_output_string( $K . "Autoren des Buches: ", $c->stash->{'autor_list_book'} ) );
 
     $c->stash->{'autor_list_no'} = [];
-    for my $autor_id ( sort { lc($c->stash->{'autor_list'}{$a}) cmp lc($c->stash->{'autor_list'}{$b}) } keys %{$c->stash->{'autor_list'}} ) {
+    for my $autor_id ( @{$c->stash->{'autor_array_sorted'}} ) {
         push @{$c->stash->{'autor_list_no'}}, $autor_id unless $Autor{$autor_id};
     }
     $c->log->debug( get_output_string( $K . "Autoren, die fehlen: ", $c->stash->{'autor_list_no'} ) );
@@ -565,8 +565,10 @@ sub prepare_data_structures : Private {
     $c->log->debug( get_output_string( $K . "Autoren gesamt: ", $autor_list_complete ) );
 
     $c->stash->{'autor_list'} = {};
+    $c->stash->{'autor_array_sorted'} = [];
     for my $autor ( @$autor_list_complete ) {
         $c->stash->{'autor_list'}{ $autor->{'id'} } = $autor->{'name'};
+        push @{$c->stash->{'autor_array_sorted'}}, $autor->{'id'};
     }
     $c->log->debug( get_output_string( $K . "Autoren-Hash: ", $c->stash->{'autor_list'} ) );
 

diff --git a/lib/FrBr/Books/Db/Autoren.pm b/lib/FrBr/Books/Db/Autoren.pm
index 0bab31d1e722e903800e5357beb7fcbae7bc68a0..fc1714616e7a0a4fdf6c3853202944f0a975e3ce 100644 (file)
--- a/lib/FrBr/Books/Db/Autoren.pm
+++ b/lib/FrBr/Books/Db/Autoren.pm
@@ -12,11 +12,15 @@ __PACKAGE__->load_components("Core");
 __PACKAGE__->table("autoren");
 __PACKAGE__->add_columns(
   "id"          => { data_type => "INT",     default_value => undef, is_nullable => 0, size => 10 },
-  "autor_name"  => { data_type => "VARCHAR", default_value => undef, is_nullable => 0, size => 250, },
+  "titel"       => { data_type => "VARCHAR", default_value => undef, is_nullable => 1, size => 100, },
+  "vorname"     => { data_type => "VARCHAR", default_value => undef, is_nullable => 1, size => 150, },
+  "mittelname"  => { data_type => "VARCHAR", default_value => undef, is_nullable => 1, size => 150, },
+  "nachname"    => { data_type => "VARCHAR", default_value => undef, is_nullable => 0, size => 150, },
+  "name_suffix" => { data_type => "VARCHAR", default_value => undef, is_nullable => 1, size => 100, },
   "autor_descr" => { data_type => "TEXT",    default_value => undef, is_nullable => 0, size => 65535, },
 );
 __PACKAGE__->set_primary_key("id");
-__PACKAGE__->add_unique_constraint("autor_name", ["autor_name"]);
+__PACKAGE__->add_unique_constraint( "name", [ "nachname", "vorname", "mittelname", "name_suffix" ] );
 
 
 # Created by DBIx::Class::Schema::Loader v0.04004 @ 2008-03-17 17:53:52

diff --git a/lib/FrBr/Books/Util/Author.pm b/lib/FrBr/Books/Util/Author.pm
index cafd723a1a93049c19260b3aab0aabd1196bad52..91a470133b54443125d75b1501c41648e401eb22 100644 (file)
--- a/lib/FrBr/Books/Util/Author.pm
+++ b/lib/FrBr/Books/Util/Author.pm
@@ -56,6 +56,11 @@ Rueckgabe: Eine Array-Ref von Hash-Refs mit allen Autoren, die den uebergebenen
   $res = [
     { 'id'     => 1,
       'name'    => 'J.R.R. Tolkien',
+      'titel'   => undef,
+      'vorname' => 'J.R.R.',
+      'mittelname'  => undef,
+      'nachname'    => 'Tolkien',
+      'name_suffix' => undef,
       'descr'  => 'Bla Blub',
     },
     { 'id'     => 2,
@@ -64,14 +69,14 @@ Rueckgabe: Eine Array-Ref von Hash-Refs mit allen Autoren, die den uebergebenen
     ...
   ];
 
-Die Liste ist nach den Autor-Namen alphabetisch sortiert.
+Die Liste ist nach den Nachnamen, Vornamen, Mittelnamen und Namens-Suffixen alphabetisch sortiert.
 
 =cut
 
 sub get_author_list {
 
     my $c = shift;
-    my $K = __PACKAGE__ . "::get_author_list(): ";
+    my $K = ( caller(0) )[3] . "(): ";
 
     $c->log->debug( $K . "aufgerufen." ) if $c->stash->{'debug_level'} > 2;
 
@@ -89,23 +94,42 @@ sub get_author_list {
     my $search_params = undef;
 
     my $other_params = {};
-    $other_params->{'order_by'} = [ 'autor_name' ];
+    $other_params->{'order_by'} = [ 'nachname', 'vorname', 'mittelname', 'name_suffix' ];
     $other_params->{'select'} = [
         'id',
-        'autor_name',
+        'titel',
+        'vorname',
+        'mittelname',
+        'nachname',
+        'name_suffix',
         'autor_descr',
     ];
     $other_params->{'as'} = [
         'id',
-        'autor_name',
+        'titel',
+        'vorname',
+        'mittelname',
+        'nachname',
+        'name_suffix',
         'autor_descr',
     ];
  
     for my $autor_rs ( $c->model('Schema::Autoren')->search( $search_params, $other_params )->all() ) {
         my $autor = {};
-        $autor->{'id'}    = $autor_rs->id();
-        $autor->{'name'}  = $autor_rs->autor_name();
-        $autor->{'descr'} = $autor_rs->autor_descr();
+        $autor->{'id'}          = $autor_rs->id();
+        $autor->{'titel'}       = $autor_rs->titel();
+        $autor->{'vorname'}     = $autor_rs->vorname();
+        $autor->{'mittelname'}  = $autor_rs->mittelname();
+        $autor->{'nachname'}    = $autor_rs->nachname();
+        $autor->{'name_suffix'} = $autor_rs->name_suffix();
+        $autor->{'descr'}       = $autor_rs->autor_descr();
+        my @N;
+        push @N, $autor->{'titel'} if $autor->{'titel'};
+        push @N, $autor->{'vorname'} if $autor->{'vorname'};
+        push @N, $autor->{'mittelname'} if $autor->{'mittelname'};
+        push @N, $autor->{'nachname'};
+        push @N, $autor->{'name_suffix'} if $autor->{'name_suffix'};
+        $autor->{'name'}  = join( " ", @N );
         push @$list, $autor;
     }
 
@@ -129,29 +153,85 @@ sub save_autor {
     my $storage = $c->stash->{'storage'};
 
     my $save_func = sub {
-        my ( $storage, $dbh, $autor_id, $name, $desc ) = @_;
+        my ( $storage, $dbh, $autor_id, $titel, $vorname, $mittelname, $nachname, $suffix, $desc ) = @_;
         $desc = '' unless defined $desc;
         my $sql = <<ENDE;
 INSERT INTO `autoren` (
-    `id`, `autor_name`, `autor_descr` )
+    `id`, `titel`, `vorname`, `mittelname`, `nachname`, `name_suffix`, `autor_descr` )
   VALUES (
-    ?, ?, ? )
+    ?, ?, ?, ?, ?, ?, ? )
   ON DUPLICATE KEY UPDATE
-    `id` = LAST_INSERT_ID(`id`), `autor_name` = ?, `autor_descr` = ?
+    `id` = LAST_INSERT_ID(`id`),
+    `titel` = ?,
+    `vorname` = ?,
+    `mittelname` = ?,
+    `nachname` = ?,
+    `name_suffix` = ?,
+    `autor_descr` = ?
 ENDE
 
+        my @P = ();
+        push @P, $autor_id;
+        push @P, $titel;
+        push @P, $vorname;
+        push @P, $mittelname;
+        push @P, $nachname;
+        push @P, $suffix;
+        push @P, $desc;
+        push @P, $titel;
+        push @P, $vorname;
+        push @P, $mittelname;
+        push @P, $nachname;
+        push @P, $suffix;
+        push @P, $desc;
+
         if ( $storage->debug() ) {
             my $text = $sql;
             $text =~ s/\s+$//;
-            $text .= ": " . join( ", ", map { $dbh->quote($_) } ( $autor_id, $name, $desc, $name, $desc ) ) . "\n";
+            $text .= ": " . join( ", ", map { $dbh->quote($_) } @P ) . "\n";
             warn $text;
         }
 
         my $sth = $dbh->prepare($sql);
-        $sth->execute( $autor_id, $name, $desc, $name, $desc );
+        $sth->execute( @P );
     };
 
-    $storage->dbh_do( $save_func, $autor->{'id'}, $autor->{'name'}, $autor->{'desc'} );
+    my @Params = ();
+    push @Params, $autor->{'id'};
+
+    my $tmp = $autor->{'titel'};
+    $tmp = '' unless defined $tmp;
+    $tmp =~ s/^\s+//;
+    $tmp =~ s/\s+$//;
+    push @Params, ( $tmp ? $tmp : undef );
+
+    $tmp = $autor->{'vorname'};
+    $tmp = '' unless defined $tmp;
+    $tmp =~ s/^\s+//;
+    $tmp =~ s/\s+$//;
+    push @Params, ( $tmp ? $tmp : undef );
+
+    $tmp = $autor->{'mittelname'};
+    $tmp = '' unless defined $tmp;
+    $tmp =~ s/^\s+//;
+    $tmp =~ s/\s+$//;
+    push @Params, ( $tmp ? $tmp : undef );
+
+    $tmp = $autor->{'nachname'};
+    $tmp = '' unless defined $tmp;
+    $tmp =~ s/^\s+//;
+    $tmp =~ s/\s+$//;
+    push @Params, $tmp;
+
+    $tmp = $autor->{'name_suffix'};
+    $tmp = '' unless defined $tmp;
+    $tmp =~ s/^\s+//;
+    $tmp =~ s/\s+$//;
+    push @Params, ( $tmp ? $tmp : undef );
+
+    push @Params, $autor->{'desc'};
+
+    $storage->dbh_do( $save_func, @Params );
 
     return $storage->last_insert_id();
 

diff --git a/lib/FrBr/Books/Util/Book.pm b/lib/FrBr/Books/Util/Book.pm
index 75669eaa20c76c3b13efebc60913568f9344072f..55be7dab34ed3d17669f6be2c445ee30663f54d0 100644 (file)
--- a/lib/FrBr/Books/Util/Book.pm
+++ b/lib/FrBr/Books/Util/Book.pm
@@ -183,15 +183,29 @@ sub get_booklist {
     $other_params->{'join'}     = [ 'autor' ];
     $other_params->{'select'} = [
         'me.buch_id',
-        'autor.autor_name',
+        'autor.titel',
+        'autor.vorname',
+        'autor.mittelname',
+        'autor.nachname',
+        'autor.name_suffix',
     ];
     $other_params->{'as'} = [
         'buch_id',
-        'autor_name',
+        'titel',
+        'vorname',
+        'mittelname',
+        'nachname',
+        'name_suffix',
     ];
     for my $ref ( $c->model('Schema::Autor2buch')->search( $a_search_params, $other_params )->all() ) {
         my $bid   = $ref->get_column('buch_id');
-        my $autor = $ref->get_column('autor_name');
+        my @N;
+        push @N, $ref->get_column('titel') if $ref->get_column('titel');
+        push @N, $ref->get_column('vorname') if $ref->get_column('vorname');
+        push @N, $ref->get_column('mittelname') if $ref->get_column('mittelname');
+        push @N, $ref->get_column('nachname');
+        push @N, $ref->get_column('name_suffix') if $ref->get_column('name_suffix');
+        my $autor = join( " ", @N );
         my $j = $buchmap->{$bid};
         next unless defined $j;
         my $buch = $list->[$j];

diff --git a/root/src/autor/autor_form.tt2 b/root/src/autor/autor_form.tt2
index f9ac63771781e41aa227f055bdc96954cff941a1..5b981d079065f917b2271bc4ffb40db0f6349dc8 100644 (file)
--- a/root/src/autor/autor_form.tt2
+++ b/root/src/autor/autor_form.tt2
@@ -19,8 +19,20 @@
     </tr><tr>
       <td colspan="2">&nbsp;</td>
     </tr><tr>
-      <th>Name des Autors:</th>
-      <td><input type="text" name="autor_name" size="50" maxlength="250" value="[% autor_edit.name | html %]" /></td>
+      <th>Titel des Autors (Dr. o.ä.):</th>
+      <td><input type="text" name="autor_titel" size="50" maxlength="100" value="[% autor_edit.titel | html %]" /></td>
+    </tr><tr>
+      <th>Vorname des Autors:</th>
+      <td><input type="text" name="autor_vorname" size="50" maxlength="150" value="[% autor_edit.vorname | html %]" /></td>
+    </tr><tr>
+      <th>Zweiter Vorname des Autors (oder Vatersname o.ä.):</th>
+      <td><input type="text" name="autor_mittelname" size="50" maxlength="150" value="[% autor_edit.mittelname | html %]" /></td>
+    </tr><tr>
+      <th>Nachname des Autors:</th>
+      <td><input type="text" name="autor_nachname" size="50" maxlength="150" value="[% autor_edit.nachname | html %]" /></td>
+    </tr><tr>
+      <th>Namenssuffix (Jr. o.ä.):</th>
+      <td><input type="text" name="autor_name_suffix" size="50" maxlength="100" value="[% autor_edit.name_suffix | html %]" /></td>
     </tr><tr>
       <th>Zusätzliche Angaben:</th>
       <td><textarea name="autor_desc" cols="50" rows="5">[% autor_edit.desc | html %]</textarea></td>

diff --git a/root/src/autor/save_success.tt2 b/root/src/autor/save_success.tt2
index 5e88d9bf6c3903b27e0b12122f3e5f7d023dafe2..3b849d2aaf44436f286caea37108fac6dc3f739f 100644 (file)
--- a/root/src/autor/save_success.tt2
+++ b/root/src/autor/save_success.tt2
@@ -10,7 +10,7 @@
 -%]
 <div style="text-align: center">
 
-Der Autor <b>&quot;[% autor_edit.name %]</b> wurde erfolgreich gespeichert.
+Der Autor <b>&quot;[% autor_edit.titel %] [% autor_edit.vorname %] [% autor_edit.mittelname %] [% autor_edit.nachname %] [% autor_edit.name_suffix %]</b> wurde erfolgreich gespeichert.
 
 <h2><a href="[% return_target_autor_save %]">OK</a></h2>