Changeset 617

Timestamp:

01/16/07 23:34:01 (2 years ago)

Author:

alo

Message:

Files:

cherokee/trunk/ChangeLog

r615	r617
1	1	2007-01-16 Alvaro Lopez Ortega <alvaro@alobbs.com>
	2
	3	* contrib/05to06.py (Syntax._process_entry_guts): Rewrites
	4	management fixed. It wasn't support short entries (entries without
	5	regex and substring).
	6
	7	* contrib/05to06.py (Lexer._get_token_guts): Allow '-' inside str
	8	tokens.
2	9
3	10	* contrib/05to06.py (Syntax._process_virtual_server_content):

r616	r617
136	136	if kind != 'str': raise "Expected a str"
137	137
138		~~print '%s!handler!rewrite!%d!regex = %s' % (prefix, regex_num, regex_val)~~
139
140	138	kind, url_val = self._lex.get_token()
141		if kind != 'str': raise "Expected a str"
142
143		print '%s!handler!rewrite!%d!substring = %s' % (prefix, regex_num, url_val)
144		regex_num = regex_num + 1
145		continue
	139	if kind == '}':
	140	self._lex.rewind()
	141	print '%s!handler!rewrite!%d!substring = %s' % (prefix, regex_num, regex_val)
	142	regex_num = regex_num + 1
	143	continue
	144
	145	elif kind == 'str':
	146	print '%s!handler!rewrite!%d!regex = %s' % (prefix, regex_num, regex_val)
	147	print '%s!handler!rewrite!%d!substring = %s' % (prefix, regex_num, url_val)
	148	regex_num = regex_num + 1
	149	continue
	150
	151	else:
	152	raise "Expected a str or '}'"
	153
	154
	155	# kind, regex_val = self._lex.get_token()
	156	# if kind != 'str': raise "Expected a str"
	157
	158	# print '%s!handler!rewrite!%d!regex = %s' % (prefix, regex_num, regex_val)
	159
	160	# kind, url_val = self._lex.get_token()
	161	# if kind != 'str': raise "Expected a str"
	162
	163	# print '%s!handler!rewrite!%d!substring = %s' % (prefix, regex_num, url_val)
	164	# regex_num = regex_num + 1
	165	# continue
146	166
147	167
…	…
747	767	if not c in string.letters and \
748	768	not c in string.digits and \
749		not c in "._&?=:\\/*":
	769	not c in "._-&?=:\\/*":
750	770	is_name = False
751	771	if is_name: