r5105 - in trunk: gnue-appserver/samples gnue-common/src/schema gnue-common/src/schema/scripter

[johannes]

Author: johannes
Date: 2004-02-12 10:06:03 -0600 (Thu, 12 Feb 2004)
New Revision: 5105

Modified:
   trunk/gnue-appserver/samples/sample.gsd
   trunk/gnue-appserver/samples/setup-pgsql.sh
   trunk/gnue-common/src/schema/GSParser.py
   trunk/gnue-common/src/schema/scripter/Scripter.py
Log:
Added 'KeepWhitespace' to the GSParser, so the GContent does not use
normalization on it's values. Changed setup-pgsql.sh to reflect recent changes.


Modified: trunk/gnue-appserver/samples/sample.gsd
===================================================================
--- trunk/gnue-appserver/samples/sample.gsd     2004-02-12 15:42:20 UTC (rev 
5104)
+++ trunk/gnue-appserver/samples/sample.gsd     2004-02-12 16:06:03 UTC (rev 
5105)
@@ -240,8 +240,7 @@
 'if self.address_name [0] == "(":
   self.address_name = self.address_name [1:len(self.address_name)-1]
 else:
-  self.address_name = "(" + self.address_name + ")"
-'
+  self.address_name = "(" + self.address_name + ")"'
           </value>
           <value>''</value>
           <value>'Simple procedure to test Appserver'</value>

Modified: trunk/gnue-appserver/samples/setup-pgsql.sh
===================================================================
--- trunk/gnue-appserver/samples/setup-pgsql.sh 2004-02-12 15:42:20 UTC (rev 
5104)
+++ trunk/gnue-appserver/samples/setup-pgsql.sh 2004-02-12 16:06:03 UTC (rev 
5105)
@@ -2,10 +2,10 @@
 # Set up sample database for PostgreSQL
 # The current user must have permission to create databases
 
-if [ ! -f pgsql.sql ]; then
-  make pgsql.sql
+if [ ! -f postgresql.sql ]; then
+  make postgresql
 fi
 
 createuser --createdb --adduser gnue
 createdb gnue
-psql gnue < pgsql.sql
+psql gnue < postgresql.sql

Modified: trunk/gnue-common/src/schema/GSParser.py
===================================================================
--- trunk/gnue-common/src/schema/GSParser.py    2004-02-12 15:42:20 UTC (rev 
5104)
+++ trunk/gnue-common/src/schema/GSParser.py    2004-02-12 16:06:03 UTC (rev 
5105)
@@ -26,6 +26,7 @@
 #
 # NOTES:
 #
+# $Id$
 
 import Objects
 from gnue.common.formatting import GTypecast
@@ -255,7 +256,8 @@
                'Typecast': GTypecast.name,
                'Default':  'text' } },
          'ParentTags':  ('row',),
-         'MixedContent': 1, },
+         'MixedContent': 1, 
+         'KeepWhitespace': 1},
 
       'description':   {
          'BaseClass': Objects.GSDescription,


Property changes on: trunk/gnue-common/src/schema/GSParser.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-common/src/schema/scripter/Scripter.py
===================================================================
--- trunk/gnue-common/src/schema/scripter/Scripter.py   2004-02-12 15:42:20 UTC 
(rev 5104)
+++ trunk/gnue-common/src/schema/scripter/Scripter.py   2004-02-12 16:06:03 UTC 
(rev 5105)
@@ -309,13 +309,9 @@
       if hasattr (sObject, "field"):
         dataDef.columns.append (sObject.field)
 
-      if len (sObject._children) > 1:
-        # FIXME: indentation ???
-        value = ""
-        for line in sObject._children:
-          value += "%s\n" % line.getContent ()
-      else:
-        value = sObject._children [0].getContent ()
+      value = ""
+      for line in sObject._children:
+        value += line.getContent ()
 
       dataDef.values.append (value)