commit-gnue
[Top][All Lists]
Advanced

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

gnue-appserver ./ROADMAP samples/auth.gsd sampl...


From: Reinhard Mueller
Subject: gnue-appserver ./ROADMAP samples/auth.gsd sampl...
Date: Thu, 16 Oct 2003 18:54:26 -0400

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/10/16 18:54:25

Modified files:
        .              : ROADMAP 
        samples        : auth.gsd sample.gsd 
        src            : geasInstance.py 

Log message:
        Implemented boolean type.
        Some small fixes in the sample .gsd files.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/ROADMAP.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/samples/auth.gsd.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/samples/sample.gsd.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasInstance.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: gnue-appserver/ROADMAP
diff -c gnue-appserver/ROADMAP:1.8 gnue-appserver/ROADMAP:1.9
*** gnue-appserver/ROADMAP:1.8  Tue Sep 16 15:27:20 2003
--- gnue-appserver/ROADMAP      Thu Oct 16 18:54:25 2003
***************
*** 3,9 ****
  Version       Features
  
  0.0.5   creates db schema from class repository
!         boolean and datetime support
  
  0.0.6         has procedures
          several improvements to language interface, can be found by searching
--- 3,9 ----
  Version       Features
  
  0.0.5   creates db schema from class repository
!         datetime support
  
  0.0.6         has procedures
          several improvements to language interface, can be found by searching
Index: gnue-appserver/samples/auth.gsd
diff -c gnue-appserver/samples/auth.gsd:1.3 gnue-appserver/samples/auth.gsd:1.4
*** gnue-appserver/samples/auth.gsd:1.3 Fri Oct 10 07:39:44 2003
--- gnue-appserver/samples/auth.gsd     Thu Oct 16 18:54:25 2003
***************
*** 62,68 ****
            <value>'Password'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000000063'</value>
            <value>'00000000000000000000000000000060'</value>
            <value>'00000000000000000000000000000000'</value>
            <value>'accesslist'</value>
--- 62,68 ----
            <value>'Password'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000000064'</value>
            <value>'00000000000000000000000000000060'</value>
            <value>'00000000000000000000000000000000'</value>
            <value>'accesslist'</value>
Index: gnue-appserver/samples/sample.gsd
diff -c gnue-appserver/samples/sample.gsd:1.8 
gnue-appserver/samples/sample.gsd:1.9
*** gnue-appserver/samples/sample.gsd:1.8       Fri Oct 10 07:39:44 2003
--- gnue-appserver/samples/sample.gsd   Thu Oct 16 18:54:25 2003
***************
*** 11,16 ****
--- 11,17 ----
          <field name="address_street" length="35" type="string"/>
          <field name="address_zip" length="17" type="string"/>
          <field name="address_city" length="35" type="string"/>
+         <field name="address_human" type="boolean"/>
        </fields>
        <constraints/>
        <indexes/>
***************
*** 52,58 ****
            <value>'Object ID'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001011'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'name'</value>
--- 53,59 ----
            <value>'Object ID'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001012'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'name'</value>
***************
*** 62,68 ****
            <value>'Name of the person'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001011'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'street'</value>
--- 63,69 ----
            <value>'Name of the person'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001013'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'street'</value>
***************
*** 72,78 ****
            <value>'Street where the person lives'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001011'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'zip'</value>
--- 73,79 ----
            <value>'Street where the person lives'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001014'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'zip'</value>
***************
*** 82,88 ****
            <value>'Zip code of the city where the person lives'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001011'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'city'</value>
--- 83,89 ----
            <value>'Zip code of the city where the person lives'</value>
          </row>
          <row>
!           <value>'00000000000000000000000000001015'</value>
            <value>'00000000000000000000000000001010'</value>
            <value>'00000000000000000000000000001000'</value>
            <value>'city'</value>
***************
*** 91,96 ****
--- 92,107 ----
            <value>'0'</value>
            <value>'City where the person lives'</value>
          </row>
+         <row>
+           <value>'00000000000000000000000000001016'</value>
+           <value>'00000000000000000000000000001010'</value>
+           <value>'00000000000000000000000000001000'</value>
+           <value>'human'</value>
+           <value>'boolean'</value>
+           <value>'0'</value>
+           <value>'0'</value>
+           <value>'City where the person lives'</value>
+         </row>
        </rows>
      </tabledata>
      <tabledata name="sample_persons" tablename="address_person">
