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.
add request to generate init with https V01.56.08
authorymh <ymh.work@gmail.com>
Sun, 19 Jul 2015 19:49:50 +0200
changeset 1400 9e4cf0a50d93
parent 1399 79c05c095db2
child 1401 c580e29828be
add request to generate init with https
src/ldt/ldt/__init__.py file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/searchutils.py file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/utils.py file | annotate | diff | comparison | revisions
src/ldt/ldt/ldt_utils/views/lignesdetemps.py file | annotate | diff | comparison | revisions
src/ldt/ldt/utils/url.py file | annotate | diff | comparison | revisions 
--- a/src/ldt/ldt/__init__.py	Sun Jul 19 09:19:19 2015 +0200
+++ b/src/ldt/ldt/__init__.py	Sun Jul 19 19:49:50 2015 +0200
@@ -1,6 +1,6 @@
 __all__ = ["VERSION", "get_version", "__version__"]
 
-VERSION = (1, 56, 07, "final", 0)
+VERSION = (1, 56, 8, "final", 0)
 
 
 def get_version():
--- a/src/ldt/ldt/ldt_utils/searchutils.py	Sun Jul 19 09:19:19 2015 +0200
+++ b/src/ldt/ldt/ldt_utils/searchutils.py	Sun Jul 19 19:49:50 2015 +0200
@@ -40,7 +40,7 @@
         
         
           
-    ldtgen = LdtUtils()
+    ldtgen = LdtUtils(request)
     #            generate_ldt(contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None):
     logger.debug("search_generate_ldt : generate ldt")
     doc = ldtgen.generate_ldt(contentList, title=u"Recherche : " + queryStr, projects=projectList, types_id_list=typesId_list)
--- a/src/ldt/ldt/ldt_utils/utils.py	Sun Jul 19 09:19:19 2015 +0200
+++ b/src/ldt/ldt/ldt_utils/utils.py	Sun Jul 19 19:49:50 2015 +0200
@@ -6,7 +6,7 @@
 import lxml.etree #@UnresolvedImport
 import uuid
 from ldt.utils.url import request_with_auth
-from ldt.utils.url import absurl_norequest
+from ldt.utils.url import absurl
 
 import logging
 logger = logging.getLogger(__name__)
@@ -41,6 +41,9 @@
 
 class LdtUtils(object):
     
+    def __init__(self, request=None):
+        self.request = request
+    
     def generate_ldt(self, contentList, title=u"", author=u"IRI Web", web_url=u"", startSegment=None, projects=None, types_id_list=None):
 
         iri = lxml.etree.Element(u'iri')
@@ -149,9 +152,9 @@
         elementFiles = lxml.etree.SubElement(iri, 'files')    
         elementInit = lxml.etree.SubElement(elementFiles, 'init')
         elementfile = lxml.etree.SubElement(elementInit, 'file')   
-        elementfile.set('src', absurl_norequest(method, kwargs=url))
+        elementfile.set('src', absurl(self.request, method, kwargs=url))
         if(search):
-            elementfile.set("segsel", absurl_norequest(search, kwargs=url))
+            elementfile.set("segsel", absurl(self.request, search, kwargs=url))
 
         lxml.etree.SubElement(elementFiles, 'recent')
         lxml.etree.SubElement(elementFiles, 'library')
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Sun Jul 19 09:19:19 2015 +0200
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Sun Jul 19 19:49:50 2015 +0200
@@ -36,7 +36,7 @@
 
 def search_init(request, field, query):
     
-    ldtgen = LdtUtils()
+    ldtgen = LdtUtils(request)
     
     doc = ldtgen.generate_init({'field':field, 'query':query}, 'ldt.ldt_utils.views.lignesdetemps.search_ldt', 'ldt.ldt_utils.views.lignesdetemps.search_segments')
     
@@ -105,7 +105,7 @@
     if project_id != u"_":
         get_object_or_404(Project.safe_objects, ldt_id=project_id)
     
-    ldtgen = LdtUtils()
+    ldtgen = LdtUtils(request)
     doc = ldtgen.generate_init({'project_id':project_id, 'content_id':content_id, 'ensemble_id':ensemble_id, 'cutting_id':cutting_id, 'segment_id':segment_id}, 'ldt.ldt_utils.views.lignesdetemps.ldt_segment', 'ldt.ldt_utils.views.lignesdetemps.highlight_segment')
     return HttpResponse(lxml.etree.tostring(lxml.etree.ElementTree(doc), pretty_print=True), content_type="text/xml;charset=utf-8")
 
@@ -167,7 +167,7 @@
         resp.write(lxml.etree.tostring(ldtdoc, xml_declaration=True, encoding='utf-8', pretty_print=True))
     else:
         # generate ldt from 
-        ldtgen = LdtUtils()
+        ldtgen = LdtUtils(request)
         content_list = Content.safe_objects.filter(iri_id=content_id)
         if request.user and request.user.username:
             username = request.user.username
@@ -247,7 +247,7 @@
     
     
 def init(request, method, url):
-    ldtgen = LdtUtils()
+    ldtgen = LdtUtils(request)
     if method in ["init","index","ldt"]:
         param = "url"
     else:
@@ -382,7 +382,7 @@
 
     contentList = Content.safe_objects.filter(iri_id=url) #@UndefinedVariable
 
-    ldtgen = LdtUtils()
+    ldtgen = LdtUtils(request)
     doc = ldtgen.generate_ldt(contentList, title=contentList[0].title, startSegment=startSegment)
     doc = set_forbidden_stream(doc, request.user)
     doc = absolute_src_xml(doc)
--- a/src/ldt/ldt/utils/url.py	Sun Jul 19 09:19:19 2015 +0200
+++ b/src/ldt/ldt/utils/url.py	Sun Jul 19 19:49:50 2015 +0200
@@ -29,10 +29,6 @@
     path=reverse(viewname, urlconf, args, kwargs, prefix, current_app)
     return urlparse.urljoin(domain, path)
 
-def absurl_norequest(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current_app=None):
-    domain=get_web_url()
-    path=reverse(viewname, urlconf, args, kwargs, prefix, current_app)
-    return urlparse.urljoin(domain, path)
 
 def request_with_auth(url, method='GET'):
     h = httplib2.Http(disable_ssl_certificate_validation=settings.HTTPLIB2_DISABLE_SSL_CERTIFICATE_VALIDATION)
platform