Changeset 3218

Timestamp:

2007-09-02 23:42:52 (1 year ago)

Author:

dcrowdy

Message:

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.

Files:

• arkaiv/trunk/arkaiv/controllers/page.py (modified) (3 diffs)
• arkaiv/trunk/arkaiv/controllers/page.pyc (modified) (previous)
• arkaiv/trunk/arkaiv/model/__init__.py (modified) (2 diffs)
• arkaiv/trunk/arkaiv/model/__init__.pyc (modified) (previous)

arkaiv/trunk/arkaiv/controllers/page.py

@@ -103 +103 @@
-        try:
-            c.playclip = request.params['playclip']
+            print c.playclip
-        except:
-            c.playclip = ""
@@ -275 +276 @@
-        self.__addmediatoarchive(cmmlsource, oggsource)
-
-turn render('/mainpage.mak
+direct_to(action='mainpage
-
-    def __addmediatoarchive(self, cmmlsource, oggsource):
@@ -354 +355 @@
-            model.addclip(clipdict)
-
+        print cliplist
-        # Extract meta info from the head and add to database
-        metalist = parser.getheadinfofromcmml(newcmmlname)

arkaiv/trunk/arkaiv/model/__init__.py

@@ -404 +404 @@
-        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
@@ -512 +513 @@
-    new_clip = Clip()
-    new_clip.start_time = info['starttime']
-starttime
+id
-    new_clip.a_href = info['a_href']
-    new_clip.a_text = info['a_text']