Removed generation of change note from "sendmessage" in roundupdb.py.

The change note is now generated when the message is created.

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.75 2001-12-04 01:25:08 richard Exp $
+# $Id: cgi_client.py,v 1.76 2001-12-05 14:26:44 rochecompaan Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -313,7 +313,7 @@ def shownode(self, message=None):
                     self.nodeid)
 
                 # set status to chatting if 'unread' or 'resolved'
-                if 'status' not in changed:
+                if 'status' not in changed.keys():
                     try:
                         # determine the id of 'unread','resolved' and 'chatting'
                         unread_id = self.db.status.lookup('unread')
@@ -326,18 +326,21 @@ def shownode(self, message=None):
                                 props['status'] == unread_id or
                                 props['status'] == resolved_id):
                             props['status'] = chatting_id
-                            changed.append('status')
+                            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, changed)
+                self._post_editnode(self.nodeid, change_note)
 
                 # and some nice feedback for the user
                 if changed:
                     message = _('%(changes)s edited ok')%{'changes':
-                        ', '.join(changed)}
+                        ', '.join(changed.keys())}
                 else:
                     message = _('nothing changed')
             except:
@@ -395,10 +398,10 @@ def showuser(self, message=None):
                         del props['password']
                         del changed[changed.index('password')]
                 user.set(self.nodeid, **props)
-                self._post_editnode(self.nodeid, changed)
+                self._post_editnode(self.nodeid)
                 # and some feedback for the user
                 message = _('%(changes)s edited ok')%{'changes':
-                    ', '.join(changed)}
+                    ', '.join(changed.keys())}
             except:
                 self.db.rollback()
                 s = StringIO.StringIO()
@@ -437,9 +440,19 @@ def _createnode(self):
         '''
         cl = self.db.classes[self.classname]
         props, dummy = parsePropsFromForm(self.db, cl, self.form)
+
+        # set status to 'unread' if not specified - a status of '- no
+        # selection -' doesn't make sense
+        if not props.has_key('status'):
+            try:
+                unread_id = self.db.status.lookup('unread')
+            except KeyError:
+                pass
+            else:
+                props['status'] = unread_id
         return cl.create(**props)
 
-    def _post_editnode(self, nid, changes=None):
+    def _post_editnode(self, nid, change_note=None):
         ''' do the linking and message sending part of the node creation
         '''
         cn = self.classname
@@ -479,8 +492,6 @@ def _post_editnode(self, nid, changes=None):
                     name=file.filename, content=file.file.read()))
                 # and save the reference
                 cl.set(nid, files=files)
-                if changes is not None and 'file' not in changes:
-                    changes.append('file')
 
         #
         # generate an edit message
@@ -513,7 +524,8 @@ def _post_editnode(self, nid, changes=None):
                 ' the web.\n')%{'classname': cn}
             m = [summary]
 
-        # TODO: append the change note!
+        # append the change note
+        m.append(change_note)
 
         # now create the message
         content = '\n'.join(m)
@@ -1002,7 +1014,7 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
     '''Pull properties for the given class out of the form.
     '''
     props = {}
-    changed = []
+    changed = {}
     keys = form.keys()
     num_re = re.compile('^\d+$')
     for key in keys:
@@ -1042,6 +1054,7 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
             link = cl.properties[key].classname
             l = []
             for entry in map(str, value):
+                if entry == '': continue
                 if not num_re.match(entry):
                     try:
                         entry = db.classes[link].lookup(entry)
@@ -1065,12 +1078,16 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
 
         # if changed, set it
         if nodeid and value != existing:
-            changed.append(key)
+            changed[key] = value
             props[key] = value
     return props, changed
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.75  2001/12/04 01:25:08  richard
+# Added some rollbacks where we were catching exceptions that would otherwise
+# have stopped committing.
+#
 # Revision 1.74  2001/12/02 05:06:16  richard
 # . We now use weakrefs in the Classes to keep the database reference, so
 #   the close() method on the database is no longer needed.

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.39 2001-12-02 05:06:16 richard Exp $
+$Id: mailgw.py,v 1.40 2001-12-05 14:26:44 rochecompaan Exp $
 '''
 
 
