[cvs-annodex] commit (/annodex): cmmlwiki/trunk/cmmlwiki.css
cmmlwiki/trunk/edit.cgi cmmlwiki/trunk/view.cgi
conrad
nobody at lists.annodex.net
Fri Apr 15 13:58:11 EST 2005
Update of /annodex (new revision 1258)
Modified files:
cmmlwiki/trunk/cmmlwiki.css
cmmlwiki/trunk/edit.cgi
cmmlwiki/trunk/view.cgi
Log Message:
handle cmmlwiki/edit cmmlwiki/view (without trailing slash) for project selection
Modified: cmmlwiki/trunk/cmmlwiki.css
===================================================================
--- cmmlwiki/trunk/cmmlwiki.css 2005-04-15 01:27:00 UTC (rev 1257)
+++ cmmlwiki/trunk/cmmlwiki.css 2005-04-15 03:58:08 UTC (rev 1258)
@@ -121,6 +121,13 @@
padding: 0.1em;
}
+div.project {
+ background: White;
+ border: #707070 solid 1px;
+ padding: 0 .8em;
+ margin: 0 1em 1em;
+}
+
div.clip {
background: White;
border: 1px outset #998;
Modified: cmmlwiki/trunk/edit.cgi
===================================================================
--- cmmlwiki/trunk/edit.cgi 2005-04-15 01:27:00 UTC (rev 1257)
+++ cmmlwiki/trunk/edit.cgi 2005-04-15 03:58:08 UTC (rev 1258)
@@ -16,6 +16,7 @@
db = "/var/local/lib/cmmlwiki/cmmlwiki.db"
+edit_base = "/cmmlwiki/edit"
view_base = "/cmmlwiki/view"
def content_type (ct):
@@ -54,7 +55,7 @@
</head>
<body>
<div id="globalWrapper">
-<h1>%s</h1>
+<h1>CMMLWiki: %s</h1>
""" % (title, title)
def html_foot():
@@ -87,7 +88,14 @@
sql = 'SELECT * FROM projects'
cur.execute (sql)
for row in cur.fetchall():
- print '<p><a href="%(name)s?action=toc">%(name)s</a></p>' % row
+ name = row['name']
+ print """<div class="project">
+<h3>%s</h3>
+<p>
+[<a href="%s/%s?action=toc">edit</a>]
+[<a href="%s/%s">view</a>]
+</p>
+</div>""" % (name, edit_base, name, view_base, name)
html_foot()
@@ -203,11 +211,11 @@
print """
<h2>%s</h2>
-<p>[<a href="?action=edit">Insert clip</a>]
+<p>[<a href="%s/%s?action=edit">Insert clip</a>]
[<a href="%s/%s">View video</a>]
</p>
<p/>
-""" % (name, view_base, name)
+""" % (name, edit_base, name, view_base, name)
#sql = 'SELECT * FROM clips'
sql = """SELECT * FROM clips
@@ -269,9 +277,9 @@
if (key_isprintable (row, 'ixc')):
- print '[<a href="?action=edit&ixc=%s">edit</a>]' % (row['ixc'])
+ print '[<a href="%s?action=edit&ixc=%s">edit</a>]' % (edit_base, row['ixc'])
- print '[<a href="?action=delete&ixc=%s">delete</a>]</p>' % (row['ixc'])
+ print '[<a href="%s?action=delete&ixc=%s">delete</a>]</p>' % (edit_base, row['ixc'])
print '</div>'
@@ -346,8 +354,7 @@
toc(ixp)
-def get_ixp(path_info):
- project_name = path_info[1:]
+def get_ixp(project_name):
con = sqlite.connect(db)
cur = con.cursor()
sql = 'SELECT * FROM projects WHERE name="%s"' % project_name
@@ -366,17 +373,24 @@
form = cgi.FieldStorage()
path_info = os.getenv ('PATH_INFO')
- ixp = get_ixp (path_info)
+ try:
+ # Strip leading '/' from PATH_INFO
+ project_name = path_info[1:]
+ ixp = get_ixp (project_name)
+ except TypeError:
+ ixp = -1
- try:
- action = form['action'].value
- except:
- if (ixp != -1):
+ if (ixp == -1):
+ action = "select"
+ else:
+ try:
+ action = form['action'].value
+ except KeyError:
action = "toc"
- else:
- select()
- if (action == "toc"):
+ if (action == "select"):
+ select()
+ elif (action == "toc"):
toc(ixp)
elif (action == "edit"):
edit(form)
Modified: cmmlwiki/trunk/view.cgi
===================================================================
--- cmmlwiki/trunk/view.cgi 2005-04-15 01:27:00 UTC (rev 1257)
+++ cmmlwiki/trunk/view.cgi 2005-04-15 03:58:08 UTC (rev 1258)
@@ -18,6 +18,10 @@
print "Content-Type: %s\n" % ct
sys.stdout.flush()
+def location (loc):
+ print "Location: %s\n" % loc
+ sys.stdout.flush()
+
def npt2timestamp(str):
match = re.search ('^npt:(\d*):(\d\d):(\d\d).(\d\d\d)', str)
if match:
@@ -158,23 +162,28 @@
form = cgi.FieldStorage()
try:
- id = form['id'].value
+ id = form['id'].value
except KeyError:
- id = ""
+ id = ""
try:
- t = form['t'].value
+ t = form['t'].value
except KeyError:
- t = 0.0
+ t = 0.0
path_info = os.getenv ('PATH_INFO')
- project_name = path_info[1:]
- ixp = get_ixp (project_name)
+ try:
+ project_name = path_info[1:]
+ ixp = get_ixp (project_name)
+ except TypeError:
+ ixp = -1
- if (accept == "text/x-cmml"):
- make_cmml(ixp, project_name)
+ if (ixp == -1):
+ location (edit_base)
+ elif (accept == "text/x-cmml"):
+ make_cmml(ixp, project_name)
else:
- anxenc (ixp, id, t)
+ anxenc (ixp, id, t)
# Call main function.
main()
--
conrad
More information about the cvs-annodex
mailing list