Features and fixes.

Feature:
 . Added INSTANCE_NAME to configuration - used in web and email to identify
   the instance.
 . Added EMAIL_SIGNATURE_POSITION to indicate where to place the roundup
   signature info in e-mails.
 . Some more flexibility in the mail gateway and more error handling.
 . Login now takes you to the page you back to the were denied access to.

Fixed:
 . Lots of bugs, thanks Roch�nd others on the devel mailing list!

Author: Richard Jones

CHANGES.txt

@@ -1,7 +1,20 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
-2001-10-?? - 0.3.0 
+2001-11-?? - 0.3.1
+Feature:
+ . Added INSTANCE_NAME to configuration - used in web and email to identify
+   the instance.
+ . Added EMAIL_SIGNATURE_POSITION to indicate where to place the roundup
+   signature info in e-mails.
+ . Some more flexibility in the mail gateway and more error handling.
+ . Login now takes you to the page you back to the were denied access to.
+
+Fixed:
+ . Lots of bugs, thanks Roch� and others on the devel mailing list!
+
+
+2001-11-23 - 0.3.0 
 Feature:
  . #467129 ] Lossage when username=e-mail-address
  . #473123 ] Change message generation for author

cgi-bin/roundup.cgi

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup.cgi,v 1.19 2001-11-22 00:25:10 richard Exp $
+# $Id: roundup.cgi,v 1.20 2001-11-26 22:55:56 richard Exp $
 
 # python version check
 import sys
@@ -133,22 +133,32 @@ def main(out, err):
     os.environ['PATH_INFO'] = string.join(path[2:], '/')
     request = RequestWrapper(out)
     if ROUNDUP_INSTANCE_HOMES.has_key(instance):
-        instance_home = ROUNDUP_INSTANCE_HOMES[instance]
-        instance = roundup.instance.open(instance_home)
-        from roundup import cgi_client
-        client = instance.Client(instance, request, os.environ)
-        try:
-            client.main()
-        except cgi_client.Unauthorised:
-            request.send_response(403)
-            request.send_header('Content-Type', 'text/html')
+        # redirect if we need a trailing '/'
+        if len(path) == 2:
+            request.send_response(301)
+            absolute_url = 'http://%s%s/'%(os.environ['HTTP_HOST'],
+                os.environ['REQUEST_URI'])
+            request.send_header('Location', absolute_url)
             request.end_headers()
-            out.write('Unauthorised')
-        except cgi_client.NotFound:
-            request.send_response(404)
-            request.send_header('Content-Type', 'text/html')
-            request.end_headers()
-            out.write('Not found: %s'%client.path)
+            out.write('Moved Permanently')
+        else:
+            instance_home = ROUNDUP_INSTANCE_HOMES[instance]
+            instance = roundup.instance.open(instance_home)
+            from roundup import cgi_client
+            client = instance.Client(instance, request, os.environ)
+            try:
+                client.main()
+            except cgi_client.Unauthorised:
+                request.send_response(403)
+                request.send_header('Content-Type', 'text/html')
+                request.end_headers()
+                out.write('Unauthorised')
+            except cgi_client.NotFound:
+                request.send_response(404)
+                request.send_header('Content-Type', 'text/html')
+                request.end_headers()
+                out.write('Not found: %s'%client.path)
+
     else:
         import urllib
         request.send_response(200)
@@ -190,6 +200,9 @@ LOG.close()
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.19  2001/11/22 00:25:10  richard
+# quick fix for file uploads on windows in roundup.cgi
+#
 # Revision 1.18  2001/11/06 22:10:11  jhermann
 # Added env config; fixed request wrapper & index list; sort list by key
 #

roundup-admin

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup-admin,v 1.46 2001-11-21 03:40:54 richard Exp $
+# $Id: roundup-admin,v 1.47 2001-11-26 22:55:56 richard Exp $
 
 import sys
 if int(sys.version[0]) < 2:
@@ -306,24 +306,24 @@ Command help:
 
             properties = cl.getprops()
             for key, value in props.items():
-                type =  properties[key]
-                if isinstance(type, hyperdb.String):
+                proptype =  properties[key]
+                if isinstance(proptype, hyperdb.String):
                     continue
-                elif isinstance(type, hyperdb.Password):
+                elif isinstance(proptype, hyperdb.Password):
                     props[key] = password.Password(value)
-                elif isinstance(type, hyperdb.Date):
+                elif isinstance(proptype, hyperdb.Date):
                     try:
                         props[key] = date.Date(value)
                     except ValueError, message:
                         raise UsageError, '"%s": %s'%(value, message)
-                elif isinstance(type, hyperdb.Interval):
+                elif isinstance(proptype, hyperdb.Interval):
                     try:
                         props[key] = date.Interval(value)
                     except ValueError, message:
                         raise UsageError, '"%s": %s'%(value, message)
