more readable tag names

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Producer / Turnkey.pm

diff --git a/lib/SQL/Translator/Producer/Turnkey.pm b/lib/SQL/Translator/Producer/Turnkey.pm
index d104013..2e6cd57 100644 (file)
--- a/lib/SQL/Translator/Producer/Turnkey.pm
+++ b/lib/SQL/Translator/Producer/Turnkey.pm
@@ -1,10 +1,9 @@
 package SQL::Translator::Producer::Turnkey;
 
 # -------------------------------------------------------------------
-# $Id: Turnkey.pm,v 1.21 2004-01-15 20:49:30 boconnor Exp $
+# $Id: Turnkey.pm,v 1.31 2004-03-31 08:36:21 allenday Exp $
 # -------------------------------------------------------------------
-# Copyright (C) 2003 Allen Day <allenday@ucla.edu>,
-#   Brian O'Connor <brian.oconnor@excite.com>.
+# Copyright (C) 2002-4 SQLFairy Authors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -23,7 +22,7 @@ package SQL::Translator::Producer::Turnkey;
 
 use strict;
 use vars qw[ $VERSION $DEBUG ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.21 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.31 $ =~ /(\d+)\.(\d+)/;
 $DEBUG   = 1 unless defined $DEBUG;
 
 use SQL::Translator::Schema::Constants;
@@ -149,23 +148,34 @@ sub translateForm {
   my $t = shift;
   my $meta = shift;
 
-
-#"Node Data:\n";
-#warn Dumper $meta->{nodes};
-#exit;
-
   my $args = $t->producer_args;
   my $type = $meta->{'template'};
-  my $tt2;
-  $tt2 = template($type);
+
   my $template = Template->new({
-                                                               PRE_CHOMP => 1,
-                                                               POST_CHOMP => 0,
-                                                               EVAL_PERL => 1
-                                                          });
+                                PRE_CHOMP => 1,
+                                POST_CHOMP => 0,
+                                EVAL_PERL => 1
+                               });
 
+  my $tt2;
+  $tt2 = template($type);
   my $result;
-  $template->process(\$tt2, $meta, \$result) || die $template->error();
+
+  if($type eq 'atomtemplate'){
+    my %result;
+    foreach my $node (values %{ $meta->{'nodes'} }){
+      $result = '';
+      my $param = { node => $node };
+      $template->process(\$tt2, $param, \$result) || die $template->error();
+      $result =~ s/^\s*(.+)\s*$/$1/s;
+      next unless $result;
+      $result{$node->table->name} = $result;
+    }
+    return \%result;
+  } else {
+    $template->process(\$tt2, $meta, \$result) || die $template->error();
+  }
+
   return($result);
 }
 
@@ -224,9 +234,10 @@ use Class::DBI::Pager;
 #
 # Primary key accessors
 #
+
 [% FOREACH item = array %]
-sub id { shift->[% item %] }
-sub [% name %] { shift->[% item %] }
+[% IF item != "id" %]sub id { shift->[% item %] }[% END %]
+[% IF item != name %]sub [% name %] { shift->[% item %] }[% END %]
 [% END %]
 
 [% END %]
@@ -338,6 +349,7 @@ package [% baseclass %];
 # Template used: classdbi
 
 use strict;
+no warnings 'redefine';
 use base qw(Class::DBI::Pg);
 
 [% baseclass %]->set_db('Main', '[% db_dsn  %]', '[% db_user %]', '[% db_pass %]', {AutoCommit=>1});
@@ -489,7 +501,7 @@ EOF
 <atomcontainerbindings>
 [% FOREACH focus_atom = nodes %]
 [% IF !focus_atom.value.is_trivial_link %]
-  <atomcontainerbindingslayout xlink:label="Turnkey::Model::[% format_table(focus_atom.key) %]">
+  <layout xlink:label="Turnkey::Model::[% format_table(focus_atom.key) %]">
   [% FOREACH link_atom = focus_atom.value.hyperedges %]
     <atomcontainerbinding xlink:from="#MidLeftContainer" xlink:label="MidLeftContainer2[% format_table(link_atom.thatnode.table.name) %]Atom"  xlink:to="#[% format_table(link_atom.thatnode.table.name) %]Atom"/>
   [%- END%]
@@ -501,7 +513,7 @@ EOF
   [% END %]
   [%- END %]
     <atomcontainerbinding xlink:from="#MainContainer"    xlink:label="MainContainer2[% format_table(focus_atom.key) %]Atom"    xlink:to="#[% format_table(focus_atom.key) %]Atom"/>
