commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r9201 - in trunk/gnue-samples/two-tier: . bin etc forms images sc


From: johannes
Subject: [gnue] r9201 - in trunk/gnue-samples/two-tier: . bin etc forms images schema
Date: Thu, 4 Jan 2007 09:57:01 -0600 (CST)

Author: johannes
Date: 2007-01-04 09:56:26 -0600 (Thu, 04 Jan 2007)
New Revision: 9201

Added:
   trunk/gnue-samples/two-tier/bin/
   trunk/gnue-samples/two-tier/bin/setup-db-svn.sh
   trunk/gnue-samples/two-tier/etc/
   trunk/gnue-samples/two-tier/etc/connections.conf
   trunk/gnue-samples/two-tier/forms/
   trunk/gnue-samples/two-tier/forms/customer.gfd
   trunk/gnue-samples/two-tier/forms/invoice.gfd
   trunk/gnue-samples/two-tier/forms/items.gfd
   trunk/gnue-samples/two-tier/forms/states.gfd
   trunk/gnue-samples/two-tier/images/
   trunk/gnue-samples/two-tier/images/LHARDY.jpg
   trunk/gnue-samples/two-tier/images/MAC-G5.jpg
   trunk/gnue-samples/two-tier/schema/customer.gsd
Removed:
   trunk/gnue-samples/two-tier/schema/address.gsd
   trunk/gnue-samples/two-tier/schema/invoice_address.gsd
   trunk/gnue-samples/two-tier/schema/lk_address_type.gsd
   trunk/gnue-samples/two-tier/schema/zipcode.gsd
Modified:
   trunk/gnue-samples/two-tier/schema/invoice.gsd
   trunk/gnue-samples/two-tier/schema/invoice_item.gsd
   trunk/gnue-samples/two-tier/schema/items.gsd
   trunk/gnue-samples/two-tier/schema/state.gsd
Log:
Startet rework of simple sample invoice application


