Performance tuning.

. Modified cgi interface to change properties only once all changes are
   collected, files created and messages generated.
 . Moved generation of change note to nosyreactors.
 . We now check for changes to "assignedto" to ensure it's added to the
   nosy list.

Author: Roche Compaan

roundup/cgi_client.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.81 2001-12-12 23:55:00 richard Exp $
+# $Id: cgi_client.py,v 1.82 2001-12-15 19:24:39 rochecompaan Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -314,32 +314,10 @@ def shownode(self, message=None):
             try:
                 props, changed = parsePropsFromForm(self.db, cl, self.form,
                     self.nodeid)
-
-                # set status to chatting if 'unread' or 'resolved'
-                if not changed.has_key('status'):
-                    try:
-                        # determine the id of 'unread','resolved' and 'chatting'
-                        unread_id = self.db.status.lookup('unread')
-                        resolved_id = self.db.status.lookup('resolved')
-                        chatting_id = self.db.status.lookup('chatting')
-                    except KeyError:
-                        pass
-                    else:
-                        if (not props.has_key('status') or
-                                props['status'] == unread_id or
-                                props['status'] == resolved_id):
-                            props['status'] = chatting_id
-                            changed['status'] = chatting_id
-
-                # get the change note
-                change_note = cl.generateChangeNote(self.nodeid, changed)
-
-                # make the changes
-                cl.set(self.nodeid, **props)
-
-                # handle linked nodes and change message generation
-                self._post_editnode(self.nodeid, change_note)
-
+                # make changes to the node
+                self._changenode(props)
+                # handle linked nodes 
+                self._post_editnode(self.nodeid)
                 # and some nice feedback for the user
                 if changed:
                     message = _('%(changes)s edited ok')%{'changes':
@@ -455,37 +433,52 @@ def _createnode(self):
                 pass
             else:
                 props['status'] = unread_id
+        # add assignedto to the nosy list
+        if props.has_key('assignedto'):
+            assignedto_id = props['assignedto']
+            if props.has_key('nosy') and not assignedto_id in props['nosy']:
+                props['nosy'].append(assignedto_id)
+            else:
+                props['nosy'] = [assignedto_id]
+        # check for messages
+        message = self._handle_message()
+        if message:
+            props['messages'] = [message]
+        # create the node and return it's id
         return cl.create(**props)
 
-    def _post_editnode(self, nid, change_note=''):
-        ''' do the linking and message sending part of the node creation
+    def _changenode(self, props):
+        ''' change the node based on the contents of the form
         '''
-        cn = self.classname
-        cl = self.db.classes[cn]
-        # link if necessary
-        keys = self.form.keys()
-        for key in keys:
-            if key == ':multilink':
-                value = self.form[key].value
-                if type(value) != type([]): value = [value]
-                for value in value:
-                    designator, property = value.split(':')
-                    link, nodeid = roundupdb.splitDesignator(designator)
-                    link = self.db.classes[link]
-                    value = link.get(nodeid, property)
-                    value.append(nid)
-                    link.set(nodeid, **{property: value})
-            elif key == ':link':
-                value = self.form[key].value
-                if type(value) != type([]): value = [value]
-                for value in value:
-                    designator, property = value.split(':')
-                    link, nodeid = roundupdb.splitDesignator(designator)
-                    link = self.db.classes[link]
-                    link.set(nodeid, **{property: nid})
-
-        # handle file attachments
-        files = cl.get(nid, 'files')
+        cl = self.db.classes[self.classname]
+        # set status to chatting if 'unread' or 'resolved'
+        try:
+            # determine the id of 'unread','resolved' and 'chatting'
+            unread_id = self.db.status.lookup('unread')
+            resolved_id = self.db.status.lookup('resolved')
+            chatting_id = self.db.status.lookup('chatting')
+        except KeyError:
+            pass
+        else:
+            if (props['status'] == unread_id or props['status'] == resolved_id):
+                props['status'] = chatting_id
+        # add assignedto to the nosy list
+        if props.has_key('assignedto'):
+            assignedto_id = props['assignedto']
+            if not assignedto_id in props['nosy']:
+                props['nosy'].append(assignedto_id)
+        # create the message
+        message = self._handle_message()
+        if message:
+            props['messages'] = cl.get(self.nodeid, 'messages') + [message]
+        # make the changes
+        cl.set(self.nodeid, **props)
+
+    def _handle_message(self):
+        ''' generate and edit message '''
+
+        # handle file attachments 
+        files = []
         if self.form.has_key('__file'):
             file = self.form['__file']
             if file.filename:
@@ -495,14 +488,10 @@ def _post_editnode(self, nid, change_note=''):
                 # create the new file entry
                 files.append(self.db.file.create(type=mime_type,
                     name=file.filename, content=file.file.read()))
-                # and save the reference
-                cl.set(nid, files=files)
-
-        #
-        # generate an edit message
-        #
 
         # we don't want to do a message if none of the following is true...
+        cn = self.classname
+        cl = self.db.classes[self.classname]
         props = cl.getprops()
         note = None
         if self.form.has_key('__note'):
@@ -513,7 +502,7 @@ def _post_editnode(self, nid, change_note=''):
             return
         if not props['messages'].classname == 'msg':
             return
-        if not (len(cl.get(nid, 'nosy', [])) or note):
+        if not (self.form.has_key('nosy') or note):
             return
 
         # handle the note
@@ -528,20 +517,41 @@ def _post_editnode(self, nid, change_note=''):
                 ' the web.\n')%{'classname': cn}
             m = [summary]
 
-        # append the change note
-        if change_note:
-            m.append(change_note)
-
         # now create the message
         content = '\n'.join(m)
         message_id = self.db.msg.create(author=self.getuid(),
             recipients=[], date=date.Date('.'), summary=summary,
             content=content, files=files)
 
         # update the messages property
-        messages = cl.get(nid, 'messages')
-        messages.append(message_id)
-        cl.set(nid, messages=messages, files=files)
+        return message_id
+
+    def _post_editnode(self, nid):
+        ''' do the linking part of the node creation
+        '''
+        cn = self.classname
+        cl = self.db.classes[cn]
+        # link if necessary
+        keys = self.form.keys()
+        for key in keys:
+            if key == ':multilink':
+                value = self.form[key].value
+                if type(value) != type([]): value = [value]
+                for value in value:
+                    designator, property = value.split(':')
+                    link, nodeid = roundupdb.splitDesignator(designator)
+                    link = self.db.classes[link]
+                    value = link.get(nodeid, property)
+                    value.append(nid)
+                    link.set(nodeid, **{property: value})
+            elif key == ':link':
+                value = self.form[key].value
+                if type(value) != type([]): value = [value]
+                for value in value:
+                    designator, property = value.split(':')
+                    link, nodeid = roundupdb.splitDesignator(designator)
+                    link = self.db.classes[link]
+                    link.set(nodeid, **{property: nid})
 
     def newnode(self, message=None):
         ''' Add a new node to the database.
@@ -574,7 +584,7 @@ def newnode(self, message=None):
             props = {}
             try:
                 nid = self._createnode()
-                # handle linked nodes and change message generation
+                # handle linked nodes 
                 self._post_editnode(nid)
                 # and some nice feedback for the user
                 message = _('%(classname)s created ok')%{'classname': cn}
@@ -1090,6 +1100,9 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.81  2001/12/12 23:55:00  richard
+# Fixed some problems with user editing
+#
 # Revision 1.80  2001/12/12 23:27:14  richard
 # Added a Zope frontend for roundup.
 #

roundup/mailgw.py

@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.41 2001-12-10 00:57:38 richard Exp $
+$Id: mailgw.py,v 1.42 2001-12-15 19:24:39 rochecompaan Exp $
 '''
 
 
@@ -506,16 +506,14 @@ def handle_message(self, message):
                 if n.has_key(nid): continue
                 n[nid] = 1
             props['nosy'] = n.keys()
+            # add assignedto to the nosy list
             try:
                 assignedto = self.db.user.lookup(props['assignedto'])
                 if assignedto not in props['nosy']:
                     props['nosy'].append(assignedto)
             except:
                 pass
 
-            change_note = cl.generateChangeNote(nodeid, props)
-            content += change_note
-            
             message_id = self.db.msg.create(author=author,
                 recipients=recipients, date=date.Date('.'), summary=summary,
                 content=content, files=files)
@@ -572,16 +570,21 @@ def handle_message(self, message):
                 if self.db.hasnode('user', value):
                     nid = value
                 else:
-                    try:
-                        nid = self.db.user.lookup(value)
-                    except:
-                        continue
+                    continue
                 if n.has_key(nid): continue
                 n[nid] = 1
             props['nosy'] = n.keys() + recipients
+            # add the author to the nosy list
             if not n.has_key(author):
                 props['nosy'].append(author)
                 n[author] = 1
+            # add assignedto to the nosy list
+            try:
+                assignedto = self.db.user.lookup(props['assignedto'])
+                if not n.has_key(assignedto):
+                    props['nosy'].append(assignedto)
+            except:
+                pass
 
             # and attempt to create the new node
             try:
@@ -620,21 +623,35 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
         if not section:
             continue
         lines = eol.split(section)
-        if lines[0] and lines[0][0] in '>|':
-            continue
-        if len(lines) > 1 and lines[1] and lines[1][0] in '>|':
-            continue
         if not summary:
             summary = lines[0]
             l.append(section)
             continue
-        if signature.match(lines[0]):
-            break
+        # TODO: write better pattern for matching signature - it
+        # currently truncates messages with dashes in
+        #if signature.match(lines[0]):
+        #    break
         l.append(section)
     return summary, '\n\n'.join(l)
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.27  2001/12/15 06:51:04  roche
+# Merge with CVS
+#
+# Revision 1.1.1.11  2001/12/13 07:05:43  roche
+# update from cvs
+#
+# Revision 1.41  2001/12/10 00:57:38  richard
+# From CHANGES:
+#  . Added the "display" command to the admin tool - displays a node's values
+#  . #489760 ] [issue] only subject
+#  . fixed the doc/index.html to include the quoting in the mail alias.
+#
+# Also:
+#  . fixed roundup-admin so it works with transactions
+#  . disabled the back_anydbm module if anydbm tries to use dumbdbm
+#
 # Revision 1.40  2001/12/05 14:26:44  rochecompaan
 # Removed generation of change note from "sendmessage" in roundupdb.py.
 # The change note is now generated when the message is created.