Mercurial Mercurial > platform / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace href by url in JSON
authorverrierj
Fri, 17 Feb 2012 10:32:06 +0100
changeset 572 10c26c22b76a
parent 571 0f892a78b75c
child 573 7525046c6e7a
child 574 1ed2c41e3aae
Replace href by url in JSON
src/ldt/ldt/ldt_utils/projectserializer.py file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/segmentserializer.py file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/ldt_utils/projectserializer.py	Fri Feb 17 10:23:44 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/projectserializer.py	Fri Feb 17 10:32:06 2012 +0100
@@ -372,21 +372,21 @@
         if len(res) > 0:
             content_date = res[0]
 
-        href = ""
+        url = ""
         meta_item_value = ""
         
         if use_forbidden_url(content):   
-            href = settings.FORBIDDEN_STREAM_URL
+            url = settings.FORBIDDEN_STREAM_URL
         elif content.videopath:
-            href = content.videopath.rstrip('/') + "/" + content.src
+            url = content.videopath.rstrip('/') + "/" + content.src
             meta_item_value = content.videopath.rstrip('/') + "/"
         else:
-            href = content.src
+            url = content.src
 
         new_media = {
              "http://advene.liris.cnrs.fr/ns/frame_of_reference/ms" : "o=0",
              "id" : content.iri_id,
-             "href" : href,
+             "url" : url,
              "unit" : "ms",
              "origin" : "0",
              "meta": {
--- a/src/ldt/ldt/ldt_utils/segmentserializer.py	Fri Feb 17 10:23:44 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/segmentserializer.py	Fri Feb 17 10:32:06 2012 +0100
@@ -95,21 +95,21 @@
     
     def __parse_content(self):
         
-        href = ""
+        url = ""
         meta_item_value = ""
             
         if use_forbidden_url(self.content):
-            href = settings.FORBIDDEN_STREAM_URL
+            url = settings.FORBIDDEN_STREAM_URL
         elif self.content.videopath:
-            href = self.content.videopath.rstrip('/') + "/" + self.content.src
+            url = self.content.videopath.rstrip('/') + "/" + self.content.src
             meta_item_value = self.content.videopath.rstrip('/') + "/"
         else:
-            href = self.content.src
+            url = self.content.src
         
         media = {
              "http://advene.liris.cnrs.fr/ns/frame_of_reference/ms" : "o=0",
              "id" : self.content.iri_id,
-             "href" : href,
+             "url" : url,
              "unit" : "ms",
              "origin" : "0",
              "meta": {
platform