get ZRoundup working... still not quite right

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1329 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/frontends/ZRoundup/ZRoundup.py b/frontends/ZRoundup/ZRoundup.py
index 6afbf7371a475c9afe498eacc433a9f1ca236e37..8fc87db66bbd29968c6e258f25ddc087cf789fdb 100644 (file)
--- a/frontends/ZRoundup/ZRoundup.py
+++ b/frontends/ZRoundup/ZRoundup.py
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.13 2002-09-10 03:01:18 richard Exp $
+# $Id: ZRoundup.py,v 1.14 2002-10-10 03:47:27 richard Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -149,10 +149,7 @@ class ZRoundup(Item, PropertyManager, Implicit, Persistent):
         else:
             # For some reason, CRs are embeded in multiline notes.
             # It doesn't occur with apache/roundup.cgi, though.
-            form = self.REQUEST.form 
-            if form.has_key( '__note' ) :
-                form['__note'] = form['__note'].replace( '\r' , '' )
-            form = FormWrapper(form)
+            form = FormWrapper(self.REQUEST.form)
 
         return instance.Client(instance, request, env, form)
 
@@ -161,9 +158,7 @@ class ZRoundup(Item, PropertyManager, Implicit, Persistent):
     def index_html(self):
         '''Alias index_html to roundup's index
         '''
-
         # Redirect misdirected requests -- bugs 558867 , 565992
-       
         # PATH_INFO, as defined by the CGI spec, has the *real* request path
         orig_path = self.REQUEST.environ[ 'PATH_INFO' ]
         if orig_path[-1] != '/' : 

diff --git a/frontends/ZRoundup/__init__.py b/frontends/ZRoundup/__init__.py
index 5b6f6866ff5c77dd6665eea05bfba01be8f89464..1d2e272c396cff01cb60384111ea270e58ba034b 100644 (file)
--- a/frontends/ZRoundup/__init__.py
+++ b/frontends/ZRoundup/__init__.py
@@ -14,15 +14,15 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.3 2002-09-10 03:01:18 richard Exp $
+# $Id: __init__.py,v 1.4 2002-10-10 03:47:27 richard Exp $
 #
 __version__='1.0'
 
 import os
 # figure where ZRoundup is installed
 here = None
-if os.environ.has_key('TRACKER_HOME'):
-    here = os.environ['TRACKER_HOME']
+if os.environ.has_key('INSTANCE_HOME'):
+    here = os.environ['INSTANCE_HOME']
     path = os.path.join(here, 'Products', 'ZRoundup')
     if not os.path.exists(path):
         path = os.path.join(here, 'lib', 'python', 'Products', 'ZRoundup')