***************
*** 101,106 ****
--- 112,118 ----
            <value>'Enterprise Road 17'</value>
            <value>'2002'</value>
            <value>'Gnutown'</value>
+           <value>'1'</value>
          </row>
          <row>
            <value>'00000000000000000000000000001101'</value>
***************
*** 108,113 ****
--- 120,126 ----
            <value>'Vulc Lane 1'</value>
            <value>'4711'</value>
            <value>'Vulcane'</value>
+           <value>'0'</value>
          </row>
        </rows>
      </tabledata>
***************
*** 123,129 ****
            <value>'00000000000000000000001000000002'</value>
            <value>'hacker'</value>
            <value>'secret'</value>
-           <value>'address_person,gnue_module,gnue_class,gnue_property'</value>
          </row>
        </rows>
      </tabledata>
--- 136,141 ----
Index: gnue-appserver/src/geasInstance.py
diff -c gnue-appserver/src/geasInstance.py:1.22 
gnue-appserver/src/geasInstance.py:1.23
*** gnue-appserver/src/geasInstance.py:1.22     Thu Oct  9 17:42:10 2003
--- gnue-appserver/src/geasInstance.py  Thu Oct 16 18:54:25 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasInstance.py,v 1.22 2003/10/09 21:42:10 siesel Exp $
  
  import types
  
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasInstance.py,v 1.23 2003/10/16 22:54:25 reinhard Exp $
  
  import types
  
***************
*** 65,87 ****
          try:
            return int (s)
          except ValueError:
!           raise Exception, "Database returned invalid value '%s' for" + \
!                            "property '%s'" % (s, propertyname)
        else:
          # ... with fractional part
          try:
            return float (s)
          except ValueError:
!           raise Exception, "Database returned invalid value '%s' for" + \
!                            "property '%s'" % (s, propertyname)
        
      elif self._classdef.classes.has_key (propertydef.gnue_type):
        # Reference property: gnue_type is a classname
        return self._record.getField (propertydef.column)
  
      # TODO: Missing property types:
      #       * datetime
-     #       * boolean
      #       * list properties
      #       * calculated properties (must have triggers working first)
  
--- 65,99 ----
          try:
            return int (s)
          except ValueError:
!           raise Exception, ("Database returned invalid value '%s' for " + \
!                             "property '%s'") % (s, propertyname)
        else:
          # ... with fractional part
          try:
            return float (s)
          except ValueError:
!           raise Exception, ("Database returned invalid value '%s' for " + \
!                             "property '%s'") % (s, propertyname)
        
+     elif propertydef.gnue_type == "boolean":
+       # Boolean property
+       s = self._record.getField (propertydef.column)
+       if s is None:
+         return None
+       elif s in [0, "0", "f", "F", "false", "FALSE", "n", "N", "no", "NO"]:
+         return "0"
+       elif s in [1, "1", "t", "T", "true", "true", "y", "Y", "yes", "YES"]:
+         return "1"
+       else:
+         raise Exception, ("Database returned invalid value '%s' for " + \
+                           "property '%s'") % (s, propertyname)
+ 
      elif self._classdef.classes.has_key (propertydef.gnue_type):
        # Reference property: gnue_type is a classname
        return self._record.getField (propertydef.column)
  
      # TODO: Missing property types:
      #       * datetime
      #       * list properties
      #       * calculated properties (must have triggers working first)
  
***************
*** 126,131 ****
--- 138,155 ----
        # TODO: check if value is an number
        pass
        
+     elif propertydef.gnue_type == "boolean":
+       # Boolean property
+       if value == "":
+         value = None
+       elif value in [0, "0", "f", "F", "false", "FALSE", "n", "N", "no", 
"NO"]:
+         value = "0"
+       elif value in [1, "1", "t", "T", "true", "true", "y", "Y", "yes", 
"YES"]:
+         value = "1"
+       else:
+         raise Exception, "Invalid value '%s' for property '%s'" % \
+                          (value, propertyname)
+ 
      self._record.setField (propertydef.column, value)
  
    # 
---------------------------------------------------------------------------




reply via email to

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