[xiph-commits] r3235 - in arkaiv/trunk: . arkaiv/controllers
arkaiv/model arkaiv/templates data/templates ez_setup
dcrowdy at svn.annodex.net
dcrowdy at svn.annodex.net
Tue Sep 11 17:54:28 PDT 2007
Author: dcrowdy
Date: 2007-09-11 17:54:27 -0700 (Tue, 11 Sep 2007)
New Revision: 3235
Modified:
arkaiv/trunk/arkaiv/controllers/page.py
arkaiv/trunk/arkaiv/controllers/page.pyc
arkaiv/trunk/arkaiv/model/__init__.py
arkaiv/trunk/arkaiv/model/__init__.pyc
arkaiv/trunk/arkaiv/templates/collectionexpanded.mak
arkaiv/trunk/arkaiv/templates/collections.mak
arkaiv/trunk/arkaiv/templates/mainpage.mak
arkaiv/trunk/arkaiv/templates/playlists.mak
arkaiv/trunk/data/templates/addannodexform.mak.py
arkaiv/trunk/data/templates/addannodexform.mak.pyc
arkaiv/trunk/data/templates/autohandler.py
arkaiv/trunk/data/templates/autohandler.pyc
arkaiv/trunk/data/templates/collectionexpanded.mak.py
arkaiv/trunk/data/templates/collectionexpanded.mak.pyc
arkaiv/trunk/data/templates/collections.mak.py
arkaiv/trunk/data/templates/collections.mak.pyc
arkaiv/trunk/data/templates/displayitem.mak.py
arkaiv/trunk/data/templates/displayitem.mak.pyc
arkaiv/trunk/data/templates/mainpage.mak.py
arkaiv/trunk/data/templates/mainpage.mak.pyc
arkaiv/trunk/development.ini
arkaiv/trunk/ez_setup/__init__.pyc
arkaiv/trunk/setup.cfg
Log:
Replaced deprecated functions get_by with filter_by().first() as a result of api changes in sqlalchemy 0.4. Started work on consistency of separation of model from view.
Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/arkaiv/controllers/page.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -64,7 +64,7 @@
# Wrap the names in <option> tags for the h.select webhelper
c.collectioninfo = ""
for collection in collectionlist:
- c.collectioninfo = c.collectioninfo + "<option>" + collection.name + "</option>"
+ c.collectioninfo = c.collectioninfo + "<option>" + collection['name'] + "</option>"
return render('/addform.mak')
@@ -79,7 +79,7 @@
collectionlist = model.getcollections()
c.collectioninfo = ""
for collection in collectionlist:
- c.collectioninfo = c.collectioninfo + "<option>" + collection.name + "</option>"
+ c.collectioninfo = c.collectioninfo + "<option>" + collection['name'] + "</option>"
return render('/addannodexform.mak')
@@ -185,7 +185,7 @@
c.collectioninfo = ""
for collection in collectionlist:
#print collection.name
- c.collectioninfo = c.collectioninfo + "<option>" + collection.name + "</option>"
+ c.collectioninfo = c.collectioninfo + "<option>" + collection['name'] + "</option>"
return render('/addannodexindirform.mak')
@@ -319,7 +319,11 @@
def addclip(self):
clip = {}
clip['starttime'] = float(request.params['starttime'])
- clip['endtime'] = float(request.params['endtime'])
+ if (not request.params['endtime']):
+ print "no value for endtime"
+ clip['endtime'] = ""
+ else:
+ clip['endtime'] = float(request.params['endtime'])
clip['itemid'] = request.params['itemid']
clip['a_text'] = request.params['a_text']
clip['id'] = clip['starttime'] # A kludge so users don't have to worry about providing ids
@@ -542,7 +546,7 @@
c.playlists=model.getplaylists()
c.playlistinfo = ""
for playlist in c.playlists:
- c.playlistinfo = c.playlistinfo + "<option>" + playlist.name + "</option>"
+ c.playlistinfo = c.playlistinfo + "<option>" + playlist['name'] + "</option>"
return render('/searchresults.mak')
Modified: arkaiv/trunk/arkaiv/controllers/page.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/model/__init__.py
===================================================================
--- arkaiv/trunk/arkaiv/model/__init__.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/arkaiv/model/__init__.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -58,7 +58,6 @@
Column('ixc', types.Integer(), ForeignKey('clips.ixc'))
)
-
sources_table = Table('sources', metadata,
Column('ixs', types.Integer, primary_key=True),
Column('path', types.String())
@@ -242,7 +241,6 @@
'my_collections' : relation(Collection,
secondary = collection_items_table)})
-
mapper(Playlist, playlists_table)
mapper(Playlistitems, playlist_items_table)
@@ -271,12 +269,21 @@
mapper(Itemclips, item_clips_table)
def getallitems():
-# item = items_table
+ """ get a list of all items in the database
+
+ returns a list of dicts with keys "index" and "name"
+ """
item_q = Session.query(Item)
i = item_q.all()
-# i = item.select().execute().fetchall()
- return i
+ items = []
+ for n in i:
+ item = {}
+ item['index'] = n.ixi
+ item['name'] = n.name
+ items.append(item)
+ return items
+
def addnewcollection(name):
newcollection = Collection()
newcollection.name = name
@@ -285,77 +292,102 @@
return
def getcollections():
-# coll = collections_table
-# c = coll.select().execute().fetchall()
+ """ gets a list of all collections in the database
+
+ returns a list of dicts with keys "index" and "name"
+ """
coll_q = Session.query(Collection)
c = coll_q.all()
- return c
+ collections=[]
+ for n in c:
+ collection = {}
+ collection['index'] = n.ixk
+ collection['name'] = n.name
+ collections.append(collection)
+ return collections
+
def getitemsincollection(id):
coll_items_q = Session.query(Collectionitems)
# get a list of ids
cilist = coll_items_q.filter_by(ixk=id)
- itemlist = []
+ items = []
for ci in cilist:
+ item={}
item_q = Session.query(Item)
- i = item_q.get_by(ixi=ci.ixi)
- itemlist.append(i)
+ i = item_q.filter_by(ixi=ci.ixi).first()
+ item['index'] = i.ixi
+ item['name'] = i.name
+ items.append(item)
Session.commit()
- return itemlist
+ return items
+
def getplaylists():
- """ Return a list of all current playlists
+ """ get all current playlists from database
+ returns a list of dicts with keys "index" and "name"
"""
- play = playlists_table
- p = play.select().execute().fetchall()
- return p
+ play_q = Session.query(Playlist)
+ p = play_q.all()
+ playlists=[]
+ for n in p:
+ playlist={}
+ playlist['index']=n.ixp
+ playlist['name']=n.name
+ playlists.append(playlist)
+ return playlists
+
def addnewplaylist(name):
""" Add a new named playlist to the database
"""
newplaylist = Playlist()
newplaylist.name = name
+ Session.save(newplaylist)
Session.commit()
return
def addcliptoplaylist(list, clipid):
# get the id for the list
p_q = Session.query(Playlist)
- p = p_q.get_by(name=list)
+ p = p_q.filter_by(name=list).first()
# get the item id:
ic_q = Session.query(Itemclips)
- ic = ic_q.get_by(ixc=clipid)
+ ic = ic_q.filter_by(ixc=clipid).first()
# add an entry to playlist_items
pi = Playlistitems()
pi.ixc = clipid
pi.ixi = ic.ixi
pi.ixp = p.ixp
-
+ Session.save(pi)
Session.commit()
return
def additemtoplaylist(list, itemid):
p_q = Session.query(Playlist)
- p = p_q.get_by(name=list)
+ p = p_q.filter_by(name=list).first()
pi = Playlistitems()
#pi.ixc = clipid
pi.ixi = itemid
pi.ixp = p.ixp
+ Session.save(pi)
Session.commit()
return
def getclipsfromplaylist(listid):
pi_q = Session.query(Playlistitems)
- pi = pi_q.filter_by(ixp=listid)
+ pi = pi_q.filter_by(ixp=listid).all()
c_q = Session.query(Clip)
cliplist = []
for item in pi:
- c = c_q.get_by(ixc=item.ixc)
+ c = c_q.filter_by(ixc=item.ixc).first()
+# c = c_q.filter_by(ixc=item.ixc).one() #FIXME this doesn't work so still using the deprecated filter_by above - not sure what the problem is here
+
cliplist.append(c)
return cliplist
@@ -365,13 +397,14 @@
"""
pi_q = Session.query(Playlistitems)
- pi = pi_q.filter_by(ixp=listid)
+ pi = pi_q.filter_by(ixp=listid).all()
i_q = Session.query(Item)
itemlist = []
for item in pi:
#print item.ixc
if (not item.ixc):
- i = i_q.get_by(ixi=item.ixi)
+ #i = i_q.filter_by(ixi=item.ixi)
+ i = i_q.filter_by(ixi=item.ixi).first()
itemlist.append(i)
return itemlist
@@ -381,10 +414,10 @@
given the playlist name
"""
p_q = Session.query(Playlist)
- p = p_q.get_by(name=listname)
+ p = p_q.filter_by(name=listname).first()
# then get all items in the playlist_items table
pi_q = Session.query(Playlistitems)
- pi = pi_q.filter_by(ixp=p.ixp)
+ pi = pi_q.filter_by(ixp=p.ixp).first()
for item in pi:
Session.delete(item)
@@ -407,7 +440,8 @@
def additemtocollection(itemid, collection):
new_coll_item = Collectionitems()
coll_q = Session.query(Collection)
- c = coll_q.get_by(name=collection)
+ #c = coll_q.filter_by(name=collection)
+ c = coll_q.filter_by(name=collection).first()
new_coll_item.ixk = c.ixk
new_coll_item.ixi = itemid
Session.save(new_coll_item)
@@ -420,7 +454,8 @@
"""
item_q = Session.query(Item)
- i = item_q.get_by(ixi=itemid)
+ #i = item_q.filter_by(ixi=itemid)
+ i = item_q.filter_by(ixi=itemid).first()
i.name = text
Session.commit()
@@ -428,57 +463,54 @@
def getitemname(id):
item_q = Session.query(Item)
- i = item_q.get_by(ixi=id)
+ #i = item_q.filter_by(ixi=id)
+ i = item_q.filter_by(ixi=id).first()
name = i.name
return name
def getitemforid(id):
item_q = Session.query(Item)
- i = item_q.get_by(ixi=id)
+ i = item_q.filter_by(ixi=id).first()
return i
def getitemforclip(clipid):
ic_q = Session.query(Itemclips)
- ic = ic_q.get_by(ixc=clipid)
+ ic = ic_q.filter_by(ixc=clipid).first()
i_q = Session.query(Item)
- i = i_q.get_by(ixi=ic.ixi)
+ i = i_q.filter_by(ixi=ic.ixi).first()
return i
def getclip(clipid):
c_q = Session.query(Clip)
- c = c_q.get_by(ixc=clipid)
+ c = c_q.filter_by(ixc=clipid).first()
return c
def getheadmeta(id):
meta_q = Session.query(Meta)
- m = meta_q.get_by(ixm=id)
- print m.ixm
+ m = meta_q.filter_by(ixm=id).first()
return m
def getitemforheadmeta(metaid):
#first get the head
hm_q = Session.query(Headmetas)
- h = hm_q.get_by(ixm=metaid)
+ h = hm_q.filter_by(ixm=metaid).first()
ih_q = Session.query(Itemheads)
- ih = ih_q.get_by(ixh=h.ixh)
+ ih = ih_q.filter_by(ixh=h.ixh).first()
i_q = Session.query(Item)
- i = i_q.get_by(ixi=ih.ixi)
- print "i is: "
- print i
- print "i.ixi is" + str(i.ixi)
+ i = i_q.filter_by(ixi=ih.ixi).first()
return i
def getitemcmmlfile(id):
item_q = Session.query(Item)
- i = item_q.get_by(ixi=id)
+ i = item_q.filter_by(ixi=id).first()
cmmlfile = i.cmmlfile
return cmmlfile
def getsourcesforitem(id):
# get the results from item_sources for given item id
item_sources_q = Session.query(Itemsources)
- s = item_sources_q.get_by(ixi=id)
+ s = item_sources_q.filter_by(ixi=id).first()
sid = s.ixs
return sid
@@ -488,26 +520,27 @@
Returns the source path
"""
source_q = Session.query(Source)
- s = source_q.get_by(ixs=id)
+ s = source_q.filter_by(ixs=id).first()
path = s.path
return path
def addhead(info):
# get the item this refers to:
item_q = Session.query(Item)
- i = item_q.get_by(ixi=info['itemid'])
+ i = item_q.filter_by(ixi=info['itemid']).first()
new_head = Head()
new_head.id = info['id']
new_head.title = info['title']
new_head.my_items.append(i)
+ Session.save(new_head)
Session.commit()
return new_head.ixh
def edithead(info):
head_q = Session.query(Head)
itemhead_q = Session.query(Itemheads)
- ih = itemhead_q.get_by(ixi=info['itemid'])
- h = head_q.get_by(ixh=ih.ixh)
+ ih = itemhead_q.filter_by(ixi=info['itemid']).first()
+ h = head_q.filter_by(ixh=ih.ixh).first()
h.id = info['id']
h.title = info['title']
Session.commit()
@@ -525,7 +558,7 @@
for ic in iclist:
# get individual meta info
clipinfo = {}
- c = clip_q.get_by(ixc=ic.ixc)
+ c = clip_q.filter_by(ixc=ic.ixc).first()
clipinfo['ixc'] = c.ixc
clipinfo['start_time'] = c.start_time
clipinfo['end_time'] = c.end_time
@@ -544,8 +577,8 @@
headdict = {}
head_q = Session.query(Head)
itemhead_q = Session.query(Itemheads)
- ih = itemhead_q.get_by(ixi=id)
- h = head_q.get_by(ixh=ih.ixh)
+ ih = itemhead_q.filter_by(ixi=id).first()
+ h = head_q.filter_by(ixh=ih.ixh).first()
headdict['ixh'] = h.ixh
headdict['id'] = h.id
headdict['title'] = h.title
@@ -558,7 +591,7 @@
meta_q = Session.query(Meta)
for hm in hmlist:
metainfo = {}
- m = meta_q.get_by(ixm=hm.ixm)
+ m = meta_q.filter_by(ixm=hm.ixm).first()
metalist.append(m)
Session.commit()
@@ -577,7 +610,7 @@
for hm in hmlist:
# get individual meta info
metainfo = {}
- m = meta_q.get_by(ixm=hm.ixm)
+ m = meta_q.filter_by(ixm=hm.ixm).first()
metainfo['ixm'] = m.ixm
metainfo['id'] = m.id
metainfo['name'] = m.name
@@ -594,13 +627,14 @@
returns the newly created meta item
"""
head_q = Session.query(Head)
- h = head_q.get_by(ixh=info['headindex'])
+ h = head_q.filter_by(ixh=info['headindex']).first()
new_meta = Meta()
new_meta.id = info['id']
new_meta.name = info['name']
new_meta.content = info['content']
new_meta.scheme = info['scheme']
new_meta.my_heads.append(h)
+ Session.save(new_meta)
Session.commit()
return new_meta
@@ -610,7 +644,7 @@
"""
meta_q = Session.query(Meta)
- m = meta_q.get_by(ixm=metaid)
+ m = meta_q.filter_by(ixm=metaid).first()
m.id = metaid
Session.commit()
return
@@ -625,7 +659,7 @@
returns nothing yet...
"""
meta_q = Session.query(Meta)
- m = meta_q.get_by(ixm=metaid)
+ m = meta_q.filter_by(ixm=metaid).first()
if field=="name":
m.name = text
elif field=="content":
@@ -635,44 +669,45 @@
def addclip(info):
item_q = Session.query(Item)
- i = item_q.get_by(ixi=info['itemid'])
+ i = item_q.filter_by(ixi=info['itemid']).first()
new_clip = Clip()
new_clip.start_time = info['starttime']
- try:
+ if info['endtime'] == "":
+ new_clip.end_time = 0
+ else:
new_clip.end_time = info['endtime']
- except:
- pass
new_clip.id = info['id']
new_clip.a_href = info['a_href']
new_clip.a_text = info['a_text']
new_clip.img_src = info['img_src']
new_clip.desc = info['desc']
new_clip.my_items.append(i)
+ Session.save(new_clip)
Session.commit()
return
def deleteclip(id):
clip_q = Session.query(Clip)
- c = clip_q.get_by(ixc=id)
+ c = clip_q.filter_by(ixc=id).first()
Session.delete(c)
Session.commit()
return
def deleteitem(id):
item_q = Session.query(Item)
- i = item_q.get_by(ixi=id)
+ i = item_q.filter_by(ixi=id).first()
Session.delete(i)
# remove head info
ih_q = Session.query(Itemheads)
- ih = ih_q.get_by(ixi=id)
+ ih = ih_q.filter_by(ixi=id).first()
# remove meta tags from this head
hm_q = Session.query(Headmetas)
hm = hm_q.filter_by(ixh=ih.ixh)
m_q = Session.query(Meta)
for headmeta in hm:
- m = m_q.get_by(ixm=headmeta.ixm)
+ m = m_q.filter_by(ixm=headmeta.ixm).first()
# Session.delete(headmeta)
Session.delete(m)
@@ -681,19 +716,19 @@
c_q = Session.query(Clip)
ic = ic_q.filter_by(ixi=id)
for itemclip in ic:
- c = c_q.get_by(ixc=itemclip.ixc)
+ c = c_q.filter_by(ixc=itemclip.ixc).first()
Session.delete(c)
# remove the head entry
h_q = Session.query(Head)
- h = h_q.get_by(ixh=ih.ixh)
+ h = h_q.filter_by(ixh=ih.ixh).first()
Session.delete(h)
# remove the source information as well
is_q = Session.query(Itemsources)
- i_s = is_q.get_by(ixi=id)
+ i_s = is_q.filter_by(ixi=id).first()
s_q = Session.query(Source)
- s = s_q.get_by(ixs=i_s.ixs)
+ s = s_q.filter_by(ixs=i_s.ixs).first()
#Session.delete(i_s)
Session.delete(s)
@@ -742,7 +777,7 @@
def deletemeta(metaid):
meta_q = Session.query(Meta)
- m = meta_q.get_by(ixm=metaid)
+ m = meta_q.filter_by(ixm=metaid).first()
Session.delete(m)
Session.commit()
return
Modified: arkaiv/trunk/arkaiv/model/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/arkaiv/templates/collectionexpanded.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/collectionexpanded.mak 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/arkaiv/templates/collectionexpanded.mak 2007-09-12 00:54:27 UTC (rev 3235)
@@ -5,8 +5,7 @@
% for item in c.items:
<li>
- ${item.ixi}
- ${ h.link_to(item.name, h.url(action="displayitem", edit="no", id=item.ixi)) }
+ ${ h.link_to(item['name'], h.url(action="displayitem", edit="no", id=item['index'])) }
</li>
% endfor
Modified: arkaiv/trunk/arkaiv/templates/collections.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/collections.mak 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/arkaiv/templates/collections.mak 2007-09-12 00:54:27 UTC (rev 3235)
@@ -5,8 +5,7 @@
% for coll in c.collections:
<li>
- ${coll.ixk}
- ${ h.link_to(coll.name, h.url(action="displaycollection", edit="no", id=coll.ixk, name=coll.name)) }
+ ${ h.link_to(coll['name'], h.url(action="displaycollection", edit="no", id=coll['index'], name=coll['name'])) }
</li>
% endfor
Modified: arkaiv/trunk/arkaiv/templates/mainpage.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/mainpage.mak 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/arkaiv/templates/mainpage.mak 2007-09-12 00:54:27 UTC (rev 3235)
@@ -5,8 +5,7 @@
% for item in c.items:
<li>
- <!--${item.ixi}-->
- ${ h.link_to(item.name, h.url(action="displayitem", edit="no", id=item.ixi)) }
+ ${ h.link_to(item['name'], h.url(action="displayitem", edit="no", id=item['index'])) }
</li>
% endfor
Modified: arkaiv/trunk/arkaiv/templates/playlists.mak
===================================================================
--- arkaiv/trunk/arkaiv/templates/playlists.mak 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/arkaiv/templates/playlists.mak 2007-09-12 00:54:27 UTC (rev 3235)
@@ -5,7 +5,7 @@
% for p in c.playlists:
<li>
-${ h.link_to(p.name, h.url(action="displayplaylist", id=p.ixp, name=p.name))}
+${ h.link_to(p['name'], h.url(action="displayplaylist", id=p['index'], name=p['name']))}
</li>
% endfor
Modified: arkaiv/trunk/data/templates/addannodexform.mak.py
===================================================================
--- arkaiv/trunk/data/templates/addannodexform.mak.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/data/templates/addannodexform.mak.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189166145.629523
-_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/addannodexform.mak'
+_modified_time = 1189555063.3636899
+_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/addannodexform.mak'
_template_uri='/addannodexform.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/addannodexform.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/autohandler.py
===================================================================
--- arkaiv/trunk/data/templates/autohandler.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/data/templates/autohandler.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189166140.564939
-_template_filename=u'/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/autohandler'
+_modified_time = 1189492026.7317741
+_template_filename=u'/home/dcrowdy/src/working/trunk/arkaiv/templates/autohandler'
_template_uri=u'/autohandler'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/autohandler.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/collectionexpanded.mak.py
===================================================================
--- arkaiv/trunk/data/templates/collectionexpanded.mak.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/data/templates/collectionexpanded.mak.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1188350471.7409589
-_template_filename='/home/dcrowdy/src/working/test/arkaiv/trunk/arkaiv/templates/collectionexpanded.mak'
+_modified_time = 1189555557.2151339
+_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/collectionexpanded.mak'
_template_uri='/collectionexpanded.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -36,12 +36,9 @@
# SOURCE LINE 7
context.write(u'<li>\n ')
# SOURCE LINE 8
- context.write(unicode(item.ixi))
- context.write(u' \n ')
- # SOURCE LINE 9
- context.write(unicode( h.link_to(item.name, h.url(action="displayitem", edit="no", id=item.ixi)) ))
+ context.write(unicode( h.link_to(item['name'], h.url(action="displayitem", edit="no", id=item['index'])) ))
context.write(u'\n</li>\n')
- # SOURCE LINE 12
+ # SOURCE LINE 11
context.write(u'\n\n')
return ''
finally:
Modified: arkaiv/trunk/data/templates/collectionexpanded.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/collections.mak.py
===================================================================
--- arkaiv/trunk/data/templates/collections.mak.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/data/templates/collections.mak.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189166207.9120071
-_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/collections.mak'
+_modified_time = 1189555169.8412819
+_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/collections.mak'
_template_uri='/collections.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -33,23 +33,20 @@
# SOURCE LINE 7
context.write(u'<li>\n ')
# SOURCE LINE 8
- context.write(unicode(coll[0]))
- context.write(u' \n ')
- # SOURCE LINE 9
- context.write(unicode( h.link_to(coll[1], h.url(action="displaycollection", edit="no", id=coll[0], name=coll[1])) ))
+ context.write(unicode( h.link_to(coll['name'], h.url(action="displaycollection", edit="no", id=coll['index'], name=coll['name'])) ))
context.write(u'\n</li>\n')
- # SOURCE LINE 12
+ # SOURCE LINE 11
context.write(u'\n<hr>\nAdd new collection:\n')
- # SOURCE LINE 15
+ # SOURCE LINE 14
context.write(unicode( h.form(h.url(action='addcollection'), multipart=True) ))
context.write(u' \n')
- # SOURCE LINE 16
+ # SOURCE LINE 15
context.write(unicode( h.text_field('newcollection') ))
context.write(u'\n')
- # SOURCE LINE 17
+ # SOURCE LINE 16
context.write(unicode( h.submit('Add') ))
context.write(u' \n')
- # SOURCE LINE 18
+ # SOURCE LINE 17
context.write(unicode( h.end_form() ))
context.write(u' \n\n')
return ''
Modified: arkaiv/trunk/data/templates/collections.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/displayitem.mak.py
===================================================================
--- arkaiv/trunk/data/templates/displayitem.mak.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/data/templates/displayitem.mak.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189169167.6441259
-_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/displayitem.mak'
+_modified_time = 1189493212.3808031
+_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/displayitem.mak'
_template_uri='/displayitem.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
Modified: arkaiv/trunk/data/templates/displayitem.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/data/templates/mainpage.mak.py
===================================================================
--- arkaiv/trunk/data/templates/mainpage.mak.py 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/data/templates/mainpage.mak.py 2007-09-12 00:54:27 UTC (rev 3235)
@@ -1,8 +1,8 @@
from mako import runtime, filters, cache
UNDEFINED = runtime.UNDEFINED
_magic_number = 2
-_modified_time = 1189166140.539227
-_template_filename='/home/dcrowdy/src/working/arkaiv/trunk/arkaiv/templates/mainpage.mak'
+_modified_time = 1189553891.345228
+_template_filename='/home/dcrowdy/src/working/trunk/arkaiv/templates/mainpage.mak'
_template_uri='/mainpage.mak'
_template_cache=cache.Cache(__name__, _modified_time)
_source_encoding=None
@@ -31,14 +31,11 @@
# SOURCE LINE 6
for item in c.items:
# SOURCE LINE 7
- context.write(u'<li>\n <!--')
+ context.write(u'<li>\n ')
# SOURCE LINE 8
- context.write(unicode(item.ixi))
- context.write(u'-->\n ')
- # SOURCE LINE 9
- context.write(unicode( h.link_to(item.name, h.url(action="displayitem", edit="no", id=item[0])) ))
+ context.write(unicode( h.link_to(item['name'], h.url(action="displayitem", edit="no", id=item['index'])) ))
context.write(u'\n</li>\n')
- # SOURCE LINE 12
+ # SOURCE LINE 11
context.write(u'\n\n')
return ''
finally:
Modified: arkaiv/trunk/data/templates/mainpage.mak.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/development.ini
===================================================================
--- arkaiv/trunk/development.ini 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/development.ini 2007-09-12 00:54:27 UTC (rev 3235)
@@ -22,7 +22,7 @@
cache_dir = %(here)s/data
beaker.session.key = arkaiv
beaker.session.secret = somesecret
-sqlalchemy.default.uri = sqlite:///arkaiv.db
+sqlalchemy.url = sqlite:///arkaiv.db
sqlalchemy.echo = true
authkit.enable = true
authkit.method = digest
Modified: arkaiv/trunk/ez_setup/__init__.pyc
===================================================================
(Binary files differ)
Modified: arkaiv/trunk/setup.cfg
===================================================================
--- arkaiv/trunk/setup.cfg 2007-09-11 21:56:42 UTC (rev 3234)
+++ arkaiv/trunk/setup.cfg 2007-09-12 00:54:27 UTC (rev 3235)
@@ -21,7 +21,7 @@
organization = Pylons
# Highlight code-block sections with Pygments
-highlighter = pygments
+#highlighter = pygments
# Optionally add extra links
#organization_url = http://pylonshq.com/
More information about the commits
mailing list