Changeset 23

Timestamp:

11/19/08 10:25:06 (7 weeks ago)

Author:

fporcari

Message:

varie da me

Location:

gnrpy

Files:

• gnr/app/gnrapp.py (modified) (1 diff)
• gnr/core/docs/source/index.rst (modified) (2 diffs)
• gnr/core/gnrstructures.py (modified) (5 diffs)
• gnr/sql/gnrsql.py (modified) (2 diffs)
• packages/adm/webpages/manage_users.py (modified) (1 diff)

gnrpy/gnr/app/gnrapp.py

@@ -222 +222 @@
         self.packagesIdByPath = {}
         self.config = Bag(os.path.join(self.instanceFolder, 'instanceconfig.xml'))
-        
         if custom_config:
             self.config.update(custom_config)

gnrpy/gnr/core/docs/source/index.rst

@@ -12 +12 @@
 
     tutorials/dependences
-    tutorials/bagdoc
+    tutorials/basicbag
+
+
 
 Indices and tables
@@ -26 +28 @@
 
     modules/gnrbag
+    modules/gnrstructures
+

gnrpy/gnr/core/gnrstructures.py

@@ -28 +28 @@
 from gnr.core import gnrstring
 
+
 class GnrStructData(Bag):
+    """
+    is a subclass of Bag that implements functional syntax for adding 
+    particular elements to the tree.
+    """
     def makeRoot(cls, source=None,protocls=None):
-        """This method builds the root instance for the given class.
-        @param cls: structure class
-        @param source: filepath of xml file"""
+        """
+        This method builds the root instance for the given class.
+        
+        * `cls`: structure class
+        * `source`: filepath of xml file"""
         if protocls:
             instance=protocls()
@@ -58 +65 @@
         
     def child(self, tag, name='*_#', content=None, _parentTag=None, **kwargs):
-        """This method sets a new item of the type tag into the current structure
-        @param tag: structure type
-        @param name: structure name. Default value is formed by 'tag_position'
-        @param content: optional structure content
-        @param kwargs: other parameters
-        @return : the new structure if content is none else the parent"""
+        """
+        
+        This method sets a new item of the type tag into the current structure
+        
+        * `tag`: structure type
+        * `name`: structure name. Default value is formed by 'tag_position'
+        * `content`: optional structure content
+        * `kwargs`: other parameters
+        
+        Return : the new structure if content is none else the parent"""
         where=self
         childname=name
@@ -107 +118 @@
     
     def save(self,path):
-        """This method saves the structure as an xml file
-        @param path: destination of the saved file"""
+        """
+        This method saves the structure as an xml file
+        
+        * `path`: destination of the saved file
+        """
         self.toXml(path, typeattrs=False)
         
     def load(self,path):
         """This method loads the structure from an xml file
-        @param path: path of the file"""
+        * `path`: path of the file"""
         cls=self.__class__
         b = Bag()
@@ -121 +135 @@
 
 class GnrStructObj(GnrObject):
+    """
+    is a tree of GnrObjects that is auto-builded starting from an instance 
+    of GnrStructData. 
+    """
     def makeRoot(cls, parent , structnode, objclassdict, **kwargs):
-        """This class method instatiates the first element (root)
-        @param cls:
-        @param parent:
-        @param structnode
-        @param objclassdict: dictionary of the classes
-        @param kwargs:
-        return"""
+        """
+        This class method instatiates the first element (root)
+        
+        * `cls`
+        * `parent`
+        * `structnode`
+        * `objclassdict``: dictionary of the classes
+        * `kwargs`
+        
+        return
+        """
         if isinstance(structnode, Bag):
             structnode = structnode.getNode('#0')
@@ -136 +158 @@
     makeRoot = classmethod(makeRoot)
     
-    def __init__(self, tag=None, structnode=None, parent=None, name=None, attrs=None, children=None, objclassdict=None, **kwargs):
+    def __init__(self, tag=None, structnode=None, parent=None, name=None, 
+                attrs=None, children=None, objclassdict=None, **kwargs):
         self.structnode = structnode
         if objclassdict:

gnrpy/gnr/sql/gnrsql.py

@@ -34 +34 @@
 from gnr.core.gnrclasses import GnrClassCatalog
 from gnr.sql.gnrsqlmodel import DbModel
-from gnr.sql.gnrsql_exceptions import GnrSqlException,GnrSqlExecutionException,GnrSqlSaveChangesException
+from gnr.sql.gnrsql_exceptions import GnrSqlException,GnrSqlExecutionException,\
+                                      GnrSqlSaveChangesException
 from gnr.sql.adapters import *
 
@@ -262 +263 @@
         return as_
         
-    def relationExplorer(self, table, prevCaption='', prevRelation='', transaltor=None, **kwargs):
-        return self.table(table).relationExplorer(prevCaption=prevCaption, prevRelation=prevRelation, transaltor=transaltor, **kwargs)
+    def relationExplorer(self, table, prevCaption='', prevRelation='',
+                        transaltor=None, **kwargs):
+        return self.table(table).relationExplorer(prevCaption=prevCaption, 
+                                                  prevRelation=prevRelation,
+                                                  transaltor=transaltor, **kwargs)
         
     def createDb(self, name, encoding='unicode'):

gnrpy/packages/adm/webpages/manage_users.py

@@ -83 +83 @@
     
     def onSaving(self, data):
-        li = []
-        data['#0'].pop('tag_bag_removed')
-        tags = data['#0'].popNode('tag_bag')
-        oldtags = tags.getAttr('oldValue')
-        tags = tags.value
-        if tags:
-            for node in tags:
-                tag = node.getAttr('tagname')
-                li.append(tag)
-            tags = ','.join(li)
-        else:
-            tags = ''
-        data.setItem('#0.auth_tags', tags,oldValue=oldtags)
+        if data['record.tag_bag']:
+            li = []
+            data['#0'].pop('tag_bag_removed')
+            tags = data['record'].popNode('tag_bag')
+            oldtags = tags.getAttr('oldValue')
+            tags = tags.value
+            if tags:
+                for node in tags:
+                    tag = node.getAttr('tagname')
+                    li.append(tag)
+                    tags = ','.join(li)
+                else:
+                    tags = ''
+            data.setItem('#0.auth_tags', tags, oldValue=oldtags)