--- ECHO_content/VLPExtension.py	2004/11/18 12:35:48	1.33
+++ ECHO_content/VLPExtension.py	2005/02/28 14:09:55	1.40
@@ -371,11 +371,10 @@ class VLP_collection(ECHO_collection):
 		if not hasattr(self,fileName):
 			newObj=VLP_resource(fileName,'',metalink,fileName,fileName,fileName,'generated','book','','','','','','')
 			self._setObject(fileName,newObj)
-                
+                RESPONSE.write("got: %s\n"%fileName)
                 genObj=getattr(self,fileName)
                 genObj.createIndexFile()
-                
-                
+
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
@@ -439,14 +438,25 @@ class VLP_resource(ECHO_resource,Cacheab
     
     referencetypes=[]
 
-    manage_options=ECHO_resource.manage_options+(
+    manage_options=ECHO_resource.manage_options+Cacheable.manage_options+(
         {'label':'Update Index','action':'createIndexFile'},
         {'label':'Reset MetaLink','action':'resetMetaLink'},
         {'label':'Generate Title','action':'generate_title'},
 	{'label':'Generate Library Template','action':'generateLibraryTemplateHTML'},
         )
 
+
+    def getImagePath(self):
+	    """Pfad zu den Images"""
+	    if os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pageimg')):
+		    return os.path.join(self.vlp_basis,self.resourceID,'pageimg')
+	    elif os.path.isdir(os.path.join(self.vlp_basis,self.resourceID,'pagesHi')):
+		    return os.path.join(self.vlp_basis,self.resourceID,'pagesHi')
+	    else:
+		    return "<error>no images </error>"
     
+
+	    
     def transcription(self):
 	    """show the rendered transcriptiofile"""
 	    
@@ -461,32 +471,39 @@ class VLP_resource(ECHO_resource,Cacheab
 
     def copyTranscriptionFromDB(self):
 	    """checks if transcription exits in DB"""
-	    founds=self.search(var='select * from vl_transcript where source=\''+self.resourceID+'\' order by id')
+	    founds=self.ZSQLSimpleSearch('select * from vl_transcript where source=\''+self.resourceID+'\' order by id')
+
 
-	    
 	    ret="""<?xml version="1.0" encoding="utf-8"?>
                <text>"""
         
 	    if founds:
 		    
 		    for found in founds:
+			
 			    text=found.transcript
 			    if not text: text=""
 			    ret+="<page><pb/>"+text+"</page>"
 
 		    ret+="</text>"
 		    re2=ret[0:]
-		    re3=re2.decode('latin-1')
-		    
+		    re3=re2.decode('latin-1').encode('utf-8')
+		    #re3=re2
 		    ft=self.ZopeFind(self,obj_metatypes=['ECHO_fullText'])
 		    
 		    if ft:
 			
-			    ft[0][1].pt_edit(re3.encode('utf-8','ignore'),'text/xml')
+			    ft[0][1].pt_edit(re3,'text/xml')
 			
 		    else:
-			    self._setObject('fulltext',ECHO_fullText(id,re3))
-			
+	
+			    self._setObject('fulltext',ECHO_fullText(id,''))
+
+	                    try:
+			    	getattr(self,'fulltext').pt_edit(re3.encode('utf-8','ignore'),'text/xml')
+			    except:
+                                getattr(self,'fulltext').pt_edit(re3.encode('latin-1').decode('utf-8'),'text/xml')
+
 		    return "FT: %s"%self.getId()
 	    else:
 		    return "no: %s"%self.getId()
@@ -517,8 +534,14 @@ class VLP_resource(ECHO_resource,Cacheab
         pt=PageTemplateFile(os.path.join(package_home(globals()),'vlp','library_template.zpt')).__of__(self)
         pt.content_type="text/html"
         return pt()
-    
-    index_html=show
+
+    def index_html(self):
+	    """index_html"""
+	    #return self.REQUEST
+	    if not self.REQUEST.has_key("ws"):
+		    self.REQUEST.form["ws"]="1.5"
+
+	    return self.show()
 
     def generateLibraryTemplateHTML(self,RESPONSE=None):
         """lege standard index.html an"""
@@ -650,7 +673,6 @@ class VLP_resource(ECHO_resource,Cacheab
             result = self.ZCacheable_get(view_name=url)
             if result is not None:
                 # Got a cached value.
-		print "CACHEXX"
                 return result
 
         pagelist=[]