cleanup and other work

lib/python/Shared/DC/ZRDB/Aqueduct.py

@@ -10,8 +10,8 @@
 ############################################################################## 
 __doc__='''Shared Aqueduct classes and functions
 
-$Id: Aqueduct.py,v 1.8 1997/09/25 18:40:57 jim Exp $'''
-__version__='$Revision: 1.8 $'[11:-2]
+$Id: Aqueduct.py,v 1.9 1997/09/25 21:11:13 jim Exp $'''
+__version__='$Revision: 1.9 $'[11:-2]
 
 from Globals import HTMLFile
 import DocumentTemplate, DateTime, regex, regsub, string, urllib, rotor
@@ -20,7 +20,6 @@ DateTime.now=DateTime.DateTime
 from cStringIO import StringIO
 
 dtml_dir="%s/lib/python/Aqueduct/" % SOFTWARE_HOME
-default_report_src=open(dtml_dir+'defaultReport.dtml').read()
 
 class BaseQuery:
     def query_year(self): return self.query_date.year()
@@ -363,6 +362,9 @@ def delimited_output(results,REQUEST,RESPONSE):
 ############################################################################## 
 #
 # $Log: Aqueduct.py,v $
+# Revision 1.9  1997/09/25 21:11:13  jim
+# cleanup and other work
+#
 # Revision 1.8  1997/09/25 18:40:57  jim
 # new interfaces and RDB
 #

lib/python/Shared/DC/ZRDB/customDefaultReport.dtml

@@ -2,9 +2,8 @@
   <!--#in %(id)s size=50 start=query_start-->
      <!--#if sequence-start-->
         <!--#if previous-sequence-->
-          <a href="<!--#var
-                   PARENT_URL-->/<!--#var
-                   query_string-->&query_start=<!--#var
+          <a href="<!--#var URL-->/<!--#var sequence-query
+                   -->&query_start=<!--#var
                    previous-sequence-start-number-->">
           (Previous <!--#var previous-sequence-size--> results)
           </a>
@@ -24,9 +23,8 @@
      <!--#if sequence-end-->
         </table>
         <!--#if next-sequence-->
-           <a href="<!--#var
-              PARENT_URL-->/<!--#var
-              query_string-->&query_start=<!--#var
+           <a href="<!--#var URL-->/<!--#var sequence-query
+              -->&query_start=<!--#var
               next-sequence-start-number-->">
            (Next <!--#var next-sequence-size--> results)
            </a>