[cvs-annodex] commit (/annodex): cmmlwiki/trunk/edit.cgi

[conrad]

Update of /annodex (new revision 1244)

Modified files:
   cmmlwiki/trunk/edit.cgi

Log Message:
cmmlwiki: don't double up clips in the TOC


Modified: cmmlwiki/trunk/edit.cgi
===================================================================
--- cmmlwiki/trunk/edit.cgi	2005-04-12 05:47:16 UTC (rev 1243)
+++ cmmlwiki/trunk/edit.cgi	2005-04-12 06:14:26 UTC (rev 1244)
@@ -194,9 +194,9 @@
 """ % (name, view_base, name)
 
     #sql = 'SELECT * FROM clips'
-    sql = """SELECT * FROM clips, projects
-             WHERE clips.ixp="%s"
-             ORDER BY clips.start_time""" % (ixp)
+    sql = """SELECT * FROM clips
+             WHERE ixp="%s"
+             ORDER BY start_time""" % (ixp)
     #sql = """SELECT * FROM clips
     #         JOIN project_clips
     #         ON clips.ixc=project_clips.ixc
@@ -209,38 +209,35 @@
     #         """ % ixp
     cur.execute(sql)
     for row in cur.fetchall():
-        #print '<p>%s</p>' % row.keys()
-        #print '<p>%s</p>' % row
+        print '<div %s class="clip">' % (attr_str(id, row, 'id'))
 
-        print '<div %s class="clip">' % (attr_str(id, row, 'clips.id'))
-
-        if (key_isprintable (row, 'clips.img_src')):
-            print '<img src="%(clips.img_src)s" align="left"/>' % row
+        if (key_isprintable (row, 'img_src')):
+            print '<img src="%(img_src)s" align="left"/>' % row
         else:
             print '[no image]'
 
         print '<h3>'
-        if (key_isprintable (row, 'clips.start_time')):
-            print '%s' % time2npt (row['clips.start_time'])
-        if (key_isprintable (row, 'clips.id')):
-            print ': %(clips.id)s' % row
+        if (key_isprintable (row, 'start_time')):
+            print '%s' % time2npt (row['start_time'])
+        if (key_isprintable (row, 'id')):
+            print ': %(id)s' % row
         print '</h3>'
  
         print '<table>'
 
-        if (key_isprintable (row, 'clips.a_href')):
+        if (key_isprintable (row, 'a_href')):
             print """
 <tr>
   <th>Link:</th>
-  <td colspan="3"><p><a href="%(clips.a_href)s">%(clips.a_href)s</a></p><td>
+  <td colspan="3"><p><a href="%(a_href)s">%(a_href)s</a></p><td>
 </tr>
 """ % row
 
-        if (key_isprintable (row, 'clips.desc')):
+        if (key_isprintable (row, 'desc')):
             print """
 <tr>
   <th>Desc:</th>
-  <td colspan="3"><p>%(clips.desc)s</p></td>
+  <td colspan="3"><p>%(desc)s</p></td>
 </tr>
 """ % row
 
@@ -248,16 +245,16 @@
 </table>
 <p align="right">
 """
-        if (key_isprintable (row, 'clips.id')):
-            print '[<a href="%s/%s?id=%s">view</a>]' % (view_base, name, row['clips.id'])
-        elif (key_isprintable (row, 'clips.start_time')):
-            print '[<a href="%s/%s?t=%s">view</a>]' % (view_base, name, time2npt(row['clips.start_time']))
+        if (key_isprintable (row, 'id')):
+            print '[<a href="%s/%s?id=%s">view</a>]' % (view_base, name, row['id'])
+        elif (key_isprintable (row, 'start_time')):
+            print '[<a href="%s/%s?t=%s">view</a>]' % (view_base, name, time2npt(row['start_time']))
             
 
-        if (key_isprintable (row, 'clips.ixc')):
-            print '[<a href="?action=edit&ixc=%s">edit</a>]' % (row['clips.ixc'])
+        if (key_isprintable (row, 'ixc')):
+            print '[<a href="?action=edit&ixc=%s">edit</a>]' % (row['ixc'])
 
-            print '[<a href="?action=delete&ixc=%(clips.ixc)s">delete</a>]</p>'
+            print '[<a href="?action=delete&ixc=%s">delete</a>]</p>' % (row['ixc'])
 
         print '</div>'
 


-- 
conrad