From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Mon, 23 Jul 2001 04:31:40 +0000 (+0000)
Subject: Fixed the roundup CGI script for updates to cgi_client.py
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=59b698465c9f6f040d320c7d69ec211577bec214;p=roundup.git

Fixed the roundup CGI script for updates to cgi_client.py


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

diff --git a/CHANGES b/CHANGES
index 1910b07..9d394c6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -58,4 +58,5 @@
  . Major reshuffle of code to allow multiple roundup instances and a
    single, site-packages -based installation. Also allows multiple database
    back-ends.
-
+ . moved the bin/ proggies into the top dir, so that it all works
+   out-of-the-box
diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi
index 4840d51..511e08b 100755
--- a/cgi-bin/roundup.cgi
+++ b/cgi-bin/roundup.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# $Id: roundup.cgi,v 1.1 2001-07-22 11:47:07 richard Exp $
+# $Id: roundup.cgi,v 1.2 2001-07-23 04:31:40 richard Exp $
 
 # python version check
 import sys
@@ -14,7 +14,7 @@ if int(sys.version[0]) < 2:
 
 # This indicates where the Roundup instance lives
 ROUNDUPS = {
-    'test': '/tmp/roundup_test',
+    'roundup_test': '/tmp/',
 }
 
 # Where to log debugging information to. Use an instance of DevNull if you
@@ -49,6 +49,7 @@ def main(instance, out):
     auth = os.environ.get("HTTP_CGI_AUTHORIZATION", None)
     message = 'Unauthorised'
     if auth:
+        import binascii
         l = binascii.a2b_base64(auth.split(' ')[1]).split(':')
         user = l[0]
         password = None
@@ -71,7 +72,7 @@ def main(instance, out):
         keys.sort()
         out.write(message)
         return
-    client = instance.Client(out, os.environ, user)
+    client = instance.Client(out, db, os.environ, user)
     try:
         client.main()
     except cgi_client.Unauthorised:
@@ -86,7 +87,9 @@ out, err = sys.stdout, sys.stderr
 try:
     sys.stdout = sys.stderr = LOG
     import os, string
-    instance = string.split(os.environ['PATH_INFO'], '/')[1]
+    path = string.split(os.environ['PATH_INFO'], '/')
+    instance = path[1]
+    os.environ['PATH_INFO'] = string.join(path[2:], '/')
     if ROUNDUPS.has_key(instance):
         instance_home = ROUNDUPS[instance]
         sys.path.insert(0, instance_home)
@@ -106,4 +109,7 @@ sys.stdout, sys.stderr = out, err
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.1  2001/07/22 11:47:07  richard
+# More Grande Splite
+#
 #