[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r5786 - in trunk/gnue-appserver: samples src src/classrep
From: |
johannes |
Subject: |
r5786 - in trunk/gnue-appserver: samples src src/classrep |
Date: |
Fri, 7 May 2004 04:25:25 -0500 (CDT) |
Author: johannes
Date: 2004-05-07 04:25:24 -0500 (Fri, 07 May 2004)
New Revision: 5786
Modified:
trunk/gnue-appserver/samples/sample.gfd
trunk/gnue-appserver/src/classrep/Procedure.py
trunk/gnue-appserver/src/classrep/Property.py
trunk/gnue-appserver/src/geasSession.py
Log:
Added missing properties for calculated properties so a 'real' property is
completely emulated
Modified: trunk/gnue-appserver/samples/sample.gfd
===================================================================
--- trunk/gnue-appserver/samples/sample.gfd 2004-05-07 09:11:21 UTC (rev
5785)
+++ trunk/gnue-appserver/samples/sample.gfd 2004-05-07 09:25:24 UTC (rev
5786)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso8859-1"?>
<form title="GNUe Application Server test">
- <parameter name="von" default="2270-05-20 09:00"/>
+ <parameter name="von" default="2270-06-20 09:00"/>
<parameter name="bis" default="2270-06-25 20:00"/>
<datasource name="dtsPerson" connection="appserver" table="address_person">
<condition>
Modified: trunk/gnue-appserver/src/classrep/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Procedure.py 2004-05-07 09:11:21 UTC
(rev 5785)
+++ trunk/gnue-appserver/src/classrep/Procedure.py 2004-05-07 09:25:24 UTC
(rev 5786)
@@ -146,9 +146,10 @@
len (self.parameters.keys ()) == 0 and \
self.gnue_name [:3].lower () == 'get'
if self.isCalculated:
- self.calcFullName = createName (self.module.gnue_name,
- self.gnue_name [3:])
+ self.calcName = self.gnue_name [3:]
+ self.calcFullName = createName (self.module.gnue_name, self.calcName)
else:
+ self.calcName = None
self.calcFullName = None
self.isValidated = True
Modified: trunk/gnue-appserver/src/classrep/Property.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Property.py 2004-05-07 09:11:21 UTC
(rev 5785)
+++ trunk/gnue-appserver/src/classrep/Property.py 2004-05-07 09:25:24 UTC
(rev 5786)
@@ -243,6 +243,7 @@
self._session = aProcedure._session
self.module = aProcedure.module
+ self.gnue_name = aProcedure.calcName
self.fullName = aProcedure.calcFullName
self.column = None
@@ -255,6 +256,8 @@
self.gnue_type = aProcedure.gnue_type
self.gnue_length = aProcedure.gnue_length
self.gnue_scale = aProcedure.gnue_scale
+ self.gnue_comment = aProcedure.gnue_comment
+ self.gnue_module = aProcedure.gnue_module
self._updateTypeInfo ()
Modified: trunk/gnue-appserver/src/geasSession.py
===================================================================
--- trunk/gnue-appserver/src/geasSession.py 2004-05-07 09:11:21 UTC (rev
5785)
+++ trunk/gnue-appserver/src/geasSession.py 2004-05-07 09:25:24 UTC (rev
5786)
@@ -403,32 +403,22 @@
dbCond = None
asCond = None
- # TODO: this could be improved, maybe using something like combineCondition
- # will do that later
if len (dbTrees):
dbCond = GConditions.GCondition ()
+ comb = GConditions.GCand (dbCond)
- if len (dbTrees) == 1:
- dbCond._children.append (dbTrees [0])
- dbTrees [0]._parent = dbCond
- else:
- comb = GConditions.GCand (dbCond)
- for tree in dbTrees:
- comb = GConditions.combineConditions (comb, tree)
+ for tree in dbTrees:
+ comb._children.append (tree)
+ tree._parent = comb
-
if len (asTrees):
asCond = GConditions.GCondition ()
+ comb = GConditions.GCand (asCond)
- if len (asTrees) == 1:
- asCond._children.append (asTrees [0])
- asTrees [0]._parent = asCond
+ for tree in asTrees:
+ comb._children.append (tree)
+ tree._parent = comb
- else:
- comb = GConditions.GCand (asCond)
- for tree in asTrees:
- comb = GConditions.combineConditions (comb, tree)
-
return (dbCond, asCond)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r5786 - in trunk/gnue-appserver: samples src src/classrep,
johannes <=