[xiph-commits] r3218 - in arkaiv/trunk/arkaiv: controllers model

[dcrowdy at svn.annodex.net]

Author: dcrowdy
Date: 2007-09-02 23:42:52 -0700 (Sun, 02 Sep 2007)
New Revision: 3218

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
Log:
Fixed bug when importing an existing cmml file - clip id's were being clonked by start times due to previous changes. Fixed redirect after adding media.


Modified: arkaiv/trunk/arkaiv/controllers/page.py
===================================================================
--- arkaiv/trunk/arkaiv/controllers/page.py	2007-09-03 05:16:15 UTC (rev 3217)
+++ arkaiv/trunk/arkaiv/controllers/page.py	2007-09-03 06:42:52 UTC (rev 3218)
@@ -102,6 +102,7 @@
         toedit = request.params['edit']
         try:
             c.playclip = request.params['playclip']
+            print c.playclip
         except:
             c.playclip = ""
 
@@ -274,7 +275,7 @@
 
         self.__addmediatoarchive(cmmlsource, oggsource)
 
-        return render('/mainpage.mak')
+        redirect_to(action='mainpage')
 
     def __addmediatoarchive(self, cmmlsource, oggsource):
         # Deal with the cmml file
@@ -353,6 +354,7 @@
                 clipdict['img_src'] = ""
             model.addclip(clipdict)
 
+        print cliplist
         # Extract meta info from the head and add to database
         metalist = parser.getheadinfofromcmml(newcmmlname)
         for metadict in metalist:

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-03 05:16:15 UTC (rev 3217)
+++ arkaiv/trunk/arkaiv/model/__init__.py	2007-09-03 06:42:52 UTC (rev 3218)
@@ -403,6 +403,7 @@
         clipinfo['ixc'] = c.ixc
         clipinfo['start_time'] = c.start_time
         clipinfo['id'] = c.id
+        print c.id
         clipinfo['a_href'] = c.a_href
         clipinfo['a_text'] = c.a_text
         clipinfo['img_src'] = c.img_src
@@ -511,7 +512,7 @@
     i = item_q.get_by(ixi=info['itemid'])
     new_clip = Clip()
     new_clip.start_time = info['starttime']
-    new_clip.id = info['starttime']
+    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']

Modified: arkaiv/trunk/arkaiv/model/__init__.pyc
===================================================================
(Binary files differ)