Added: trunk/gnue-samples/two-tier/bin/setup-db-svn.sh
===================================================================
--- trunk/gnue-samples/two-tier/bin/setup-db-svn.sh     2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/bin/setup-db-svn.sh     2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gsscvs --connections=etc/connections.conf --createdb --connection=sample 
schema/*.gsd


Property changes on: trunk/gnue-samples/two-tier/bin/setup-db-svn.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/gnue-samples/two-tier/etc/connections.conf
===================================================================
--- trunk/gnue-samples/two-tier/etc/connections.conf    2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/etc/connections.conf    2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -0,0 +1,3 @@
+[sample]
+provider = sqlite3
+dbname = ./sample.db

Added: trunk/gnue-samples/two-tier/forms/customer.gfd
===================================================================
--- trunk/gnue-samples/two-tier/forms/customer.gfd      2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/forms/customer.gfd      2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<form title="Customers">
+  <options>
+    <author>GNU Enterprise Samples</author>
+    <version>$Rev$</version>
+    <description>Our customers</description>
+  </options>
+
+  <datasource name="dts_customer" connection="sample" table="customer" >
+    <sortorder>
+      <sortfield name="name" descending="False" ignorecase="True" />
+      <sortfield name="city" descending="False" ignorecase="True" />
+    </sortorder>
+  </datasource>
+
+  <datasource name="dts_billing" connection="sample" table="customer"
+    prequery="Y">
+    <sortorder>
+      <sortfield name="name" descending="False" ignorecase="True" />
+      <sortfield name="city" descending="False" ignorecase="True" />
+    </sortorder>
+  </datasource>
+
+  <datasource name="dts_state" connection="sample" table="state" prequery="Y">
+    <sortorder>
+      <sortfield name="code" descending="False" />
+    </sortorder>
+  </datasource>
+
+  <logic>
+    <block name="blk_customer" datasource="dts_customer">
+      <field name="code" field="code" datatype="text" maxLength="16"
+        case="upper" />
+      <field name="name" field="name" datatype="text" maxLength="50" />
+      <field name="address1" field="address1" datatype="text" maxLength="50" />
+      <field name="address2" field="address2" datatype="text" maxLength="50" />
+      <field name="city" field="city" datatype="text" maxLength="30" />
+      <field name="zip" field="zip" datatype="text" maxLength="10" />
+      <field name="state_code" field="state" fk_key="id" fk_description="code"
+        fk_source="dts_state" case="upper"/>
+      <field name="state_name" field="state" fk_key="id" fk_description="name"
+        fk_source="dts_state" />
+      <field name="billing" field="billing_address" fk_key="id"
+        fk_description="name,city" fk_source="dts_billing" />
+      <field name="created" field="created" datatype="datetime" />
+      <field name="inactive" field="inactive" datatype="boolean" />
+      <field name="last_invoice" field="last_invoice" datatype="date" />
+
+      <trigger type="ON-NEWRECORD">
+        import datetime
+        blk_customer.created = datetime.datetime.today()
+      </trigger>
+
+    </block>
+  </logic>
+
+  <layout xmlns:s="GNUe:Layout:Sizer">
+    <page name="pg_customer" caption="Customer">
+      <vbox name="box" block="blk_customer">
+        <entry name="code" field="code" label="Customer code:"/>
+        <entry name="name" field="name" label="Name:"/>
+        <entry name="address1" field="address1" label="Address 1:"/>
+        <entry name="address2" field="address2" label="Address 2:"/>
+        <entry name="city" field="city" label="City:"/>
+        <entry name="zip" field="zip" label="Zip:"/>
+
+        <hbox name="country">
+          <entry name="state_code" field="state_code" label="State code:"
+            s:stretch="0" style="dropdown" />
+          <entry name="state_name" field="state_name" label="State name:"
+            style="dropdown" />
+        </hbox>
+
+        <entry name="inactive" field="inactive" label="Inactive" />
+        <entry name="billing" field="billing" label="Billing address:" />
+        <entry name="created" field="created" label="Created:" style="label"/>
+        <entry name="lastinv" field="last_invoice" label="Last invoice:"
+          style="label"/>
+      </vbox>
+    </page>
+  </layout>
+
+</form>


Property changes on: trunk/gnue-samples/two-tier/forms/customer.gfd
___________________________________________________________________
Name: svn:keywords
   + Rev

Added: trunk/gnue-samples/two-tier/forms/invoice.gfd
===================================================================
--- trunk/gnue-samples/two-tier/forms/invoice.gfd       2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/forms/invoice.gfd       2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<form title="Invoices">
+  <options>
+    <author>GNU Enterprise Samples</author>
+    <version>$Rev$</version>
+    <description>Invoices</description>
+  </options>
+
+  <datasource name="dts_customer" connection="sample" table="customer"
+    prequery="Y">
+    <sortorder>
+      <sortfield name="name" descending="False" ignorecase="True" />
+      <sortfield name="city" descending="False" ignorecase="True" />
+    </sortorder>
+  </datasource>
+
+  <datasource name="dts_items" connection="sample" table="items" prequery="Y">
+    <sortorder>
+      <sortfield name="sku" descending="False" ignorecase="True" />
+    </sortorder>
+  </datasource>
+
+  <datasource name="dts_item_lookup" connection="sample" table="items"
+    explicitfields="price" />
+
+  <datasource name="dts_invoice" connection="sample" table="invoice" >
+    <sortorder>
+      <sortfield name="date" descending="True" />
+    </sortorder>
+  </datasource>
+
+  <datasource name="dts_invoice_item" connection="sample" table="invoice_item"
+    master="dts_invoice" masterlink="id" detaillink="invoice" />
+
+  <logic>
+    <block name="blk_invoice" datasource="dts_invoice">
+      <field name="id" field="id" datatype="number" length="8" scale="0"/>
+
+      <field name="date" field="date" datatype="date" />
+      <field name="delivery" field="delivery" datatype="datetime" />
+      <field name="created" field="created" datatype="datetime" />
+
+      <field name="tax_rate" field="tax_rate" datatype="number" length="9"
+        scale="4">
+        <trigger type="POST-CHANGE">
+          activateTrigger('calculate_total')
+        </trigger>
+      </field>
+
+      <field name="tax_total" field="tax_total" datatype="number" length="9"
+        scale="2"/>
+      <field name="subtotal" field="subtotal" datatype="number" length="9"
+        scale="2"/>
+      <field name="grand_total" field="grand_total" datatype="number"
+        length="9" scale="2"/>
+
+      <field name="customer" field="customer" fk_key="id" fk_description="name"
+        fk_source="dts_customer" />
+
+      <trigger type="ON-NEWRECORD">
+        import datetime
+        today = datetime.datetime.today()
+
+        blk_invoice.created = today
+        blk_invoice.date = today.date()
+      </trigger>
+
+      <trigger type="PRE-COMMIT">
+        activateTrigger('calculate_total')
+      </trigger>
+
+      <trigger type="NAMED" name="calculate_total">
+        # First get the sub-total
+        subtotal = 0
+        taxrate = float(blk_invoice.tax_rate.get() or 0)
+        for item in blk_invoice_item.getResultSet():
+            subtotal += (item[u'quantity'] or 0) * (item[u'unit_price'] or 0)
+
+        tax_total = subtotal * taxrate / 100
+
+        blk_invoice.subtotal = subtotal
+        blk_invoice.tax_total = tax_total
+        blk_invoice.grand_total = subtotal + tax_total
+      </trigger>
+
+    </block>
+
+    <block name="blk_invoice_item" datasource="dts_invoice_item">
+      <field name="sku" field="sku" fk_source="dts_items" fk_key="id"
+        fk_description="sku" >
+        <trigger type="POST-CHANGE">
+          activateTrigger('item_changed')
+        </trigger>
+      </field>
+      <field name="sku_name" field="sku" fk_source="dts_items" fk_key="id"
+        fk_description="description" >
+        <trigger type="POST-CHANGE">
+          activateTrigger('item_changed')
+        </trigger>
+      </field>
+
+      <field name="quantity" field="quantity" datatype="number" length="6">
+        <trigger type="POST-CHANGE">
+          activateTrigger('calculate_total')
+        </trigger>
+      </field>
+
+      <field name="price" field="unit_price" datatype="number" length="9"
+        scale="2" >
+        <trigger type="POST-CHANGE">
+          activateTrigger('calculate_total')
+        </trigger>
+      </field>
+    </block>
+
+    <trigger type="NAMED" name="item_changed">
+      old_price = blk_invoice_item.price.get()
+      if not old_price:
+          res = dts_item_lookup.simpleQuery({'id': blk_invoice_item.sku.get()})
+          if res:
+              blk_invoice_item.price = res[0].get('price', 0)
+    </trigger>
+  </logic>
+
+  <layout xmlns:s="GNUe:Layout:Sizer">
+    <page name="pg_invoice" caption="Invoice">
+      <vbox name="box" block="blk_invoice">
+        <entry field="id" label="Invoice:" style="label" />
+        <entry field="customer" label="Customer:"/>
+
+        <entry field="date" label="Invoice date:"/>
+        <entry field="delivery" label="Delivery on:"/>
+
+        <entry field="tax_rate" label="Tax rate:"/>
+        <entry field="subtotal" label="Subtotal:" style="label" />
+        <entry field="tax_total" label="+Tax total:" style="label" />
+        <entry field="grand_total" label="Grand total:" style="label" />
+
+        <vbox name="items" label="Items" block="blk_invoice_item">
+          <grid name="detail_grid" rows="10">
+            <gridline>
+              <entry name="sku" field="sku" label="SKU" />
+              <entry name="sku_name" field="sku_name" label="SKU description" 
/>
+              <entry name="qty" field="quantity" label="Quantity" />
+              <entry name="price" field="price" label="Price" />
+            </gridline>
+          </grid>
+        </vbox>
+
+      </vbox>
+
+    </page>
+  </layout>
+
+</form>


Property changes on: trunk/gnue-samples/two-tier/forms/invoice.gfd
___________________________________________________________________
Name: svn:keywords
   + Rev

Added: trunk/gnue-samples/two-tier/forms/items.gfd
===================================================================
--- trunk/gnue-samples/two-tier/forms/items.gfd 2007-01-04 09:56:34 UTC (rev 
9200)
+++ trunk/gnue-samples/two-tier/forms/items.gfd 2007-01-04 15:56:26 UTC (rev 
9201)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<form title="Items">
+  <options>
+    <author>GNU Enterprise Samples</author>
+    <version>$Rev$</version>
+    <description>Our Goods</description>
+  </options>
+
+  <datasource name="dts_items" connection="sample" table="items" >
+    <sortorder>
+      <sortfield name="sku" descending="False" ignorecase="True" />
+    </sortorder>
+  </datasource>
+
+  <logic>
+    <block name="blk_items" datasource="dts_items">
+      <field name="sku" field="sku" datatype="text" maxLength="16"
+        case="upper"/>
+      <field name="description" field="description" datatype="text"
+        maxLength="50" />
+      <field name="price" field="price" datatype="number" length="11"
+        scale="2" />
+      <field name="text" field="text" datatype="text" maxLength="1000" />
+      <field name="prep" field="prep_time" datatype="time" />
+      <field name="picture" />
+
+      <trigger type="ON-RECORDLOADED">
+        url = "./images/%s.jpg" % blk_items.sku.get()
+        blk_items.picture = url
+      </trigger>
+    </block>
+  </logic>
+
+  <layout xmlns:s="GNUe:Layout:Sizer">
+    <page name="pg_items" caption="Items">
+      <vbox name="box" block="blk_items">
+        <entry name="sku" field="sku" label="SKU:"/>
+        <entry name="description" field="description" label="Description:"/>
+        <entry name="price" field="price" label="Unit Price:"/>
+        <entry name="prep" field="prep" label="Preparatory time:"/>
+        <entry name="text" field="text" label="Text:" style="multiline"/>
+        <image name="image" field="picture" label="Picutre" block="blk_items"
+          s:width="150" s:height="100" fit="auto"/>
+      </vbox>
+    </page>
+  </layout>
+
+</form>


Property changes on: trunk/gnue-samples/two-tier/forms/items.gfd
___________________________________________________________________
Name: svn:keywords
   + Rev

Added: trunk/gnue-samples/two-tier/forms/states.gfd
===================================================================
--- trunk/gnue-samples/two-tier/forms/states.gfd        2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/forms/states.gfd        2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<form title="Country names">
+  <options>
+    <author>GNU Enterprise Samples</author>
+    <version>$Rev$</version>
+    <description>
+      This lists the country names in alphabetical order
+    </description>
+  </options>
+
+  <datasource name="dts_state" connection="sample" table="state" prequery="Y">
+    <sortorder>
+      <sortfield name="code" descending="False" ignorecase="False" />
+    </sortorder>
+  </datasource>
+
+  <logic>
+    <block name="blk_state" datasource="dts_state">
+      <field name="code" field="code" datatype="text" maxLength="2" />
+      <field name="name" field="name" datatype="text" maxLength="50" />
+    </block>
+  </logic>
+
+  <layout>
+    <page name="States" caption="States">
+      <vbox name="box" block="blk_state">
+        <grid name="grid" rows="15">
+          <gridline>
+            <entry name="code" field="code" label="Code"/>
+            <entry name="name" field="name" label="Country name"/>
+          </gridline>
+        </grid>
+      </vbox>
+    </page>
+  </layout>
+
+</form>


Property changes on: trunk/gnue-samples/two-tier/forms/states.gfd
___________________________________________________________________
Name: svn:keywords
   + Rev

Added: trunk/gnue-samples/two-tier/images/LHARDY.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/gnue-samples/two-tier/images/LHARDY.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/gnue-samples/two-tier/images/MAC-G5.jpg
===================================================================
(Binary files differ)


Property changes on: trunk/gnue-samples/two-tier/images/MAC-G5.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/gnue-samples/two-tier/schema/address.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/address.gsd      2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/address.gsd      2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<schema>
-  <tables>
-    <table name="address">
-      <fields>
-        <field name="address_id"    type="number"   nullable="N" 
defaultwith="serial"/>
-        <field name="created"       type="datetime" nullable="N" 
defaultwith="timestamp"/>
-        <field name="address1"      type="string" length="50" nullable="N"/>
-        <field name="address2"      type="string" length="50"/>
-        <field name="city"          type="string" length="30" nullable="N"/>
-        <field name="state"         type="string" length="2"  nullable="N"/>
-        <field name="zip"           type="string" length="5"  nullable="N"/>
-      </fields>
-      
-      <primarykey name="pk_address_address_id">
-        <pkfield name="address_id"/>
-      </primarykey>
-      
-      <constraints>
-        <foreignkey name="fk_address_csz"  references="zipcode">
-          <fkfield name="city"  references="city"/>
-          <fkfield name="state" references="state"/>
-          <fkfield name="zip"   references="zip"/>
-        </foreignkey>
-      </constraints>
-    </table>
-  </tables>
-
-  <data>
-    <tabledata name="address_data" tablename="address">
-      <rows>
-        <row>
-          <value field="address_id">0</value>
-          <value field="address1">1234 1ST STREET</value>
-          <value field="address2">SUITE A</value>
-          <value field="city">MANHATTAN</value>
-          <value field="state">KS</value>
-          <value field="zip">66502</value>
-        </row>
-        
-        <row>
-          <value field="address_id">1</value>
-          <value field="address1">6789 N. MAIN</value>
-          <value field="city" >ELLSWORTH</value>
-          <value field="state">KS</value>
-          <value field="zip">67439</value>
-        </row>
-      </rows>
-    </tabledata>
-  </data>
-
-</schema>
\ No newline at end of file

Added: trunk/gnue-samples/two-tier/schema/customer.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/customer.gsd     2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/customer.gsd     2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<schema>
+
+  <tables>
+    <table name="customer">
+      <fields>
+        <field name="id" type="number" length="8" nullable="False"
+          defaultwith="serial"/>
+
+        <field name="code" type="string" length="8" nullable="False" />
+        <field name="name" type="string" length="50" nullable="False" />
+        <field name="address1" type="string" length="50" />
+        <field name="address2" type="string" length="50" />
+        <field name="city" type="string" length="30" />
+        <field name="zip" type="string" length="10" />
+        <field name="state" type="number" length="8" />
+        <field name="billing_address" type="number" length="8" />
+        <field name="created" type="datetime" nullable="N" />
+        <field name="last_invoice" type="date" />
+        <field name="inactive" type="boolean" />
+      </fields>
+
+      <primarykey name="pk_customer">
+        <pkfield name="id"/>
+      </primarykey>
+
+      <constraints>
+        <foreignkey name="fk_customer_state" references="state">
+          <fkfield name="state" references="id" />
+        </foreignkey>
+
+        <foreignkey name="fk_customer_billing" references="customer">
+          <fkfield name="billing_address" references="id" />
+        </foreignkey>
+      </constraints>
+    </table>
+  </tables>
+
+  <data>
+    <tabledata name="customers" tablename="customer">
+      <rows>
+        <row>
+          <value field="id">0</value>
+          <value field="code">A004711</value>
+          <value field="name">John Doe</value>
+          <value field="address1">1234 1st Street</value>
+          <value field="address2">Suite A</value>
+          <value field="city">Manhattan</value>
+          <value field="zip">66502</value>
+          <value field="state">229</value>
+          <value field="created">2004-07-21 14:21:59</value>
+        </row>
+        <row>
+          <value field="id">1</value>
+          <value field="code">Z000815</value>
+          <value field="name">Jane Smith</value>
+          <value field="address1">6789 N. Main</value>
+          <value field="city">Ellsworth</value>
+          <value field="zip">67439</value>
+          <value field="state">229</value>
+          <value field="billing_address">0</value>
+          <value field="created">2005-12-03 07:48:02</value>
+        </row>
+        <row>
+          <value field="id">2</value>
+          <value field="code">V002310</value>
+          <value field="name">Kaufmann Angelika</value>
+          <value field="address1">Kaiserstrasse 23</value>
+          <value field="city">Bregenz</value>
+          <value field="zip">6900</value>
+          <value field="state">15</value>
+          <value field="created">2006-06-20 17:05:17</value>
+        </row>
+        <row>
+          <value field="id">3</value>
+          <value field="code">Z00-BB 123</value>
+          <value field="name">Benjamin Blümchen</value>
+          <value field="address1">Im Städtschen Zoo 1</value>
+          <value field="city">Neustadt</value>
+          <value field="zip">4711</value>
+          <value field="state">2</value>
+          <value field="created">2001-01-20 15:01:41</value>
+        </row>
+      </rows>
+    </tabledata>
+  </data>
+
+</schema>

Modified: trunk/gnue-samples/two-tier/schema/invoice.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/invoice.gsd      2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/invoice.gsd      2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -1,25 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <schema>
   <tables>
     <table name="invoice">
       <fields>
-        <field name="invoice_id"    type="number"   nullable="N" 
defaultwith="serial"/>
-        <field name="created"       type="datetime" nullable="N" 
defaultwith="timestamp"/>
-        <field name="mdse_total"    type="number"   length="9" precision="2" 
nullable="N"/>
-        <field name="freight_total" type="number"   length="9" precision="2" 
nullable="N"/>
-        <field name="labor_total"   type="number"   length="9" precision="2" 
nullable="N"/>
-        <field name="subtotal"      type="number"   length="9" precision="2" 
nullable="N"/>
-        <field name="tax_total"     type="number"   length="9" precision="2" 
nullable="N"/>
-        <field name="tax_rate"      type="number"   length="9" precision="4" 
nullable="N"/>
-        <field name="grand_total"   type="number"   length="9" precision="2" 
nullable="N"/>
-        <field name="locked"        type="boolean"  length="9" precision="2" 
nullable="N" default="false"/>
+        <field name="id" type="number" length="8" nullable="N"
+          defaultwith="serial"/>
+
+        <field name="customer" type="number" length="8" nullable="N" />
+        <field name="date" type="date" nullable="N" />
+        <field name="delivery" type="datetime" />
+        <field name="created" type="datetime" nullable="N" />
+
+        <field name="tax_rate" type="number" length="9" precision="4"
+          nullable="N"/>
+        <field name="subtotal" type="number" length="9" precision="2"
+          nullable="N"/>
+        <field name="tax_total" type="number" length="9" precision="2"
+          nullable="N"/>
+        <field name="grand_total" type="number" length="9" precision="2"
+          nullable="N"/>
       </fields>
       
-      <primarykey name="pk_invoice_invoice_id">
-        <pkfield name="invoice_id"/>
+      <primarykey name="pk_invoice">
+        <pkfield name="id"/>
       </primarykey>
       
-      <constraints />
+      <constraints>
+        <foreignkey name="fk_invoice_customer" references="customer">
+          <fkfield name="customer" references="customer" />
+        </foreignkey>
+      </constraints>
     </table>
   </tables>
 
@@ -27,14 +37,15 @@
     <tabledata name="invoice_data" tablename="invoice">
       <rows>
         <row>
-        <value field="invoice_id">1</value>
-        <value field="mdse_total">130</value>
-        <value field="freight_total">10</value>
-        <value field="labor_total">0</value>
-        <value field="subtotal">140</value>
-        <value field="tax_total">14</value>
-        <value field="tax_rate">10</value>
-        <value field="grand_total">154</value>
+          <value field="id">1</value>
+          <value field="customer">1</value>
+          <value field="date">2007-01-31</value>
+          <value field="delivery">2007-01-15 13:30:00</value>
+          <value field="created">2006-12-30 14:21:03</value>
+          <value field="subtotal">100017</value>
+          <value field="tax_total">1001.7</value>
+          <value field="tax_rate">10</value>
+          <value field="grand_total">11018.7</value>
         </row>
       </rows>
     </tabledata>

Deleted: trunk/gnue-samples/two-tier/schema/invoice_address.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/invoice_address.gsd      2007-01-04 
09:56:34 UTC (rev 9200)
+++ trunk/gnue-samples/two-tier/schema/invoice_address.gsd      2007-01-04 
15:56:26 UTC (rev 9201)
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<schema>
-  <tables>
-    <table name="invoice_address">
-      <fields>
-        <field name="invoice_address_id" type="number"   nullable="N" 
defaultwith="serial"/>
-        <field name="created"            type="datetime" nullable="N" 
defaultwith="timestamp"/>
-        <field name="valid_from"         type="date"     nullable="N" 
defaultwith="timestamp"/>
-        <field name="invoice_id"         type="number"   nullable="N"/>
-        <field name="address_id"         type="number"   nullable="N"/>
-        <field name="attention1"         type="string"   length="50" 
nullable="N"/>
-        <field name="attention2"         type="string"   length="50"/>
-        <field name="type"               type="string"   length="5" 
nullable="N"/>
-      </fields>
-      
-      <primarykey name="pk_invoice_address_invoice_address_id">
-        <pkfield name="invoice_address_id"/>
-      </primarykey>
-      
-      <constraints>
-        <foreignkey name="fk_invoice_address_invoice_id"  references="invoice">
-          <fkfield  name="invoice_id"   references="invoice_id"/>
-        </foreignkey>
-        
-        <foreignkey name="fk_invoice_address_address_id"  references="address">
-          <fkfield  name="address_id"   references="address_id"/>
-        </foreignkey>
-        
-        <foreignkey name="fk_invoice_address_type"  
references="lk_address_type">
-          <fkfield  name="type"   references="type"/>
-        </foreignkey>
-      </constraints>
-    </table>
-  </tables>
-
-  <data>
-    <tabledata name="invoice_address_data" tablename="invoice_address">
-      <rows>
-        <row>
-          <value field="invoice_address_id">0</value>
-          <value field="invoice_id">1</value>
-          <value field="address_id">0</value>
-          <value field="attention1">JOHN DOE</value>
-          <value field="attention2">GNUECORP</value>
-          <value field="type">SHIP</value>
-        </row>
-        <row>
-          <value field="invoice_address_id">1</value>
-          <value field="invoice_id">1</value>
-          <value field="address_id">1</value>
-          <value field="attention1">JANE SMITH</value>
-          <value field="type">BILL</value>
-        </row>
-      </rows>
-    </tabledata>
-  </data>
-</schema>

Modified: trunk/gnue-samples/two-tier/schema/invoice_item.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/invoice_item.gsd 2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/invoice_item.gsd 2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -1,25 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <schema>
   <tables>
     <table name="invoice_item">
       <fields>
-        <field name="invoice_item_id" type="number" nullable="N"  
defaultwith="serial"/>
-        <field name="invoice_id"      type="number" nullable="N"/>
-        <field name="sku"             type="string" length="50" nullable="N"/>
-        <field name="description"     type="string" length="50" nullable="N"/>
-        <field name="quantity"        type="number" nullable="N"/>
-        <field name="unit_price"      type="number" length="9" precision="2" 
nullable="N"/>
+        <field name="id" type="number" length="8" nullable="N"
+          defaultwith="serial"/>
+
+        <field name="invoice" type="number" length="8" nullable="N"/>
+        <field name="sku" type="number" length="8" nullable="N"/>
+        <field name="quantity" type="number" length="6" nullable="N"/>
+        <field name="unit_price" type="number" length="9" precision="2"
+          nullable="N"/>
       </fields>
       
-      <primarykey name="pk_invoice_item_id">
-        <pkfield name="invoice_item_id"/>
+      <primarykey name="pk_invoice_item">
+        <pkfield name="id"/>
       </primarykey>
       
       <constraints>
         <foreignkey name="fk_invoice_item_sku"  references="items">
-          <fkfield name="sku"  references="sku"/>
+          <fkfield name="sku" references="id"/>
         </foreignkey>
+
+        <foreignkey name="fk_invoice_item_invoice" references="invoice">
+          <fkfield name="invoice" references="id" />
+        </foreignkey>
       </constraints>
+
     </table>
   </tables>
   
@@ -27,23 +34,21 @@
     <tabledata name="invoice_item_data" tablename="invoice_item">
       <rows>
         <row>
-          <value field="invoice_item_id">0</value>
-          <value field="invoice_id">0</value>
-          <value field="sku">GTS2000</value>
-          <value field="description">GOAT TRACKER 2000</value>
+          <value field="id">0</value>
+          <value field="invoice">1</value>
+          <value field="sku">1</value>
           <value field="quantity">1</value>
-          <value field="unit_price">125.00</value>
+          <value field="unit_price">17.50</value>
         </row>
         <row>
-          <value field="invoice_item_id">1</value>
-          <value field="invoice_id">0</value>
-          <value field="sku">GRPEL</value>
-          <value field="description">GOAT REPELLENT</value>
+          <value field="id">1</value>
+          <value field="invoice">1</value>
+          <value field="sku">0</value>
           <value field="quantity">5</value>
-          <value field="unit_price">5.00</value>
+          <value field="unit_price">1999.90</value>
         </row>
       </rows>
     </tabledata>
   </data>
 
-</schema>
\ No newline at end of file
+</schema>

Modified: trunk/gnue-samples/two-tier/schema/items.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/items.gsd        2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/items.gsd        2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -1,20 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <schema>
   <tables>
     <table name="items">
       <fields>
-        <field name="item_id"              type="number"   nullable="N"  
defaultwith="serial"/>
-        <field name="created"              type="datetime" nullable="N"  
defaultwith="timestamp"/>
-        <field name="replacement_item_id"  type="string"   length="50" />
-        <field name="sku"                  type="string"   length="50" 
nullable="N"/>
-        <field name="make"                 type="string"   length="50" 
nullable="N"/>
-        <field name="model"                type="string"   length="50" 
nullable="N"/>
-        <field name="description"          type="string"   length="50" 
nullable="N"/>
-        <field name="unit_price"           type="number"   length="9" 
precision="2" nullable="N"/>
+        <field name="id" type="number" length="8" nullable="N"
+          defaultwith="serial"/>
+
+        <field name="sku" type="string" length="16" nullable="N" />
+        <field name="description" type="string" length="50" />
+        <field name="price" type="number" length="9" precision="2" />
+        <field name="text" type="string" length="1000" />
+        <field name="prep_time" type="time" />
       </fields>
       
-      <primarykey name="pk_items_item_id">
-        <pkfield name="item_id"/>
+      <primarykey name="pk_item">
+        <pkfield name="id"/>
       </primarykey>
       
       <indexes>
@@ -23,11 +23,7 @@
         </index>
       </indexes>
 
-      <constraints>
-        <foreignkey name="fk_item_replace_item_id"  references="items">
-          <fkfield name="replacement_item_id"  references="item_id"/>
-        </foreignkey>
-      </constraints>
+      <constraints/>
     </table>
   </tables>
   
@@ -35,20 +31,20 @@
     <tabledata name="items" tablename="items">
       <rows>
         <row>
-          <value field="item_id">0</value>
-          <value field="sku">GTS2000</value>
-          <value field="make">GNUE</value>
-          <value field="model">TRK2000</value>
-          <value field="description">GOAT TRACKER 2000</value>
-          <value field="unit_price">125.00</value>
+          <value field="id">0</value>
+          <value field="sku">MAC-G5</value>
+          <value field="description">iMac G5 2GHZ</value>
+          <value field="price">2125.00</value>
+          <value field="text">Fine computer having lots of RAM and a very big 
hard disk drive</value>
+          <value field="prep_time">00:30:00</value>
         </row>
         <row>
-          <value field="item_id">1</value>
-          <value field="sku">GRPEL</value>
-          <value field="make">GNUE</value>
-          <value field="model">REPEL</value>
-          <value field="description">GOAT REPELLENT</value>
-          <value field="unit_price">5.00</value>
+          <value field="id">1</value>
+          <value field="sku">LHARDY</value>
+          <value field="description">Thumb on fire! 100 x 60 cm</value>
+          <value field="price">17.50</value>
+          <value field="text">Picture of Stan Laurel and Oliver Hardy</value>
+          <value field="prep_time">01:15:00</value>
         </row>
       </rows>
     </tabledata>

Deleted: trunk/gnue-samples/two-tier/schema/lk_address_type.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/lk_address_type.gsd      2007-01-04 
09:56:34 UTC (rev 9200)
+++ trunk/gnue-samples/two-tier/schema/lk_address_type.gsd      2007-01-04 
15:56:26 UTC (rev 9201)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<schema>
-  <tables>
-    <table name="lk_address_type">
-      <fields>
-        <field name="type"        type="string" length="5"  nullable="N"/>
-        <field name="description" type="string" length="50" nullable="N"/>
-      </fields>
-      
-      <primarykey name="pk_lk_address_type_type">
-        <pkfield name="type"/>
-      </primarykey>
-    </table>
-  </tables>
-
-  <data>
-    <tabledata name="lk_address_type_data" tablename="lk_address_type">
-      <rows>
-        <row>
-          <value field="type">SHIP</value>
-          <value field="description">A shipping address</value>
-        </row>
-        <row>
-          <value field="type">BILL</value>
-          <value field="description">A billing address</value>
-        </row>
-      </rows>
-    </tabledata>
-  </data>
-</schema>
\ No newline at end of file

Modified: trunk/gnue-samples/two-tier/schema/state.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/state.gsd        2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/state.gsd        2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -1,240 +1,1239 @@
-<?xml version="1.0"?>
-<schema>
-  <tables>
-    <table name="state">
-      <fields>
-        <field name="state"       type="string" length="2" nullable="False"/>
-        <field name="description" type="string" length="30" nullable="False"/>
-      </fields>
-      <primarykey name="pk_state">
-        <pkfield name="state"/>
-      </primarykey>
-      <constraints/>
-    </table>
-</tables>
-
-<data>
-  <tabledata name="states_data" tablename="state">
-    <rows>
-      <row>
-        <value field="state">AL</value>
-        <value field="description">Alabama</value>
-      </row>
-      <row>
-        <value field="state">AK</value>
-        <value field="description">Alaska</value>
-      </row>
-      <row>
-        <value field="state">AZ</value>
-        <value field="description">Arizona</value>
-      </row>
-      <row>
-        <value field="state">AR</value>
-        <value field="description">Arkansas</value>
-      </row>
-      <row>
-        <value field="state">CA</value>
-        <value field="description">California</value>
-      </row>
-      <row>
-        <value field="state">CO</value>
-        <value field="description">Colorado</value>
-      </row>
-      <row>
-        <value field="state">CT</value>
-        <value field="description">Connecticut</value>
-      </row>
-      <row>
-        <value field="state">DE</value>
-        <value field="description">Delaware</value>
-      </row>
-      <row>
-        <value field="state">DC</value>
-        <value field="description">District of Columbia</value>
-      </row>
-      <row>
-        <value field="state">FL</value>
-        <value field="description">Florida</value>
-      </row>
-      <row>
-        <value field="state">GA</value>
-        <value field="description">Georgia</value>
-      </row>
-      <row>
-        <value field="state">GU</value>
-        <value field="description">Guam</value>
-      </row>
-      <row>
-        <value field="state">HI</value>
-        <value field="description">Hawaii</value>
-      </row>
-      <row>
-        <value field="state">ID</value>
-        <value field="description">Idaho</value>
-      </row>
-      <row>
-        <value field="state">IL</value>
-        <value field="description">Illinois</value>
-      </row>
-      <row>
-        <value field="state">IN</value>
-        <value field="description">Indiana</value>
-      </row>
-      <row>
-        <value field="state">IA</value>
-        <value field="description">Iowa</value>
-      </row>
-      <row>
-        <value field="state">KS</value>
-        <value field="description">Kansas</value>
-      </row>
-      <row>
-        <value field="state">KY</value>
-        <value field="description">Kentucky</value>
-      </row>
-      <row>
-        <value field="state">LA</value>
-        <value field="description">Louisiana</value>
-      </row>
-      <row>
-        <value field="state">ME</value>
-        <value field="description">Maine</value>
-      </row>
-      <row>
-        <value field="state">MD</value>
-        <value field="description">Maryland</value>
-      </row>
-      <row>
-        <value field="state">MA</value>
-        <value field="description">Massachusetts</value>
-      </row>
-      <row>
-        <value field="state">MI</value>
-        <value field="description">Michigan</value>
-      </row>
-      <row>
-        <value field="state">MN</value>
-        <value field="description">Minnesota</value>
-      </row>
-      <row>
-        <value field="state">MS</value>
-        <value field="description">Mississippi</value>
-      </row>
-      <row>
-        <value field="state">MO</value>
-        <value field="description">Missouri</value>
-      </row>
-      <row>
-        <value field="state">MT</value>
-        <value field="description">Montana</value>
-      </row>
-      <row>
-        <value field="state">NE</value>
-        <value field="description">Nebraska</value>
-      </row>
-      <row>
-        <value field="state">NV</value>
-        <value field="description">Nevada</value>
-      </row>
-      <row>
-        <value field="state">NH</value>
-        <value field="description">New Hampshire</value>
-      </row>
-      <row>
-        <value field="state">NJ</value>
-        <value field="description">New Jersey</value>
-      </row>
-      <row>
-        <value field="state">NM</value>
-        <value field="description">New Mexico</value>
-      </row>
-      <row>
-        <value field="state">NY</value>
-        <value field="description">New York</value>
-      </row>
-      <row>
-        <value field="state">NC</value>
-        <value field="description">North Carolina</value>
-      </row>
-      <row>
-        <value field="state">ND</value>
-        <value field="description">North Dakota</value>
-      </row>
-      <row>
-        <value field="state">OH</value>
-        <value field="description">Ohio</value>
-      </row>
-      <row>
-        <value field="state">OK</value>
-        <value field="description">Oklahoma</value>
-      </row>
-      <row>
-        <value field="state">OR</value>
-        <value field="description">Oregon</value>
-      </row>
-      <row>
-        <value field="state">PA</value>
-        <value field="description">Pennsylvania</value>
-      </row>
-      <row>
-        <value field="state">PR</value>
-        <value field="description">Puerto Rico</value>
-      </row>
-      <row>
-        <value field="state">RI</value>
-        <value field="description">Rhode Island</value>
-      </row>
-      <row>
-        <value field="state">SC</value>
-        <value field="description">South Carolina</value>
-      </row>
-      <row>
-        <value field="state">SD</value>
-        <value field="description">South Dakota</value>
-      </row>
-      <row>
-        <value field="state">TN</value>
-        <value field="description">Tennessee</value>
-      </row>
-      <row>
-        <value field="state">TX</value>
-        <value field="description">Texas</value>
-      </row>
-      <row>
-        <value field="state">UT</value>
-        <value field="description">Utah</value>
-      </row>
-      <row>
-        <value field="state">VT</value>
-        <value field="description">Vermont</value>
-      </row>
-      <row>
-        <value field="state">VA</value>
-        <value field="description">Virginia</value>
-      </row>
-      <row>
-        <value field="state">VI</value>
-        <value field="description">Virgin Islands</value>
-      </row>
-      <row>
-        <value field="state">WA</value>
-        <value field="description">Washington</value>
-      </row>
-      <row>
-        <value field="state">WV</value>
-        <value field="description">West Virginia</value>
-      </row>
-      <row>
-        <value field="state">WI</value>
-        <value field="description">Wisconsin</value>
-      </row>
-      <row>
-        <value field="state">WY</value>
-        <value field="description">Wyoming</value>
-      </row>
-    </rows>
-  </tabledata>
-
-</data>
-
-</schema>
+<?xml version="1.0" encoding="utf-8"?>
+
+<schema>
+
+  <tables>
+    <table name="state">
+      <fields>
+        <field name="id" type="number" length="8" nullable="False"
+          defaultwith="serial"/>
+        <field name="code" type="string" length="2" nullable="False"/>
+        <field name="name" type="string" length="50" nullable="False"/>
+      </fields>
+
+      <primarykey name="pk_state">
+        <pkfield name="id"/>
+      </primarykey>
+
+      <constraints/>
+    </table>
+  </tables>
+
+  <data>
+    <tabledata name="iso_3166_states" tablename="state">
+      <rows>
+        <row>
+          <value field="id">1</value>
+          <value field="code">AF</value>
+          <value field="name">Afghanistan</value>
+        </row>
+        <row>
+          <value field="id">2</value>
+          <value field="code">AX</value>
+          <value field="name">Åland Islands</value>
+        </row>
+        <row>
+          <value field="id">3</value>
+          <value field="code">AL</value>
+          <value field="name">Albania</value>
+        </row>
+        <row>
+          <value field="id">4</value>
+          <value field="code">DZ</value>
+          <value field="name">Algeria</value>
+        </row>
+        <row>
+          <value field="id">5</value>
+          <value field="code">AS</value>
+          <value field="name">American Samoa</value>
+        </row>
+        <row>
+          <value field="id">6</value>
+          <value field="code">AD</value>
+          <value field="name">Andorra</value>
+        </row>
+        <row>
+          <value field="id">7</value>
+          <value field="code">AO</value>
+          <value field="name">Angola</value>
+        </row>
+        <row>
+          <value field="id">8</value>
+          <value field="code">AI</value>
+          <value field="name">Anguilla</value>
+        </row>
+        <row>
+          <value field="id">9</value>
+          <value field="code">AQ</value>
+          <value field="name">Antarctica</value>
+        </row>
+        <row>
+          <value field="id">10</value>
+          <value field="code">AG</value>
+          <value field="name">Antigua and Barbuda</value>
+        </row>
+        <row>
+          <value field="id">11</value>
+          <value field="code">AR</value>
+          <value field="name">Argentina</value>
+        </row>
+        <row>
+          <value field="id">12</value>
+          <value field="code">AM</value>
+          <value field="name">Armenia</value>
+        </row>
+        <row>
+          <value field="id">13</value>
+          <value field="code">AW</value>
+          <value field="name">Aruba</value>
+        </row>
+        <row>
+          <value field="id">14</value>
+          <value field="code">AU</value>
+          <value field="name">Australia</value>
+        </row>
+        <row>
+          <value field="id">15</value>
+          <value field="code">AT</value>
+          <value field="name">Austria</value>
+        </row>
+        <row>
+          <value field="id">16</value>
+          <value field="code">AZ</value>
+          <value field="name">Azerbaijan</value>
+        </row>
+        <row>
+          <value field="id">17</value>
+          <value field="code">BS</value>
+          <value field="name">Bahamas</value>
+        </row>
+        <row>
+          <value field="id">18</value>
+          <value field="code">BH</value>
+          <value field="name">Bahrain</value>
+        </row>
+        <row>
+          <value field="id">19</value>
+          <value field="code">BD</value>
+          <value field="name">Bangladesh</value>
+        </row>
+        <row>
+          <value field="id">20</value>
+          <value field="code">BB</value>
+          <value field="name">Barbados</value>
+        </row>
+        <row>
+          <value field="id">21</value>
+          <value field="code">BY</value>
+          <value field="name">Belarus</value>
+        </row>
+        <row>
+          <value field="id">22</value>
+          <value field="code">BE</value>
+          <value field="name">Belgium</value>
+        </row>
+        <row>
+          <value field="id">23</value>
+          <value field="code">BZ</value>
+          <value field="name">Belize</value>
+        </row>
+        <row>
+          <value field="id">24</value>
+          <value field="code">BJ</value>
+          <value field="name">Benin</value>
+        </row>
+        <row>
+          <value field="id">25</value>
+          <value field="code">BM</value>
+          <value field="name">Bermuda</value>
+        </row>
+        <row>
+          <value field="id">26</value>
+          <value field="code">BT</value>
+          <value field="name">Bhutan</value>
+        </row>
+        <row>
+          <value field="id">27</value>
+          <value field="code">BO</value>
+          <value field="name">Bolivia</value>
+        </row>
+        <row>
+          <value field="id">28</value>
+          <value field="code">BA</value>
+          <value field="name">Bosnia and Herzegovina</value>
+        </row>
+        <row>
+          <value field="id">29</value>
+          <value field="code">BW</value>
+          <value field="name">Botswana</value>
+        </row>
+        <row>
+          <value field="id">30</value>
+          <value field="code">BV</value>
+          <value field="name">Bouvet Island</value>
+        </row>
+        <row>
+          <value field="id">31</value>
+          <value field="code">BR</value>
+          <value field="name">Brazil</value>
+        </row>
+        <row>
+          <value field="id">32</value>
+          <value field="code">IO</value>
+          <value field="name">British Indian Ocean Territory</value>
+        </row>
+        <row>
+          <value field="id">33</value>
+          <value field="code">BN</value>
+          <value field="name">Brunei Darussalam</value>
+        </row>
+        <row>
+          <value field="id">34</value>
+          <value field="code">BG</value>
+          <value field="name">Bulgaria</value>
+        </row>
+        <row>
+          <value field="id">35</value>
+          <value field="code">BF</value>
+          <value field="name">Burkina Faso</value>
+        </row>
+        <row>
+          <value field="id">36</value>
+          <value field="code">BI</value>
+          <value field="name">Burundi</value>
+        </row>
+        <row>
+          <value field="id">37</value>
+          <value field="code">KH</value>
+          <value field="name">Cambodia</value>
+        </row>
+        <row>
+          <value field="id">38</value>
+          <value field="code">CM</value>
+          <value field="name">Cameroon</value>
+        </row>
+        <row>
+          <value field="id">39</value>
+          <value field="code">CA</value>
+          <value field="name">Canada</value>
+        </row>
+        <row>
+          <value field="id">40</value>
+          <value field="code">CV</value>
+          <value field="name">Cape Verde</value>
+        </row>
+        <row>
+          <value field="id">41</value>
+          <value field="code">KY</value>
+          <value field="name">Cayman Islands</value>
+        </row>
+        <row>
+          <value field="id">42</value>
+          <value field="code">CF</value>
+          <value field="name">Central African Republic</value>
+        </row>
+        <row>
+          <value field="id">43</value>
+          <value field="code">TD</value>
+          <value field="name">Chad</value>
+        </row>
+        <row>
+          <value field="id">44</value>
+          <value field="code">CL</value>
+          <value field="name">Chile</value>
+        </row>
+        <row>
+          <value field="id">45</value>
+          <value field="code">CN</value>
+          <value field="name">China</value>
+        </row>
+        <row>
+          <value field="id">46</value>
+          <value field="code">CX</value>
+          <value field="name">Christmas Island</value>
+        </row>
+        <row>
+          <value field="id">47</value>
+          <value field="code">CC</value>
+          <value field="name">Cocos (Keeling) Islands</value>
+        </row>
+        <row>
+          <value field="id">48</value>
+          <value field="code">CO</value>
+          <value field="name">Colombia</value>
+        </row>
+        <row>
+          <value field="id">49</value>
+          <value field="code">KM</value>
+          <value field="name">Comoros</value>
+        </row>
+        <row>
+          <value field="id">50</value>
+          <value field="code">CG</value>
+          <value field="name">Congo</value>
+        </row>
+        <row>
+          <value field="id">51</value>
+          <value field="code">CD</value>
+          <value field="name">Congo, The Democratic Republic of the</value>
+        </row>
+        <row>
+          <value field="id">52</value>
+          <value field="code">CK</value>
+          <value field="name">Cook Islands</value>
+        </row>
+        <row>
+          <value field="id">53</value>
+          <value field="code">CR</value>
+          <value field="name">Costa Rica</value>
+        </row>
+        <row>
+          <value field="id">54</value>
+          <value field="code">CI</value>
+          <value field="name">Côte D'Ivoire</value>
+        </row>
+        <row>
+          <value field="id">55</value>
+          <value field="code">HR</value>
+          <value field="name">Croatia</value>
+        </row>
+        <row>
+          <value field="id">56</value>
+          <value field="code">CU</value>
+          <value field="name">Cuba</value>
+        </row>
+        <row>
+          <value field="id">57</value>
+          <value field="code">CY</value>
+          <value field="name">Cyprus</value>
+        </row>
+        <row>
+          <value field="id">58</value>
+          <value field="code">CZ</value>
+          <value field="name">Czech Republic</value>
+        </row>
+        <row>
+          <value field="id">59</value>
+          <value field="code">DK</value>
+          <value field="name">Denmark</value>
+        </row>
+        <row>
+          <value field="id">60</value>
+          <value field="code">DJ</value>
+          <value field="name">Djibouti</value>
+        </row>
+        <row>
+          <value field="id">61</value>
+          <value field="code">DM</value>
+          <value field="name">Dominica</value>
+        </row>
+        <row>
+          <value field="id">62</value>
+          <value field="code">DO</value>
+          <value field="name">Dominican Republic</value>
+        </row>
+        <row>
+          <value field="id">63</value>
+          <value field="code">EC</value>
+          <value field="name">Ecuador</value>
+        </row>
+        <row>
+          <value field="id">64</value>
+          <value field="code">EG</value>
+          <value field="name">Egypt</value>
+        </row>
+        <row>
+          <value field="id">65</value>
+          <value field="code">SV</value>
+          <value field="name">El Salvador</value>
+        </row>
+        <row>
+          <value field="id">66</value>
+          <value field="code">GQ</value>
+          <value field="name">Equatorial Guinea</value>
+        </row>
+        <row>
+          <value field="id">67</value>
+          <value field="code">ER</value>
+          <value field="name">Eritrea</value>
+        </row>
+        <row>
+          <value field="id">68</value>
+          <value field="code">EE</value>
+          <value field="name">Estonia</value>
+        </row>
+        <row>
+          <value field="id">69</value>
+          <value field="code">ET</value>
+          <value field="name">Ethiopia</value>
+        </row>
+        <row>
+          <value field="id">70</value>
+          <value field="code">FK</value>
+          <value field="name">Falkland Islands (Malvinas)</value>
+        </row>
+        <row>
+          <value field="id">71</value>
+          <value field="code">FO</value>
+          <value field="name">Faroe Islands</value>
+        </row>
+        <row>
+          <value field="id">72</value>
+          <value field="code">FJ</value>
+          <value field="name">Fiji</value>
+        </row>
+        <row>
+          <value field="id">73</value>
+          <value field="code">FI</value>
+          <value field="name">Finland</value>
+        </row>
+        <row>
+          <value field="id">74</value>
+          <value field="code">FR</value>
+          <value field="name">France</value>
+        </row>
+        <row>
+          <value field="id">75</value>
+          <value field="code">GF</value>
+          <value field="name">French Guiana</value>
+        </row>
+        <row>
+          <value field="id">76</value>
+          <value field="code">PF</value>
+          <value field="name">French Polynesia</value>
+        </row>
+        <row>
+          <value field="id">77</value>
+          <value field="code">TF</value>
+          <value field="name">French Southern Territories</value>
+        </row>
+        <row>
+          <value field="id">78</value>
+          <value field="code">GA</value>
+          <value field="name">Gabon</value>
+        </row>
+        <row>
+          <value field="id">79</value>
+          <value field="code">GM</value>
+          <value field="name">Gambia</value>
+        </row>
+        <row>
+          <value field="id">80</value>
+          <value field="code">GE</value>
+          <value field="name">Georgia</value>
+        </row>
+        <row>
+          <value field="id">81</value>
+          <value field="code">DE</value>
+          <value field="name">Germany</value>
+        </row>
+        <row>
+          <value field="id">82</value>
+          <value field="code">GH</value>
+          <value field="name">Ghana</value>
+        </row>
+        <row>
+          <value field="id">83</value>
+          <value field="code">GI</value>
+          <value field="name">Gibraltar</value>
+        </row>
+        <row>
+          <value field="id">84</value>
+          <value field="code">GR</value>
+          <value field="name">Greece</value>
+        </row>
+        <row>
+          <value field="id">85</value>
+          <value field="code">GL</value>
+          <value field="name">Greenland</value>
+        </row>
+        <row>
+          <value field="id">86</value>
+          <value field="code">GD</value>
+          <value field="name">Grenada</value>
+        </row>
+        <row>
+          <value field="id">87</value>
+          <value field="code">GP</value>
+          <value field="name">Guadeloupe</value>
+        </row>
+        <row>
+          <value field="id">88</value>
+          <value field="code">GU</value>
+          <value field="name">Guam</value>
+        </row>
+        <row>
+          <value field="id">89</value>
+          <value field="code">GT</value>
+          <value field="name">Guatemala</value>
+        </row>
+        <row>
+          <value field="id">90</value>
+          <value field="code">GG</value>
+          <value field="name">Guernsey</value>
+        </row>
+        <row>
+          <value field="id">91</value>
+          <value field="code">GN</value>
+          <value field="name">Guinea</value>
+        </row>
+        <row>
+          <value field="id">92</value>
+          <value field="code">GW</value>
+          <value field="name">Guinea-Bissau</value>
+        </row>
+        <row>
+          <value field="id">93</value>
+          <value field="code">GY</value>
+          <value field="name">Guyana</value>
+        </row>
+        <row>
+          <value field="id">94</value>
+          <value field="code">HT</value>
+          <value field="name">Haiti</value>
+        </row>
+        <row>
+          <value field="id">95</value>
+          <value field="code">HM</value>
+          <value field="name">Heard Island and Mcdonald Islands</value>
+        </row>
+        <row>
+          <value field="id">96</value>
+          <value field="code">VA</value>
+          <value field="name">Holy See (Vatican City State)</value>
+        </row>
+        <row>
+          <value field="id">97</value>
+          <value field="code">HN</value>
+          <value field="name">Honduras</value>
+        </row>
+        <row>
+          <value field="id">98</value>
+          <value field="code">HK</value>
+          <value field="name">Hong Kong</value>
+        </row>
+        <row>
+          <value field="id">99</value>
+          <value field="code">HU</value>
+          <value field="name">Hungary</value>
+        </row>
+        <row>
+          <value field="id">100</value>
+          <value field="code">IS</value>
+          <value field="name">Iceland</value>
+        </row>
+        <row>
+          <value field="id">101</value>
+          <value field="code">IN</value>
+          <value field="name">India</value>
+        </row>
+        <row>
+          <value field="id">102</value>
+          <value field="code">ID</value>
+          <value field="name">Indonesia</value>
+        </row>
+        <row>
+          <value field="id">103</value>
+          <value field="code">IR</value>
+          <value field="name">Iran, Islamic Republic of</value>
+        </row>
+        <row>
+          <value field="id">104</value>
+          <value field="code">IQ</value>
+          <value field="name">Iraq</value>
+        </row>
+        <row>
+          <value field="id">105</value>
+          <value field="code">IE</value>
+          <value field="name">Ireland</value>
+        </row>
+        <row>
+          <value field="id">106</value>
+          <value field="code">IL</value>
+          <value field="name">Israel</value>
+        </row>
+        <row>
+          <value field="id">107</value>
+          <value field="code">IT</value>
+          <value field="name">Italy</value>
+        </row>
+        <row>
+          <value field="id">108</value>
+          <value field="code">JM</value>
+          <value field="name">Jamaica</value>
+        </row>
+        <row>
+          <value field="id">109</value>
+          <value field="code">JP</value>
+          <value field="name">Japan</value>
+        </row>
+        <row>
+          <value field="id">110</value>
+          <value field="code">JO</value>
+          <value field="name">Jordan</value>
+        </row>
+        <row>
+          <value field="id">111</value>
+          <value field="code">KZ</value>
+          <value field="name">Kazakhstan</value>
+        </row>
+        <row>
+          <value field="id">112</value>
+          <value field="code">KE</value>
+          <value field="name">Kenya</value>
+        </row>
+        <row>
+          <value field="id">113</value>
+          <value field="code">KI</value>
+          <value field="name">Kiribati</value>
+        </row>
+        <row>
+          <value field="id">114</value>
+          <value field="code">KP</value>
+          <value field="name">Korea, Democratic People's Republic of</value>
+        </row>
+        <row>
+          <value field="id">115</value>
+          <value field="code">KR</value>
+          <value field="name">Korea, Republic of</value>
+        </row>
+        <row>
+          <value field="id">116</value>
+          <value field="code">KW</value>
+          <value field="name">Kuwait</value>
+        </row>
+        <row>
+          <value field="id">117</value>
+          <value field="code">KG</value>
+          <value field="name">Kyrgyzstan</value>
+        </row>
+        <row>
+          <value field="id">118</value>
+          <value field="code">LA</value>
+          <value field="name">Lao People's Democratic Republic</value>
+        </row>
+        <row>
+          <value field="id">119</value>
+          <value field="code">LV</value>
+          <value field="name">Latvia</value>
+        </row>
+        <row>
+          <value field="id">120</value>
+          <value field="code">LB</value>
+          <value field="name">Lebanon</value>
+        </row>
+        <row>
+          <value field="id">121</value>
+          <value field="code">LS</value>
+          <value field="name">Lesotho</value>
+        </row>
+        <row>
+          <value field="id">122</value>
+          <value field="code">LR</value>
+          <value field="name">Liberia</value>
+        </row>
+        <row>
+          <value field="id">123</value>
+          <value field="code">LY</value>
+          <value field="name">Libyan Arab Jamahiriya</value>
+        </row>
+        <row>
+          <value field="id">124</value>
+          <value field="code">LI</value>
+          <value field="name">Liechtenstein</value>
+        </row>
+        <row>
+          <value field="id">125</value>
+          <value field="code">LT</value>
+          <value field="name">Lithuania</value>
+        </row>
+        <row>
+          <value field="id">126</value>
+          <value field="code">LU</value>
+          <value field="name">Luxembourg</value>
+        </row>
+        <row>
+          <value field="id">127</value>
+          <value field="code">MO</value>
+          <value field="name">Macao</value>
+        </row>
+        <row>
+          <value field="id">128</value>
+          <value field="code">MK</value>
+          <value field="name">Macedonia, The Former Yugoslav Republic 
of</value>
+        </row>
+        <row>
+          <value field="id">129</value>
+          <value field="code">MG</value>
+          <value field="name">Madagascar</value>
+        </row>
+        <row>
+          <value field="id">130</value>
+          <value field="code">MW</value>
+          <value field="name">Malawi</value>
+        </row>
+        <row>
+          <value field="id">131</value>
+          <value field="code">MY</value>
+          <value field="name">Malaysia</value>
+        </row>
+        <row>
+          <value field="id">132</value>
+          <value field="code">MV</value>
+          <value field="name">Maldives</value>
+        </row>
+        <row>
+          <value field="id">133</value>
+          <value field="code">ML</value>
+          <value field="name">Mali</value>
+        </row>
+        <row>
+          <value field="id">134</value>
+          <value field="code">MT</value>
+          <value field="name">Malta</value>
+        </row>
+        <row>
+          <value field="id">135</value>
+          <value field="code">MH</value>
+          <value field="name">Marshall Islands</value>
+        </row>
+        <row>
+          <value field="id">136</value>
+          <value field="code">MQ</value>
+          <value field="name">Martinique</value>
+        </row>
+        <row>
+          <value field="id">137</value>
+          <value field="code">MR</value>
+          <value field="name">Mauritania</value>
+        </row>
+        <row>
+          <value field="id">138</value>
+          <value field="code">MU</value>
+          <value field="name">Mauritius</value>
+        </row>
+        <row>
+          <value field="id">139</value>
+          <value field="code">YT</value>
+          <value field="name">Mayotte</value>
+        </row>
+        <row>
+          <value field="id">140</value>
+          <value field="code">MX</value>
+          <value field="name">Mexico</value>
+        </row>
+        <row>
+          <value field="id">141</value>
+          <value field="code">FM</value>
+          <value field="name">Micronesia, Federated States of</value>
+        </row>
+        <row>
+          <value field="id">142</value>
+          <value field="code">MD</value>
+          <value field="name">Moldova, Republic of</value>
+        </row>
+        <row>
+          <value field="id">143</value>
+          <value field="code">MC</value>
+          <value field="name">Monaco</value>
+        </row>
+        <row>
+          <value field="id">144</value>
+          <value field="code">MN</value>
+          <value field="name">Mongolia</value>
+        </row>
+        <row>
+          <value field="id">145</value>
+          <value field="code">ME</value>
+          <value field="name">Montenegro</value>
+        </row>
+        <row>
+          <value field="id">146</value>
+          <value field="code">MS</value>
+          <value field="name">Montserrat</value>
+        </row>
+        <row>
+          <value field="id">147</value>
+          <value field="code">MA</value>
+          <value field="name">Morocco</value>
+        </row>
+        <row>
+          <value field="id">148</value>
+          <value field="code">MZ</value>
+          <value field="name">Mozambique</value>
+        </row>
+        <row>
+          <value field="id">149</value>
+          <value field="code">MM</value>
+          <value field="name">Myanmar</value>
+        </row>
+        <row>
+          <value field="id">150</value>
+          <value field="code">NA</value>
+          <value field="name">Namibia</value>
+        </row>
+        <row>
+          <value field="id">151</value>
+          <value field="code">NR</value>
+          <value field="name">Nauru</value>
+        </row>
+        <row>
+          <value field="id">152</value>
+          <value field="code">NP</value>
+          <value field="name">Nepal</value>
+        </row>
+        <row>
+          <value field="id">153</value>
+          <value field="code">NL</value>
+          <value field="name">Netherlands</value>
+        </row>
+        <row>
+          <value field="id">154</value>
+          <value field="code">AN</value>
+          <value field="name">Netherlands Antilles</value>
+        </row>
+        <row>
+          <value field="id">155</value>
+          <value field="code">NC</value>
+          <value field="name">New Caledonia</value>
+        </row>
+        <row>
+          <value field="id">156</value>
+          <value field="code">NZ</value>
+          <value field="name">New Zealand</value>
+        </row>
+        <row>
+          <value field="id">157</value>
+          <value field="code">NI</value>
+          <value field="name">Nicaragua</value>
+        </row>
+        <row>
+          <value field="id">158</value>
+          <value field="code">NE</value>
+          <value field="name">Niger</value>
+        </row>
+        <row>
+          <value field="id">159</value>
+          <value field="code">NG</value>
+          <value field="name">Nigeria</value>
+        </row>
+        <row>
+          <value field="id">160</value>
+          <value field="code">NU</value>
+          <value field="name">Niue</value>
+        </row>
+        <row>
+          <value field="id">161</value>
+          <value field="code">NF</value>
+          <value field="name">Norfolk Island</value>
+        </row>
+        <row>
+          <value field="id">162</value>
+          <value field="code">MP</value>
+          <value field="name">Northern Mariana Islands</value>
+        </row>
+        <row>
+          <value field="id">163</value>
+          <value field="code">NO</value>
+          <value field="name">Norway</value>
+        </row>
+        <row>
+          <value field="id">164</value>
+          <value field="code">OM</value>
+          <value field="name">Oman</value>
+        </row>
+        <row>
+          <value field="id">165</value>
+          <value field="code">PK</value>
+          <value field="name">Pakistan</value>
+        </row>
+        <row>
+          <value field="id">166</value>
+          <value field="code">PW</value>
+          <value field="name">Palau</value>
+        </row>
+        <row>
+          <value field="id">167</value>
+          <value field="code">PS</value>
+          <value field="name">Palestinian Territory, Occupied</value>
+        </row>
+        <row>
+          <value field="id">168</value>
+          <value field="code">PA</value>
+          <value field="name">Panama</value>
+        </row>
+        <row>
+          <value field="id">169</value>
+          <value field="code">PG</value>
+          <value field="name">Papua New Guinea</value>
+        </row>
+        <row>
+          <value field="id">170</value>
+          <value field="code">PY</value>
+          <value field="name">Paraguay</value>
+        </row>
+        <row>
+          <value field="id">171</value>
+          <value field="code">PE</value>
+          <value field="name">Peru</value>
+        </row>
+        <row>
+          <value field="id">172</value>
+          <value field="code">PH</value>
+          <value field="name">Philippines</value>
+        </row>
+        <row>
+          <value field="id">173</value>
+          <value field="code">PN</value>
+          <value field="name">Pitcairn</value>
+        </row>
+        <row>
+          <value field="id">174</value>
+          <value field="code">PL</value>
+          <value field="name">Poland</value>
+        </row>
+        <row>
+          <value field="id">175</value>
+          <value field="code">PT</value>
+          <value field="name">Portugal</value>
+        </row>
+        <row>
+          <value field="id">176</value>
+          <value field="code">PR</value>
+          <value field="name">Puerto Rico</value>
+        </row>
+        <row>
+          <value field="id">177</value>
+          <value field="code">QA</value>
+          <value field="name">Qatar</value>
+        </row>
+        <row>
+          <value field="id">178</value>
+          <value field="code">RE</value>
+          <value field="name">Réunion</value>
+        </row>
+        <row>
+          <value field="id">179</value>
+          <value field="code">RO</value>
+          <value field="name">Romania</value>
+        </row>
+        <row>
+          <value field="id">180</value>
+          <value field="code">RU</value>
+          <value field="name">Russian Federation</value>
+        </row>
+        <row>
+          <value field="id">181</value>
+          <value field="code">RW</value>
+          <value field="name">Rwanda</value>
+        </row>
+        <row>
+          <value field="id">182</value>
+          <value field="code">SH</value>
+          <value field="name">Saint Helena</value>
+        </row>
+        <row>
+          <value field="id">183</value>
+          <value field="code">KN</value>
+          <value field="name">Saint Kitts and Nevis</value>
+        </row>
+        <row>
+          <value field="id">184</value>
+          <value field="code">LC</value>
+          <value field="name">Saint Lucia</value>
+        </row>
+        <row>
+          <value field="id">185</value>
+          <value field="code">PM</value>
+          <value field="name">Saint Pierre and Miquelon</value>
+        </row>
+        <row>
+          <value field="id">186</value>
+          <value field="code">VC</value>
+          <value field="name">Saint Vincent and The Grenadines</value>
+        </row>
+        <row>
+          <value field="id">187</value>
+          <value field="code">WS</value>
+          <value field="name">Samoa</value>
+        </row>
+        <row>
+          <value field="id">188</value>
+          <value field="code">SM</value>
+          <value field="name">San Marino</value>
+        </row>
+        <row>
+          <value field="id">189</value>
+          <value field="code">ST</value>
+          <value field="name">Sao Tome and Principe</value>
+        </row>
+        <row>
+          <value field="id">190</value>
+          <value field="code">SA</value>
+          <value field="name">Saudi Arabia</value>
+        </row>
+        <row>
+          <value field="id">191</value>
+          <value field="code">SN</value>
+          <value field="name">Senegal</value>
+        </row>
+        <row>
+          <value field="id">192</value>
+          <value field="code">RS</value>
+          <value field="name">Serbia</value>
+        </row>
+        <row>
+          <value field="id">193</value>
+          <value field="code">SC</value>
+          <value field="name">Seychelles</value>
+        </row>
+        <row>
+          <value field="id">194</value>
+          <value field="code">SL</value>
+          <value field="name">Sierra Leone</value>
+        </row>
+        <row>
+          <value field="id">195</value>
+          <value field="code">SG</value>
+          <value field="name">Singapore</value>
+        </row>
+        <row>
+          <value field="id">196</value>
+          <value field="code">SK</value>
+          <value field="name">Slovakia</value>
+        </row>
+        <row>
+          <value field="id">197</value>
+          <value field="code">SI</value>
+          <value field="name">Slovenia</value>
+        </row>
+        <row>
+          <value field="id">198</value>
+          <value field="code">SB</value>
+          <value field="name">Solomon Islands</value>
+        </row>
+        <row>
+          <value field="id">199</value>
+          <value field="code">SO</value>
+          <value field="name">Somalia</value>
+        </row>
+        <row>
+          <value field="id">200</value>
+          <value field="code">ZA</value>
+          <value field="name">South Africa</value>
+        </row>
+        <row>
+          <value field="id">201</value>
+          <value field="code">GS</value>
+          <value field="name">South Georgia and The South Sandwich 
Islands</value>
+        </row>
+        <row>
+          <value field="id">202</value>
+          <value field="code">ES</value>
+          <value field="name">Spain</value>
+        </row>
+        <row>
+          <value field="id">203</value>
+          <value field="code">LK</value>
+          <value field="name">Sri Lanka</value>
+        </row>
+        <row>
+          <value field="id">204</value>
+          <value field="code">SD</value>
+          <value field="name">Sudan</value>
+        </row>
+        <row>
+          <value field="id">205</value>
+          <value field="code">SR</value>
+          <value field="name">Suriname</value>
+        </row>
+        <row>
+          <value field="id">206</value>
+          <value field="code">SJ</value>
+          <value field="name">Svalbard and Jan Mayen</value>
+        </row>
+        <row>
+          <value field="id">207</value>
+          <value field="code">SZ</value>
+          <value field="name">Swaziland</value>
+        </row>
+        <row>
+          <value field="id">208</value>
+          <value field="code">SE</value>
+          <value field="name">Sweden</value>
+        </row>
+        <row>
+          <value field="id">209</value>
+          <value field="code">CH</value>
+          <value field="name">Switzerland</value>
+        </row>
+        <row>
+          <value field="id">210</value>
+          <value field="code">SY</value>
+          <value field="name">Syrian Arab Republic</value>
+        </row>
+        <row>
+          <value field="id">211</value>
+          <value field="code">TW</value>
+          <value field="name">Taiwan, Province of China</value>
+        </row>
+        <row>
+          <value field="id">212</value>
+          <value field="code">TJ</value>
+          <value field="name">Tajikistan</value>
+        </row>
+        <row>
+          <value field="id">213</value>
+          <value field="code">TZ</value>
+          <value field="name">Tanzania, United Republic of</value>
+        </row>
+        <row>
+          <value field="id">214</value>
+          <value field="code">TH</value>
+          <value field="name">Thailand</value>
+        </row>
+        <row>
+          <value field="id">215</value>
+          <value field="code">TL</value>
+          <value field="name">Timor-Leste</value>
+        </row>
+        <row>
+          <value field="id">216</value>
+          <value field="code">TG</value>
+          <value field="name">Togo</value>
+        </row>
+        <row>
+          <value field="id">217</value>
+          <value field="code">TK</value>
+          <value field="name">Tokelau</value>
+        </row>
+        <row>
+          <value field="id">218</value>
+          <value field="code">TO</value>
+          <value field="name">Tonga</value>
+        </row>
+        <row>
+          <value field="id">219</value>
+          <value field="code">TT</value>
+          <value field="name">Trinidad and Tobago</value>
+        </row>
+        <row>
+          <value field="id">220</value>
+          <value field="code">TN</value>
+          <value field="name">Tunisia</value>
+        </row>
+        <row>
+          <value field="id">221</value>
+          <value field="code">TR</value>
+          <value field="name">Turkey</value>
+        </row>
+        <row>
+          <value field="id">222</value>
+          <value field="code">TM</value>
+          <value field="name">Turkmenistan</value>
+        </row>
+        <row>
+          <value field="id">223</value>
+          <value field="code">TC</value>
+          <value field="name">Turks and Caicos Islands</value>
+        </row>
+        <row>
+          <value field="id">224</value>
+          <value field="code">TV</value>
+          <value field="name">Tuvalu</value>
+        </row>
+        <row>
+          <value field="id">225</value>
+          <value field="code">UG</value>
+          <value field="name">Uganda</value>
+        </row>
+        <row>
+          <value field="id">226</value>
+          <value field="code">UA</value>
+          <value field="name">Ukraine</value>
+        </row>
+        <row>
+          <value field="id">227</value>
+          <value field="code">AE</value>
+          <value field="name">United Arab Emirates</value>
+        </row>
+        <row>
+          <value field="id">228</value>
+          <value field="code">GB</value>
+          <value field="name">United Kingdom</value>
+        </row>
+        <row>
+          <value field="id">229</value>
+          <value field="code">US</value>
+          <value field="name">United States</value>
+        </row>
+        <row>
+          <value field="id">230</value>
+          <value field="code">UM</value>
+          <value field="name">United States Minor Outlying Islands</value>
+        </row>
+        <row>
+          <value field="id">231</value>
+          <value field="code">UY</value>
+          <value field="name">Uruguay</value>
+        </row>
+        <row>
+          <value field="id">232</value>
+          <value field="code">UZ</value>
+          <value field="name">Uzbekistan</value>
+        </row>
+        <row>
+          <value field="id">233</value>
+          <value field="code">VU</value>
+          <value field="name">Vanuatu</value>
+        </row>
+        <row>
+          <value field="id">234</value>
+          <value field="code">VE</value>
+          <value field="name">Venezuela</value>
+        </row>
+        <row>
+          <value field="id">235</value>
+          <value field="code">VN</value>
+          <value field="name">Viet Nam</value>
+        </row>
+        <row>
+          <value field="id">236</value>
+          <value field="code">VG</value>
+          <value field="name">Virgin Islands, British</value>
+        </row>
+        <row>
+          <value field="id">237</value>
+          <value field="code">VI</value>
+          <value field="name">Virgin Islands, U.S.</value>
+        </row>
+        <row>
+          <value field="id">238</value>
+          <value field="code">WF</value>
+          <value field="name">Wallis and Futuna</value>
+        </row>
+        <row>
+          <value field="id">239</value>
+          <value field="code">EH</value>
+          <value field="name">Western Sahara</value>
+        </row>
+        <row>
+          <value field="id">240</value>
+          <value field="code">YE</value>
+          <value field="name">Yemen</value>
+        </row>
+        <row>
+          <value field="id">241</value>
+          <value field="code">ZM</value>
+          <value field="name">Zambia</value>
+        </row>
+        <row>
+          <value field="id">242</value>
+          <value field="code">ZW</value>
+          <value field="name">Zimbabwe</value>
+        </row>
+      </rows>
+    </tabledata>
+  </data>
+
+</schema>

Deleted: trunk/gnue-samples/two-tier/schema/zipcode.gsd
===================================================================
--- trunk/gnue-samples/two-tier/schema/zipcode.gsd      2007-01-04 09:56:34 UTC 
(rev 9200)
+++ trunk/gnue-samples/two-tier/schema/zipcode.gsd      2007-01-04 15:56:26 UTC 
(rev 9201)
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<schema>
-  <tables>
-    <table name="zipcode">
-      <fields>
-        <field name="zip"       type="string" length="5"  nullable="False"/>
-        <field name="city"      type="string" length="30" nullable="False"/>
-        <field name="state"     type="string" length="2"  nullable="False"/>
-      </fields>
-      <primarykey name="pk_zipcode">
-        <pkfield name="zip"/>
-        <pkfield name="city"/>
-        <pkfield name="state"/>
-      </primarykey>
-      <constraints>  
-        <foreignkey name="fk_zipcode_state"  references="state">
-          <fkfield name="state" references="state"/>
-        </foreignkey>
-      </constraints>
-    </table>
-  </tables>
-
-  <data>
-    <tabledata name="zipcode_data" tablename="zipcode">
-      <rows>
-        <row>
-          <value field="zip">66502</value>
-          <value field="city">MANHATTAN</value>
-          <value field="state">KS</value>
-        </row>
-        <row>
-          <value field="zip">67439</value>
-          <value field="city">ELLSWORTH</value>
-          <value field="state">KS</value>
-        </row>
-      </rows>
-    </tabledata>
-  </data>
-</schema>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]