--- ECHO_content/vlp_xmlhelpers.py	2007/07/24 09:11:46	1.11
+++ ECHO_content/vlp_xmlhelpers.py	2007/12/11 17:00:01	1.13
@@ -187,7 +187,7 @@ def checkRef(self,ref):
         return res
     
 def link2html(self,str):
-        """link2html liks in html wandeln"""
+        """link2html links in html wandeln"""
         if str:
 
             str=re.sub("\&","&",str)
@@ -199,13 +199,17 @@ def link2html(self,str):
                 link.tagName="a"
                 ref=link.getAttribute("ref")
                 pn=link.getAttribute("page")
+                mk=link.getAttribute("mk")
                         
                 if self.checkRef(ref):
-                        if pn:
-                                link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref+"&page="+pn)
-                        else:
-                                link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref)
-
+                    more = ""
+                    if pn:
+                        more += "&page=%s"%pn
+                        
+                    if mk:
+                        more += "&mk=%s"%mk
+                        
+                    link.setAttribute("href",self.REQUEST['SERVER_URL']+"/references?id="+ref+more)
 
             newxml=dom.toxml('utf-8')
           
@@ -221,7 +225,7 @@ def related2html(self,str):
     if str:
                 
         str=re.sub("\&","&",str)
-        dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+str+"</txt>")
+        dom=xml.dom.minidom.parseString("<?xml version='1.0' encoding='utf-8'?><txt>"+utf8ify(str)+"</txt>")
         links=dom.getElementsByTagName("link")
                 
         for link in links:
@@ -249,7 +253,7 @@ def related2html(self,str):
 
                 else:
                     # item nur als bibliographische angabe vorhanden
-                    link.setAttribute("alt", res[0]['fullreference'].decode('utf-8'))
+                    link.setAttribute("alt", unicodify(res[0]['fullreference']))
                     link.setAttribute("title", "click to expand")
                     link.setAttribute("onclick", "return toggle(this);")
                     link.setAttribute("class", "x_offline")
@@ -262,9 +266,9 @@ def related2html(self,str):
                 
         retStr=regexpTXT.search(newxml)
         retStr = retStr.group(1)
-
+        #logging.debug("related2html out=%s"%repr(retStr))
         return retStr.decode('utf-8') # we return unicode
-                                           
+
     return u""