From 7ad288dd1f284702df60886ec65de21b21f47355 Mon Sep 17 00:00:00 2001
From: sb <sb>
Date: Fri, 8 Feb 2008 10:46:43 +0000
Subject: [PATCH] Foreign entities; correction of spelling mistake; don't
 generate methods supporting store and delete if no form.

---
 schemas/adl-0.dtd                     | 18 ++++++++++++------
 transforms/adl2controllerclasses.xslt |  8 ++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/schemas/adl-0.dtd b/schemas/adl-0.dtd
index 796f603..96efe12 100755
--- a/schemas/adl-0.dtd
+++ b/schemas/adl-0.dtd
@@ -13,7 +13,7 @@
     <!--  ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::  -->
     
     <!--
-        $Revision: 1.8 $
+        $Revision: 1.9 $
  	    -->
 
 <!--  ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::  -->
@@ -119,7 +119,7 @@
 -->  
 <!ENTITY % PageAttrs 
 	"name CDATA #REQUIRED
-	 properties (all|user-distict|listed) #REQUIRED" >
+	 properties (all|user-distinct|listed) #REQUIRED" >
 
 <!-- Actions for generators (mainly for keyfields - see entity 'generator', below
   assigned:           In manually-maintained code, you contract to assign a value 
@@ -221,7 +221,11 @@
                 the present implementation assumes all primary keys will be 
                 integers. This needs to be fixed!] DEPRECATED: remove; replace with the
                 'key' element, below.
-  table:        the name of the table in which this entity is stored. TODO: more thought
+  table:        the name of the table in which this entity is stored. Defaults to same
+                as name of entity. Strongly recommend this is not used unless it needs
+                to be different from the name of the entity
+  foreign:      this entity is part of some other system; no code will be generated
+                for it, although code which links to it will be generated
 -->
 <!ELEMENT entity ( documentation?, content?, key?,
       (property | one-to-many | many-to-many | many-to-one)*,
@@ -229,7 +233,8 @@
 <!ATTLIST entity 
     name      CDATA           #REQUIRED
     natural-key CDATA         #IMPLIED
-    table     CDATA           #IMPLIED>
+    table     CDATA           #IMPLIED
+    foreign   %Boolean;       #IMPLIED>
 
 <!-- 
   contains documentation on the element which immediately contains it. TODO:
@@ -429,11 +434,12 @@ property[@type='entity']. TODO: Not complete, not yet strictly convinced it's th
 
 <!--
   A parameter passed to the generator. Again, based on the Hibernate 
-  implementation.
+  implementation. TODO: #PCDATA is wrong as the content model, as embedded
+  markup is definitely not allowed!
   
   name:   the name of this parameter
 -->
-<!ELEMENT param (CDATA)>
+<!ELEMENT param (#PCDATA)>
 <!ATTLIST param
   name        CDATA           #REQUIRED>
 
diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt
index c1bc759..cee3ba0 100755
--- a/transforms/adl2controllerclasses.xslt
+++ b/transforms/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.3 $
-    $Date: 2008-02-01 21:47:15 $
+    $Revision: 1.4 $
+    $Date: 2008-02-08 10:46:43 $
   -->
 
   <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -44,13 +44,13 @@
       <!-- Ignore entities without a simple (non-composite) key. -->
     </xsl:template>
     
-    <xsl:template match="a:entity">
+    <xsl:template match="a:entity[form|page|list]">
       <!-- what's all this about? the objective is to get the revision number of the 
     transform into the output, /without/ getting that revision number overwritten 
     with the revision number of the generated file if the generated file is 
     stored to CVS -->
       <xsl:variable name="transform-rev1"
-                    select="substring( '$Revision: 1.3 $', 11)"/>
+                    select="substring( '$Revision: 1.4 $', 11)"/>
       <xsl:variable name="transform-revision"
                     select="substring( $transform-rev1, 0, string-length( $transform-rev1) - 1)"/>