--- a/de-cgi-bin/shorturl.py	Wed Jan 16 16:28:03 2008 +0000
+++ b/de-cgi-bin/shorturl.py	Wed Jan 16 18:44:03 2008 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python2.5
 #
 # DeGAL - A pretty simple web image gallery
 # Copyright (C) 2007 Tero Marttila
@@ -20,26 +20,22 @@
 # 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-import cgi
-
 import inc
-from lib import shorturl
-
-vars = cgi.FieldStorage()
-
-key = vars['key'].value
+from lib import shorturl, req
 
-if 'index' in vars :
-    index = int(vars['index'].value.lstrip('/'))
-else :
-    index = None
-
-db = shorturl.DB()
+key = req.get_str('key')
+index = req.get_int('index', None)
 
-path = db.html_path(key, index)
+path = shorturl.html_path(key)
 
-print "Status: 302"
-print "Location: ../%s" % path
-print
-print "../%s" % path
+if path :
+    print "Status: 302"
+    print "Location: ../%s" % path
+    print
+    print "../%s" % path
 
+else :
+    print "Status: 404"
+    print
+    print "404"
+