-                elif isinstance(type, hyperdb.Link):
+                elif isinstance(proptype, hyperdb.Link):
                     props[key] = value
-                elif isinstance(type, hyperdb.Multilink):
+                elif isinstance(proptype, hyperdb.Multilink):
                     props[key] = value.split(',')
 
             # try the set
@@ -369,7 +369,7 @@ Command help:
 
             # make sure it's a link
             if (not isinstance(property, hyperdb.Link) and not
-                    isinstance(type, hyperdb.Multilink)):
+                    isinstance(proptype, hyperdb.Multilink)):
                 raise UsageError, 'You may only "find" link properties'
 
             # get the linked-to class and look up the key property
@@ -469,23 +469,23 @@ Command help:
         for key in props.keys():
             # get the property
             try:
-                type = properties[key]
+                proptype = properties[key]
             except KeyError:
                 raise UsageError, '%s has no property "%s"'%(classname, key)
 
-            if isinstance(type, hyperdb.Date):
+            if isinstance(proptype, hyperdb.Date):
                 try:
                     props[key] = date.Date(value)
                 except ValueError, message:
                     raise UsageError, '"%s": %s'%(value, message)
-            elif isinstance(type, hyperdb.Interval):
+            elif isinstance(proptype, hyperdb.Interval):
                 try:
                     props[key] = date.Interval(value)
                 except ValueError, message:
                     raise UsageError, '"%s": %s'%(value, message)
-            elif isinstance(type, hyperdb.Password):
+            elif isinstance(proptype, hyperdb.Password):
                 props[key] = password.Password(value)
-            elif isinstance(type, hyperdb.Multilink):
+            elif isinstance(proptype, hyperdb.Multilink):
                 props[key] = value.split(',')
 
         # check for the key property
@@ -666,14 +666,14 @@ Command help:
             properties = cl.properties.items()
             for nodeid in cl.list():
                 l = []
-                for prop, type in properties:
+                for prop, proptype in properties:
                     value = cl.get(nodeid, prop)
                     # convert data where needed
-                    if isinstance(type, hyperdb.Date):
+                    if isinstance(proptype, hyperdb.Date):
                         value = value.get_tuple()
-                    elif isinstance(type, hyperdb.Interval):
+                    elif isinstance(proptype, hyperdb.Interval):
                         value = value.get_tuple()
-                    elif isinstance(type, hyperdb.Password):
+                    elif isinstance(proptype, hyperdb.Password):
                         value = str(value)
                     l.append(repr(value))
 
@@ -712,6 +712,7 @@ Command help:
         from roundup import hyperdb
 
         # ensure that the properties and the CSV file headings match
+        classname = args[0]
         try:
             cl = self.db.getclass(classname)
         except KeyError:
@@ -745,13 +746,13 @@ Command help:
                 value = eval(l[i])
                 # Figure the property for this column
                 key = file_props[i]
-                type = cl.properties[key]
+                proptype = cl.properties[key]
                 # Convert for property type
-                if isinstance(type, hyperdb.Date):
+                if isinstance(proptype, hyperdb.Date):
                     value = date.Date(value)
-                elif isinstance(type, hyperdb.Interval):
+                elif isinstance(proptype, hyperdb.Interval):
                     value = date.Interval(value)
-                elif isinstance(type, hyperdb.Password):
+                elif isinstance(proptype, hyperdb.Password):
                     pwd = password.Password()
                     pwd.unpack(value)
                     value = pwd
@@ -892,6 +893,9 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.46  2001/11/21 03:40:54  richard
+# more new property handling
+#
 # Revision 1.45  2001/11/12 22:51:59  jhermann
 # Fixed option & associated error handling
 #

roundup-server

@@ -20,7 +20,7 @@
 
 Based on CGIHTTPServer in the Python library.
 
-$Id: roundup-server,v 1.19 2001-11-12 22:51:04 jhermann Exp $
+$Id: roundup-server,v 1.20 2001-11-26 22:55:56 richard Exp $
 
 """
 import sys
@@ -247,8 +247,8 @@ def main():
     except SystemExit:
         raise
     except:
-        type, value = sys.exc_info()[:2]
-        usage('%s: %s'%(type, value))
+        exc_type, exc_value = sys.exc_info()[:2]
+        usage('%s: %s'%(exc_type, exc_value))
 
     # we don't want the cgi module interpreting the command-line args ;)
     sys.argv = sys.argv[:1]
@@ -262,6 +262,9 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.19  2001/11/12 22:51:04  jhermann
+# Fixed option & associated error handling
+#
 # Revision 1.18  2001/11/01 22:04:37  richard
 # Started work on supporting a pop3-fetching server
 # Fixed bugs: