Commit 6f1c4bf0 authored by Jim Fulton's avatar Jim Fulton

More of the same. :-)

parent cedde7d2
......@@ -276,7 +276,7 @@
of the module 'Missing', if present.
''' #'
__rcs_id__='$Id: DT_In.py,v 1.16 1998/01/15 20:22:44 jim Exp $'
__rcs_id__='$Id: DT_In.py,v 1.17 1998/01/15 20:36:05 jim Exp $'
############################################################################
# Copyright
......@@ -330,7 +330,7 @@ __rcs_id__='$Id: DT_In.py,v 1.16 1998/01/15 20:22:44 jim Exp $'
# (540) 371-6909
#
############################################################################
__version__='$Revision: 1.16 $'[11:-2]
__version__='$Revision: 1.17 $'[11:-2]
from DT_Util import *
from string import find, atoi, join
......@@ -356,9 +356,9 @@ class In:
try: atoi(v)
except:
self.start_name_re=regex.compile(
'&'+
'&+'+
join(map(lambda c: "[%s]" % c, v),'')+
'=[0-9]+&')
'=[0-9]+&+')
name,expr=name_param(args,'in',1)
self.__name__, self.expr = name, expr
......@@ -774,9 +774,11 @@ class sequence_variables:
return l
elif key=='sequence-query' and self.start_name_re is not None:
query_string=self.query_string
while query_string[:1]=='?': query_string=query_string[1:]
if query_string[:1] != '&': query_string='&'+query_string
if query_string[-1:] != '&': query_string=query_string+'&'
while query_string[:1] in '?&':
query_string=query_string[1:]
while query_string[-1:] == '&':
query_string=query_string[:-1]
query_string='&%s&' % query_string
re=self.start_name_re
l=re.search(query_string)
if l >= 0:
......@@ -844,6 +846,9 @@ class sequence_variables:
############################################################################
# $Log: DT_In.py,v $
# Revision 1.17 1998/01/15 20:36:05 jim
# More of the same. :-)
#
# Revision 1.16 1998/01/15 20:22:44 jim
# Made batch processing more robust. Now don't need to specify
# '?' or & when constructing query strings.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment