projects
/
treecutter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xml: change from amara to lxml
[treecutter.git]
/
treecutter
/
sitemap.py
diff --git
a/treecutter/sitemap.py
b/treecutter/sitemap.py
index 688cb0cdaad079970c8e7657cf38efab1e5893f0..a8612f23b9ba9b1c1955bd370af771b59a008b9f 100644
(file)
--- a/
treecutter/sitemap.py
+++ b/
treecutter/sitemap.py
@@
-4,8
+4,10
@@
import re
import shutil
import gettext
import tempfile
import shutil
import gettext
import tempfile
-from amara import bindery
+from lxml import etree
+from lxml.builder import ElementMaker
from time import time
from time import time
+from treecutter import constants as const
from treecutter.trie import Trie
from treecutter.link import Link
from treecutter.tools import ssh_cmd, publish, mkdir_p
from treecutter.trie import Trie
from treecutter.link import Link
from treecutter.tools import ssh_cmd, publish, mkdir_p
@@
-16,7
+18,7
@@
class Sitemap():
self._file = 'sitemap.txt'
self._tree = Trie()
self._sitelang = set()
self._file = 'sitemap.txt'
self._tree = Trie()
self._sitelang = set()
- self._isocode =
bindery
.parse('/usr/share/xml/iso-codes/iso_639_3.xml')
+ self._isocode =
etree
.parse('/usr/share/xml/iso-codes/iso_639_3.xml')
self._tranlang = {}
self._tmptarget = tempfile.mkdtemp()+'/'
self._tranlang = {}
self._tmptarget = tempfile.mkdtemp()+'/'
@@
-101,19
+103,20
@@
class Sitemap():
return self._tree.menu(lang,page,cssclass)
def lang_menu(self,lang,link):
return self._tree.menu(lang,page,cssclass)
def lang_menu(self,lang,link):
- html = "<ul>"
+ html = ElementMaker(namespace=const.HTML_NS)
+ menu = html.ul()
for l in link.languages():
isoxml = u"//iso_639_3_entry[@*='"+l+"']"
for l in link.languages():
isoxml = u"//iso_639_3_entry[@*='"+l+"']"
- ln = self._isocode.x
ml_select(isoxml)[0].name
+ ln = self._isocode.x
path(isoxml)[0].get('name')
if lang != 'en':
ln = self._tranlang[lang].gettext(ln)
p = link.link()
if p[-1] == '/':
p = p +'index'
p = p+'.'+l
if lang != 'en':
ln = self._tranlang[lang].gettext(ln)
p = link.link()
if p[-1] == '/':
p = p +'index'
p = p+'.'+l
-
html += '<li><a href="%s" hreflang="%s">%s</a></li>' % (p, l, ln
)
- html += "</ul>"
- return
html
+
li = html.li(html.a(ln,href=p,hreflang=l)
)
+ menu.append(li)
+ return
etree.tostring(menu,encoding='UTF-8',pretty_print=False)
def publish(self,output,style):
ssh_cmd(output,"mkdir -p")
def publish(self,output,style):
ssh_cmd(output,"mkdir -p")