[changed state protocol
Panu Kalliokoski <atehwa@sange.fi>**20130820075713
 Ignore-this: da04b00a75ff4392dff985a04c2c1722
] hunk ./mexse.cgi 101
-def ask_for_file(tname, form):
+def ask_for_file(form):
hunk ./mexse.cgi 119
-	<p><input type=text name=address value="%s"></p>
-	<input type=submit name="fetch_file" value="Fetch">
+	<p>%s<br>%s</p>
hunk ./mexse.cgi 124
-	<p><input type=file name=datafile></p>
-	<input type=submit name="receive_file" value="Send">
+	<p>%s<br>%s</p>
hunk ./mexse.cgi 126
-	</td></tr></table>''' % tname
+	</td></tr></table>
+	<p>If you want to skip this phase, you can go directly to %s.</p>
+	''' % (html_input('address', ''),
+			html_submit('fetch_file', 'Fetch'),
+			html_input('filename', ''),
+			html_submit('receive_file', 'Send'),
+			html_statelink('edit_metadata',
+				'metadata editing phase'))
hunk ./mexse.cgi 138
-	start_html('Mexse / Metadata Overview')
-	print '<p>We have gathered the following metadata:</p>'
-	print '<table border=0>'
+	start_html('Mexse / Metadata Collection')
+	print '''
+	<p>We have gathered %d metadata items.  Now we guess what kind of
+	metadata they are.  Below are some suggestions.  Please check
+	that we put them into correct elements.</p>''' % len(md)
+	print '''<table border=0>
+	<tr><th>Element</th><th>Value</th><th>Origin</th></tr>'''
+	n = 0
hunk ./mexse.cgi 147
-		print '<tr><td>%s</td><td>%s</td><td>(%s)</td></tr>' % \
-				(key, val, module)
+		print '<tr><td>%s</td><td>%s</td><td>(%s)%s</td></tr>' % \
+			(html_choice('key%d' % n, guess_elements(key, module)),
+			html_input('val%d' % n, val), module,
+			html_hidden('items', n))
+		n = n + 1
hunk ./mexse.cgi 155
-def fetch_file(_, form):
+def fetch_file(form):
hunk ./mexse.cgi 160
-def receive_file(_, form):
+def receive_file(form):
hunk ./mexse.cgi 168
+def edit_metadata(form):
+	print_header()
+	start_html('Mexse / Metadata Authoring')
+	end_html()
+
hunk ./mexse.cgi 180
+		'edit_metadata': edit_metadata,
hunk ./mexse.cgi 182
-	for param in handlers:
-		if param in form:
-			handlers[param](form.getfirst(param), form)
-			break
-	else: ask_for_file('', form)
+	state = form.getfirst('state', 'ask_for_file')
+	try: handler = handlers[state]
+	except KeyError: handler = edit_metadata
+	handler(form)