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 32304a3..2e6cd57 100644 (file)
--- a/lib/SQL/Translator/Producer/Turnkey.pm
+++ b/lib/SQL/Translator/Producer/Turnkey.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Producer::Turnkey;
 
 # -------------------------------------------------------------------
-# $Id: Turnkey.pm,v 1.24 2004-02-10 06:31:43 allenday Exp $
+# $Id: Turnkey.pm,v 1.31 2004-03-31 08:36:21 allenday Exp $
 # -------------------------------------------------------------------
 # Copyright (C) 2002-4 SQLFairy Authors
 #
@@ -22,7 +22,7 @@ package SQL::Translator::Producer::Turnkey;
 
 use strict;
 use vars qw[ $VERSION $DEBUG ];
-$VERSION = sprintf "%d.%02d", q$Revision: 1.24 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.31 $ =~ /(\d+)\.(\d+)/;
 $DEBUG   = 1 unless defined $DEBUG;
 
 use SQL::Translator::Schema::Constants;
@@ -234,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 %]
@@ -348,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});
@@ -499,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%]
@@ -511,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>
@@ -601,7 +603,7 @@ EOF
   [- FOREACH node = nodes -]
   [- IF !node.value.is_trivial_link -]
     [% CASE '[- format_table(node.key) -]' %]
-      [% INCLUDE [- format_table(node.key) -] %]
+      [% INCLUDE [- node.key -].tt2 %]
   [- END -]
   [- END -]
     [% CASE DEFAULT %]
@@ -623,28 +625,24 @@ EOF
   return <<'EOF';
 [%- TAGS [- -] -%]
 [-- IF !node.is_trivial_link --]
-[% records = atom.render(dbobject) %]
 [% rowcount = 0 %]
 [% IF atom.focus == "yes" %]
-  [% FOREACH record = records %]
   [- FOREACH field = node.data_fields -]
   [- IF field != "1" -]
-    <tr><td class="dbfieldname">[- field -]</td><td class="dbfieldvalue">[% obj2link(fields.[- field -]) %]</td></tr>
+    <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 -]
-  [% id = record.id %]
   [% IF (rowcount > 1) %] <tr><td colspan="2"><hr></td></tr> [% END %]
   [% rowcount = rowcount + 1 %]
-  [% END %]
 [% ELSE %]
   <tr><td><ul>
-  [% FOREACH record = records %]
+  [% FOREACH record = atom.render(dbobject) %]
     [% class = ref(atom) | replace('::Atom::', '::Model::') %]
-    [% id = record.id %]
+    [% id = record.id #needed by make_linked_dbobject macro %]
     [% PROCESS make_linked_dbobject %]
     <li class="minorfocus">[% obj2link(linked_dbobject) %]</li>
   [% END %]