Commit 332ee3e5 authored by Jim Fulton's avatar Jim Fulton

untabified.

parent c1aa3d82
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Encapsulation of date/time values""" """Encapsulation of date/time values"""
__version__='$Revision: 1.37 $'[11:-2] __version__='$Revision: 1.38 $'[11:-2]
import sys, os, math, regex, ts_regex, DateTimeZone import sys, os, math, regex, ts_regex, DateTimeZone
...@@ -728,7 +728,7 @@ class DateTime: ...@@ -728,7 +728,7 @@ class DateTime:
if i > 0: b=i-1 if i > 0: b=i-1
else: b=i else: b=i
ts_results = fltpat.match_group(string, (1,), b) ts_results = fltpat.match_group(string, (1,), b)
if ts_results: if ts_results:
#s=ts_results[1][0] #s=ts_results[1][0]
s=ts_results[1] s=ts_results[1]
...@@ -736,8 +736,8 @@ class DateTime: ...@@ -736,8 +736,8 @@ class DateTime:
ints.append(atof(s)) ints.append(atof(s))
continue continue
#TS #TS
ts_results = intpat.match_group(string, (1,), i) ts_results = intpat.match_group(string, (1,), i)
if ts_results: if ts_results:
#s=ts_results[1][0] #s=ts_results[1][0]
s=ts_results[1] s=ts_results[1]
...@@ -753,7 +753,7 @@ class DateTime: ...@@ -753,7 +753,7 @@ class DateTime:
continue continue
ts_results = wordpat.match_group(string, (1,), i) ts_results = wordpat.match_group(string, (1,), i)
if ts_results: if ts_results:
o,s=ts_results[1],lower(ts_results[1]) o,s=ts_results[1],lower(ts_results[1])
i=i+len(s) i=i+len(s)
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""DTML Method objects.""" """DTML Method objects."""
__version__='$Revision: 1.28 $'[11:-2] __version__='$Revision: 1.29 $'[11:-2]
from Globals import HTML, HTMLFile, MessageDialog from Globals import HTML, HTMLFile, MessageDialog
from string import join,split,strip,rfind,atoi,lower from string import join,split,strip,rfind,atoi,lower
...@@ -356,19 +356,19 @@ def decapitate(html, RESPONSE=None, ...@@ -356,19 +356,19 @@ def decapitate(html, RESPONSE=None,
while i < len(headers): while i < len(headers):
if not headers[i]: if not headers[i]:
del headers[i] del headers[i]
continue continue
ts_results = space_re.match_group(headers[i], (1,)) ts_results = space_re.match_group(headers[i], (1,))
if ts_results: if ts_results:
headers[i-1]="%s %s" % (headers[i-1], headers[i-1]="%s %s" % (headers[i-1],
headers[i][len(ts_results[1]):]) headers[i][len(ts_results[1]):])
del headers[i] del headers[i]
continue continue
i=i+1 i=i+1
for i in range(len(headers)): for i in range(len(headers)):
ts_results = name_re.match_group(headers[i], (1,2)) ts_results = name_re.match_group(headers[i], (1,2))
if ts_results: if ts_results:
k, v = ts_results[1] k, v = ts_results[1]
v=strip(v) v=strip(v)
......
...@@ -202,7 +202,7 @@ Notes on a new text index design ...@@ -202,7 +202,7 @@ Notes on a new text index design
space. space.
""" """
__version__='$Revision: 1.22 $'[11:-2] __version__='$Revision: 1.23 $'[11:-2]
from Globals import Persistent from Globals import Persistent
import BTree, IIBTree import BTree, IIBTree
...@@ -596,24 +596,24 @@ def parens(s, parens_re = regex.compile('(\|)').search): ...@@ -596,24 +596,24 @@ def parens(s, parens_re = regex.compile('(\|)').search):
index=open_index=paren_count = 0 index=open_index=paren_count = 0
while 1: while 1:
index = parens_re(s, index) index = parens_re(s, index)
if index < 0 : break if index < 0 : break
if s[index] == '(': if s[index] == '(':
paren_count = paren_count + 1 paren_count = paren_count + 1
if open_index == 0 : open_index = index + 1 if open_index == 0 : open_index = index + 1
else: else:
paren_count = paren_count - 1 paren_count = paren_count - 1
if paren_count == 0: if paren_count == 0:
return open_index, index return open_index, index
else: else:
index = index + 1 index = index + 1
if paren_count == 0: # No parentheses Found if paren_count == 0: # No parentheses Found
return None return None
else: else:
raise QueryError, "Mismatched parentheses" raise QueryError, "Mismatched parentheses"
......
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
__doc__='''Shared classes and functions __doc__='''Shared classes and functions
$Id: Aqueduct.py,v 1.33 1999/07/15 16:38:22 jim Exp $''' $Id: Aqueduct.py,v 1.34 1999/07/21 13:31:56 jim Exp $'''
__version__='$Revision: 1.33 $'[11:-2] __version__='$Revision: 1.34 $'[11:-2]
import Globals, os import Globals, os
from Globals import HTMLFile, Persistent from Globals import HTMLFile, Persistent
...@@ -353,27 +353,27 @@ def parse(text, ...@@ -353,27 +353,27 @@ def parse(text,
ts_results = parmre.match_group(text, (1,2,3)) ts_results = parmre.match_group(text, (1,2,3))
if ts_results: if ts_results:
start, grps = ts_results start, grps = ts_results
name=grps[1] name=grps[1]
value={'default':grps[2]} value={'default':grps[2]}
l=len(grps[0]) l=len(grps[0])
else: else:
ts_results = qparmre.match_group(text, (1,2,3)) ts_results = qparmre.match_group(text, (1,2,3))
if ts_results: if ts_results:
start, grps = ts_results start, grps = ts_results
name=grps[1] name=grps[1]
value={'default':grps[2]} value={'default':grps[2]}
l=len(grps[0]) l=len(grps[0])
else: else:
ts_results = unparmre.match_group(text, (1,2)) ts_results = unparmre.match_group(text, (1,2))
if ts_reults: if ts_reults:
start, grps = ts_results start, grps = ts_results
name=grps[1] name=grps[1]
l=len(grps[0]) l=len(grps[0])
value={} value={}
else: else:
if not text or not strip(text): return Args(result,keys) if not text or not strip(text): return Args(result,keys)
raise InvalidParameter, text raise InvalidParameter, text
lt=string.find(name,':') lt=string.find(name,':')
...@@ -427,17 +427,17 @@ def decapitate(html, RESPONSE=None, ...@@ -427,17 +427,17 @@ def decapitate(html, RESPONSE=None,
while i < len(headers): while i < len(headers):
if not headers[i]: if not headers[i]:
del headers[i] del headers[i]
else: else:
ts_results = space_re.match_group(headers[i], (1,)) ts_results = space_re.match_group(headers[i], (1,))
if ts_reults: if ts_reults:
headers[i-1]="%s %s" % (headers[i-1], headers[i-1]="%s %s" % (headers[i-1],
headers[i][len(ts_reults[1]):]) headers[i][len(ts_reults[1]):])
del headers[i] del headers[i]
else: else:
i=i+1 i=i+1
for i in range(len(headers)): for i in range(len(headers)):
ts_results = name_re.match_group(headers[i], (1,2)) ts_results = name_re.match_group(headers[i], (1,2))
if ts_reults: if ts_reults:
k, v = ts_reults[1] k, v = ts_reults[1]
v=string.strip(v) v=string.strip(v)
......
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