--- nfo/perl/libs/XML/XUpdate/xupdate2xsl.xml	2003/05/07 03:40:30	1.4
+++ nfo/perl/libs/XML/XUpdate/xupdate2xsl.xml	2003/06/06 04:02:34	1.7
@@ -88,6 +88,12 @@
 
       <!-- Dispatch all "XUpdate Services" here. -->
       <!-- FIXME: Actually implement action = "CREATE|RETRIEVE|UPDATE|DELETE"!!! -->
+
+      <!-- 
+        xsl for XUpdate Services [2 XUpdate Syntax] [2.3 Modifications]
+      -->
+
+      <!-- xsl for [2.4 Inserts] -->
       <xsl:template match="xupdate:insert-after">
           <!-- <xsl:variable name="select" select="@select">Hello World!</xsl:variable> -->
           <xsl:call-template name="findcontext">
@@ -96,6 +102,7 @@
           </xsl:call-template>
       </xsl:template>
 
+      <!-- xsl for [2.4 Inserts] -->
       <xsl:template match="xupdate:insert-before">
           <xsl:call-template name="findcontext">
             <xsl:with-param name="service">Insert</xsl:with-param>
@@ -103,6 +110,7 @@
           </xsl:call-template>
       </xsl:template>
 
+      <!-- xsl for [2.5 Append] -->
       <xsl:template match="xupdate:append">
           <xsl:call-template name="findcontext">
             <xsl:with-param name="service">Append</xsl:with-param>
@@ -111,6 +119,7 @@
           </xsl:call-template>
       </xsl:template>
 
+      <!-- xsl for [2.6 Update] -->
       <xsl:template match="xupdate:update">
           <xsl:call-template name="findcontext">
             <xsl:with-param name="service">Update</xsl:with-param>
@@ -119,14 +128,17 @@
           </xsl:call-template>
       </xsl:template>
 
+      <!-- xsl for [2.7 Remove] -->
       <xsl:template match="xupdate:remove">
           <xsl:call-template name="findcontext">
             <xsl:with-param name="service">Remove</xsl:with-param>
             <!-- <xsl:with-param name="position">after</xsl:with-param> -->
-            <xsl:with-param name="test">.</xsl:with-param>
+            <!-- 2003-06-04: removed -->
+            <!-- <xsl:with-param name="test">.</xsl:with-param> -->
           </xsl:call-template>
       </xsl:template>
 
+      <!-- xsl for [2.8 Rename] -->
       <xsl:template match="xupdate:rename">
           <xsl:call-template name="findcontext">
             <xsl:with-param name="service">Rename</xsl:with-param>
@@ -146,9 +158,6 @@
         <xsl:param name="position" />
         <!-- new of 2003-05-07: replacement for test if undef -->
         <xsl:param name="test" />
-        <xsl:param name="town" />
-        
-        <xsl:variable name="town" select="huhu">haha</xsl:variable>
         
         <!--
         <xsl:comment>
@@ -301,7 +310,12 @@
         element type seems dummy. Could this be stripped
         shorter somehow sometimes?
       -->
-      
+
+      <!-- 
+        xsl for [2.4 Inserts]
+      -->
+
+      <!-- xsl for [2.4.1 Creating Elements] -->
       <xsl:template match="xupdate:element">
           <xsl:comment> 3.a. vivify generic node </xsl:comment>
           <xsl:element name="xsl:element">
@@ -310,6 +324,7 @@
           </xsl:element>
       </xsl:template>
   
+      <!-- xsl for [2.4.2 Creating Attributes] -->
       <xsl:template match="xupdate:attribute">
           <xsl:comment> 3.b. vivify node attributes </xsl:comment>
           <xsl:element name="xsl:attribute">
@@ -318,6 +333,7 @@
           </xsl:element>
       </xsl:template>
   
+      <!-- xsl for [2.4.3 Creating Text] -->
       <xsl:template match="xupdate:text">
           <xsl:comment> 4.a. vivify text node </xsl:comment>
           <xsl:element name="xsl:text">
@@ -326,6 +342,7 @@
           </xsl:element>
       </xsl:template>
 
+      <!-- xsl for [2.4.4 Creating Processing Instructions] -->
       <xsl:template match="xupdate:processing-instruction">
           <xsl:comment> 4.b. vivify PI node </xsl:comment>
           <xsl:element name="xsl:processing-instruction">
@@ -334,6 +351,7 @@
           </xsl:element>
       </xsl:template>
 
+      <!-- xsl for [2.4.5 Creating Comments] -->
       <xsl:template match="xupdate:comment">
           <xsl:comment> 4.c. vivify comment node </xsl:comment>
           <xsl:element name="xsl:comment">
@@ -342,32 +360,66 @@
           </xsl:element>
       </xsl:template>
 
-      <!-- xsl for [2.9 Variables and Values of Variables] -->
+
+      <!-- 
+        xsl for [2.9 Variables and Values of Variables]
+        Encapsulates block payload into a named template.
+      -->
       <xsl:template match="xupdate:variable">
           <xsl:comment> 5.a. vivify xsl-element "variable" </xsl:comment>
-          <xsl:element name="xsl:variable">
-              <xsl:copy-of select="@*"/>
+          
+          <xsl:element name="xsl:template">
+              <xsl:attribute name="name">Variables</xsl:attribute>
+          
               <!--
-              <xsl:apply-templates />
+              <xsl:element name="xsl:variable">
+                  <xsl:attribute name="name"><xsl:value-of select="@name" /></xsl:attribute>
+              -->
+              
+              <xsl:choose>
+              
+                <!-- Mode 1 [spec]: just evaluate as (sub-)selection if "select"-attribute is not empty -->
+                <xsl:when test="@select!=">
+                  <xsl:element name="xsl:apply-templates">
+                      <xsl:attribute name="select"><xsl:value-of select="@select" /></xsl:attribute>
+                  </xsl:element>
+                </xsl:when>
+                
+                <!-- Mode 2 [feature]: in other cases: pass thru the current node w/o any operation(s) on it -->
+                <xsl:otherwise>
+                    <xsl:value-of select="." />
+                </xsl:otherwise>
+                    
+              </xsl:choose>
+
+              <!--
+              </xsl:element>
               -->
-            <!-- <xsl:element name="xsl:apply-templates" > -->
-              <xsl:attribute name="select">
-                <!-- <xsl:apply-templates /> -->
-                /addresses[2]/address[4]/town
-              </xsl:attribute>
-            <!-- </xsl:element> -->
-              hui
+
           </xsl:element>
-          
+
       </xsl:template>
 
+      <!-- 
+        xsl for [2.9 Variables and Values of Variables]
+        Calls encapsulated named template "Variables" 
+        for each occourance of an "xupdate:value-of" element.
+      -->
       <xsl:template match="xupdate:value-of">
           <xsl:comment> 5.b. vivify xsl-element "value-of" </xsl:comment>
-          <xsl:element name="xsl:value-of">
+          <xsl:element name="xsl:call-template">
+            <xsl:attribute name="name">Variables</xsl:attribute>
+          </xsl:element>
+          
+        <!-- is this required any more??? -->
+        <xsl:element name="xsl:value-of">
               <xsl:copy-of select="@*"/>
-              <xsl:apply-templates />
+              <!-- <xsl:apply-templates /> -->
+              <!-- this propagates the original content -->
+              <!-- <xsl:element name="xsl:apply-templates"> -->
+                <!-- <xsl:attribute name="" > -->
+              <!-- </xsl:element> -->
           </xsl:element>
-          <xsl:text>abs</xsl:text>
       </xsl:template>