@@ -342,9 +342,26 @@ def handle_message(self, message):
 Subject was: "%s"
 '''%(key, message, subject)
                 elif isinstance(proptype, hyperdb.Link):
-                    props[key] = value.strip()
+                    link = self.db.classes[proptype.classname]
+                    propkey = link.labelprop(default_to_id=1)
+                    try:
+                        props[key] = link.get(value.strip(), propkey)
+                    except:
+                        props[key] = link.lookup(value.strip())
                 elif isinstance(proptype, hyperdb.Multilink):
-                    props[key] = [x.strip() for x in value.split(',')]
+                    link = self.db.classes[proptype.classname]
+                    propkey = link.labelprop(default_to_id=1)
+                    l = [x.strip() for x in value.split(',')]
+                    for item in l:
+                        try:
+                            v = link.get(item, propkey)
+                        except:
+                            v = link.lookup(item)
+                        if props.has_key(key):
+                            props[key].append(v)
+                        else:
+                            props[key] = [v]
+
 
         #
         # handle the users
@@ -459,20 +476,6 @@ def handle_message(self, message):
             # the newly created "msg" node is added to the "messages" property
             # for that item, and any new "file" nodes are added to the "files" 
             # property for the item. 
-            message_id = self.db.msg.create(author=author,
-                recipients=recipients, date=date.Date('.'), summary=summary,
-                content=content, files=files)
-            try:
-                messages = cl.get(nodeid, 'messages')
-            except IndexError:
-                raise MailUsageError, '''
-The node specified by the designator in the subject of your message ("%s")
-does not exist.
-
-Subject was: "%s"
-'''%(nodeid, subject)
-            messages.append(message_id)
-            props['messages'] = messages
 
             # if the message is currently 'unread' or 'resolved', then set
             # it to 'chatting'
@@ -490,22 +493,43 @@ def handle_message(self, message):
                             props['status'] == resolved_id):
                         props['status'] = chatting_id
 
-            # add nosy in arguments to issue's nosy list, don't replace
-            if props.has_key('nosy'):
-                n = {}
-                for nid in cl.get(nodeid, 'nosy'):
-                    n[nid] = 1
-                for value in props['nosy']:
-                    if self.db.hasnode('user', value):
-                        nid = value
-                    else:
-                        try:
-                            nid = self.db.user.lookup(value)
-                        except:
-                            continue
-                    if n.has_key(nid): continue
-                    n[nid] = 1
-                props['nosy'] = n.keys()
+            # add nosy in arguments to issue's nosy list
+            if not props.has_key('nosy'): props['nosy'] = []
+            n = {}
+            for nid in cl.get(nodeid, 'nosy'):
+                n[nid] = 1
+            for value in props['nosy']:
+                if self.db.hasnode('user', value):
+                    nid = value
+                else: 
+                    continue
+                if n.has_key(nid): continue
+                n[nid] = 1
+            props['nosy'] = n.keys()
+            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)
+            try:
+                messages = cl.get(nodeid, 'messages')
+            except IndexError:
+                raise MailUsageError, '''
+The node specified by the designator in the subject of your message ("%s")
+does not exist.
+
+Subject was: "%s"
+'''%(nodeid, subject)
+            messages.append(message_id)
+            props['messages'] = messages
 
             # now apply the changes
             try:
@@ -542,9 +566,22 @@ def handle_message(self, message):
 
             # pre-load the messages list and nosy list
             props['messages'] = [message_id]
-            props['nosy'] = props.get('nosy', []) + recipients
-            props['nosy'].append(author)
-            props['nosy'].sort()
+            nosy = props.get('nosy', [])
+            n = {}
+            for value in nosy:
+                if self.db.hasnode('user', value):
+                    nid = value
+                else:
+                    try:
+                        nid = self.db.user.lookup(value)
+                    except:
+                        continue
+                if n.has_key(nid): continue
+                n[nid] = 1
+            props['nosy'] = n.keys() + recipients
+            if not n.has_key(author):
+                props['nosy'].append(author)
+                n[author] = 1
 
             # and attempt to create the new node
             try:
@@ -598,6 +635,20 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.39  2001/12/02 05:06:16  richard
+# . We now use weakrefs in the Classes to keep the database reference, so
+#   the close() method on the database is no longer needed.
+#   I bumped the minimum python requirement up to 2.1 accordingly.
+# . #487480 ] roundup-server
+# . #487476 ] INSTALL.txt
+#
+# I also cleaned up the change message / post-edit stuff in the cgi client.
+# There's now a clearly marked "TODO: append the change note" where I believe
+# the change note should be added there. The "changes" list will obviously
+# have to be modified to be a dict of the changes, or somesuch.
+#
+# More testing needed.
+#
 # Revision 1.38  2001/12/01 07:17:50  richard
 # . We now have basic transaction support! Information is only written to
 #   the database when the commit() method is called. Only the anydbm