-  </atomcontainerbindingslayout>
+  </layout>
   [%- END %]
 [% END %]
 </atomcontainerbindings>
@@ -591,61 +603,55 @@ EOF
   [- FOREACH node = nodes -]
   [- IF !node.value.is_trivial_link -]
     [% CASE '[- format_table(node.key) -]' %]
-      [% render[- format_table(node.key) -]Atom(atom,dbobject) %]
+      [% INCLUDE [- node.key -].tt2 %]
   [- END -]
   [- END -]
     [% CASE DEFAULT %]
       [% renderlist(atom.render(dbobject)) %]
 [% END %]
-[- FOREACH node = nodes -]
-[- IF !node.value.is_trivial_link -]
-[% MACRO render[- format_table(node.key) -]Atom(atom, dbobject) BLOCK %]
-  [% lstArr = atom.render(dbobject) %]
-  [% rowcount = 0 %]
-  [% IF atom.focus == "yes" %]
-  [% FOREACH record = lstArr %]
-    [% fields = record.data %]
-    [- pname = format_table(node.key) -]
-    [- pkey = "Turnkey::Model::${pname}" -]
-    [- FOREACH field = node.value.data_fields -]
-    [- IF field != "1" -]
-      <tr><td class="dbfieldname">[- field -]</td><td class="dbfieldvalue">[% obj2link(fields.[- field -]) %]</td></tr>
-    [- END -]
-    [- END -]
-    [- FOREACH field = node.value.edges -]
-    [- NEXT IF field.type != 'import' -]
-      <tr><td class="dbfieldname">[- field.thisfield.name -]</td><td class="dbfieldvalue">[% obj2link(fields.[- field.thisfield.name -]) %]</td></tr>
-    [- END -]
-    [% id = record.id %]
-    [% IF (rowcount > 1) %] <tr><td colspan="2"><hr></td></tr> [% END %]
-    [% rowcount = rowcount + 1 %]
-  [% END %]
-  [% ELSE %]
-    <tr><td><ul>
-  [% FOREACH record = lstArr %]
+[% MACRO renderlist(lstArr) BLOCK %]
+   <tr><td><ul>
+  [% FOREACH item = lstArr %]
     [% class = ref(atom) | replace('::Atom::', '::Model::') %]
-    [% id = record.id %]
+    [% id = item.id %]
     [% PROCESS make_linked_dbobject %]
     <li class="minorfocus">[% obj2link(linked_dbobject) %]</li>
   [% END %]
    </ul></td></tr>
-  [% END %]
 [% END %]
-[- END -]
-[- END -]
-[% MACRO renderlist(lstArr) BLOCK %]
-   <tr><td><ul>
-  [% FOREACH item = lstArr %]
+EOF
+
+} elsif($type eq 'atomtemplate') {
+  return <<'EOF';
+[%- TAGS [- -] -%]
+[-- IF !node.is_trivial_link --]
+[% rowcount = 0 %]
+[% IF atom.focus == "yes" %]
+  [- FOREACH field = node.data_fields -]
+  [- IF field != "1" -]
+    <tr><td class="dbfieldname">[- field -]</td><td class="dbfieldvalue">[% obj2link(dbobject.[- field -]) %]</td></tr>
+  [- END -]
+  [- END -]
+  [- FOREACH field = node.edges -]
+  [- NEXT IF field.type != 'import' -]
+    <tr><td class="dbfieldname">[- field.thisfield.name -]</td><td class="dbfieldvalue">[% obj2link(fields.[- field.thisfield.name -]) %]</td></tr>
+  [- END -]
+  [% IF (rowcount > 1) %] <tr><td colspan="2"><hr></td></tr> [% END %]
+  [% rowcount = rowcount + 1 %]
+[% ELSE %]
+  <tr><td><ul>
+  [% FOREACH record = atom.render(dbobject) %]
     [% class = ref(atom) | replace('::Atom::', '::Model::') %]
-    [% id = item.id %]
+    [% id = record.id #needed by make_linked_dbobject macro %]
     [% PROCESS make_linked_dbobject %]
     <li class="minorfocus">[% obj2link(linked_dbobject) %]</li>
   [% END %]
    </ul></td></tr>
 [% END %]
+[- END -]
 EOF
 
-1;
-
 }
 }
+
+1;