--- ZSQLExtend/ZSQLExtend.py	2005/02/23 14:53:57	1.61
+++ ZSQLExtend/ZSQLExtend.py	2005/04/27 19:36:01	1.63
@@ -11,6 +11,8 @@ from Products.PageTemplates.ZopePageTemp
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from Products.ZSQLMethods.SQL import SQLConnectionIDs
+from xml.sax.saxutils import escape
+from types import *
 import Shared.DC.ZRDB.DA
 import zLOG
 import os.path
@@ -249,7 +251,7 @@ class ZSQLExtendFolder(Folder,Persistent
         ret+="""</select>"""
         return ret
 
-    def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None):
+    def ZSQLOptionsFromSearchList(self,fieldname,results,fieldName,valueName=None,start=None, multiple='',startValue=None,additionalSelect="",size=None,linelen=None):
         """generate select options form a search list
         es wird
         <select name=fieldname mutiple>
@@ -283,7 +285,13 @@ class ZSQLExtendFolder(Folder,Persistent
             field=getattr(result,fieldName)
             fieldValue=getattr(result,valueName)
             if fieldValue:
-                ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+                if not linelen:
+                    ret+="""<option value="%s">%s</option>"""%(field,fieldValue)
+                else:
+                    mist = """%s"""%(fieldValue)
+                    if len(mist) > string.atoi(linelen):
+                        mist = mist[:string.atoi(linelen)]
+                    ret+="""<option value="%s">%s</option>"""%(field,mist)
         ret+="""</select>"""
         return ret
 
@@ -1288,20 +1296,28 @@ class ZSQLBibliography(Folder,ZSQLExtend
 
         return retdata,fieldlist
 
-    def createRDFTag(self,tag,content,namespace="ns"):
+    def createRDFTag(self,tag,content,namespace="cdli"):
         """create RDF"""
         if content:
             tag=namespace+":"+tag
-            ret=""" <%s>%s</%s>"""%(tag,content,tag)
+            if (type(content) is StringType) or (type(content) is UnicodeType):
+                ret=""" <%s>%s</%s>"""%(tag,escape(content),tag)
+            else:
+                ret=""" <%s>%s</%s>"""%(tag,content,tag)
             return ret.decode('latin-1')
         else:
             return ""
     
     def createIndexTag(self,tag,content):
         """create tag"""
+        
         if content:
-            ret="""<%s>%s</%s>"""%(tag,content,tag)
-            return ret
+            if (type(content) is StringType) or (type(content) is UnicodeType):
+                ret=""" <%s>%s</%s>"""%(tag,escape(content),tag)
+            else:
+                ret=""" <%s>%s</%s>"""%(tag,content,tag)
+            return ret.decode('latin-1')
+
         else:
             return ""