Commit db9a0eeb authored by Jim Fulton's avatar Jim Fulton

Untabified.

parent 7a9d0080
......@@ -89,8 +89,8 @@ Aqueduct database adapters, etc.
This module can also be used as a simple template for implementing new
item types.
$Id: SimpleItem.py,v 1.44 1999/04/02 00:11:40 jim Exp $'''
__version__='$Revision: 1.44 $'[11:-2]
$Id: SimpleItem.py,v 1.45 1999/04/09 17:17:02 jim Exp $'''
__version__='$Revision: 1.45 $'[11:-2]
import regex, sys, Globals, App.Management, Acquisition
from webdav.Resource import Resource
......@@ -132,8 +132,8 @@ class Item(Base, Resource, CopySource, App.Management.Tabs):
__ac_permissions__=(
('View management screens', ('manage_workspace',)),
)
('View management screens', ('manage_workspace',)),
)
manage_info =Globals.HTMLFile('App/manage_info')
......@@ -145,7 +145,7 @@ class Item(Base, Resource, CopySource, App.Management.Tabs):
try:
m=self.manage_options[0]['action']
if m=='manage_workspace': raise TypeError
except: return 'This object has no management interface'
except: return 'This object has no management interface'
if find(m,'/'):
raise 'Redirect', (
......@@ -392,7 +392,7 @@ class SimpleItem(Item, Globals.Persistent,
"""
manage_options=(
{'label':'Security', 'action':'manage_access'},
)
{'label':'Security', 'action':'manage_access'},
)
__ac_permissions__=(('View', ()),)
......@@ -119,7 +119,7 @@
however, if x is ommitted or an empty string, then the value
inserted is 'null'.
'''
__rcs_id__='$Id: sqlvar.py,v 1.7 1999/03/25 13:31:04 jeffrey Exp $'
__rcs_id__='$Id: sqlvar.py,v 1.8 1999/04/09 17:17:38 jim Exp $'
############################################################################
# Copyright
......@@ -129,7 +129,7 @@ __rcs_id__='$Id: sqlvar.py,v 1.7 1999/03/25 13:31:04 jeffrey Exp $'
# rights reserved.
#
############################################################################
__version__='$Revision: 1.7 $'[11:-2]
__version__='$Revision: 1.8 $'[11:-2]
from DocumentTemplate.DT_Util import ParseError, parse_params, name_param
from string import find, split, join, atoi, atof
......@@ -188,11 +188,11 @@ class SQLVar:
else:
v=str(v)
if not v and t=='nb':
if args.has_key('optional') and args['optional']:
return 'null'
else:
raise ValueError, (
'Invalid empty string value for <em>%s</em>' % name)
if args.has_key('optional') and args['optional']:
return 'null'
else:
raise ValueError, (
'Invalid empty string value for <em>%s</em>' % name)
v=md.getitem('sql_quote__',0)(v)
#if find(v,"\'") >= 0: v=join(split(v,"\'"),"''")
......
......@@ -189,17 +189,17 @@ def _read_and_report(file, rpt=None, fromEnd=0, both=0, n=99999999, show=0):
if n < 1: break
seek(pos+24)
if plen > 0:
p=read(plen)
if p[-1:] != '.':
error('Corrupted pickle at %s %s %s' % (pos,plen,len(p)))
if show > 0:
seek(pos+24)
error(read(show))
err=1
break
else: p=''
if plen > 0:
p=read(plen)
if p[-1:] != '.':
error('Corrupted pickle at %s %s %s' % (pos,plen,len(p)))
if show > 0:
seek(pos+24)
error(read(show))
err=1
break
else: p=''
t=split(read(tlen-plen-28),'\t')
tname, user = (t+[''])[:2]
t=join(t[2:],'\t')
......@@ -208,7 +208,7 @@ def _read_and_report(file, rpt=None, fromEnd=0, both=0, n=99999999, show=0):
s=s+f
start="%.4d-%.2d-%.2d %.2d:%.2d:%.3f" % (y,m,d,h,mn,s)
rpt(pos,oid,start,tname,user,t,p,first)
first=0
first=0
if err and both and not fromEnd:
_read_and_report(file, rpt, 1, 0, n, show)
......@@ -237,13 +237,13 @@ def xml(pos, oid, start, tname, user, t, p, first):
if first: write('<?xml version="1.0">\n<ZopeData>\n')
if pos is None:
write('</transaction>\n')
write('</ZopeData>\n')
return
write('</transaction>\n')
write('</ZopeData>\n')
return
if user or t or first:
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
l=len(p)
pp=p
f=StringIO(p)
......@@ -251,7 +251,7 @@ def xml(pos, oid, start, tname, user, t, p, first):
u.idprefix='%s.' % pos
p=u.load().__str__(4)
if f.tell() < l:
p=p+u.load().__str__(4)
p=p+u.load().__str__(4)
write(' <rec id="%s" time="%s">\n%s </rec>\n' % (oid, start, p))
def xmls(pos, oid, start, tname, user, t, p, first):
......@@ -259,14 +259,14 @@ def xmls(pos, oid, start, tname, user, t, p, first):
if first: write('<?xml version="1.0">\n<transactions>\n')
if pos is None:
write('</transaction>\n')
write('</transactioons>\n')
return
write('</transaction>\n')
write('</transactioons>\n')
return
if user or t or first:
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
if pos > 9: write('</transaction>\n')
write('<transaction name="%s" user="%s">\n%s\n' % (tname, user,t))
reports={
'none': (none,
('Read a database file checking for errors',
......
This diff is collapsed.
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