--- OSAS/OSA_system/zpt/index_meta.zpt	2005/01/20 13:38:03	1.2
+++ OSAS/OSA_system/zpt/index_meta.zpt	2006/08/17 17:19:05	1.7
@@ -1,14 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resource xmlns:tal="http://xml.zope.org/namespaces/tal" type="MPIWG" tal:define="global add_metadata here/REQUEST/SESSION/add_metadata">
-	<description tal:content="python:add_metadata['description']">SHORT SOURCE DESCRIPTION</description>
-	<archive-creation-date tal:content="python:add_metadata['archive-creation-date']">CREATION DATE</archive-creation-date>
+	<description tal:content="python:add_metadata['description'].decode('utf-8')">SHORT SOURCE DESCRIPTION</description>
+	<archive-creation-date tal:content="python:add_metadata['archive-creation-date'].decode('utf-8')">CREATION DATE</archive-creation-date>
 	<name tal:content="python:add_metadata['folder_name']">FOLDER NAME</name>
 	<archive-path tal:content="python:add_metadata['archive-path']+'/'+add_metadata['folder_name']">ARCHIVE PATH</archive-path>
-	<creator tal:content="python:add_metadata['creator']">CREATOR</creator>
-	<content-type tal:content="python:add_metadata['content-type']">CREATOR</content-type>
+	<creator tal:content="python:add_metadata['creator'].decode('utf-8')">CREATOR</creator>
+	<content-type tal:content="python:add_metadata['content-type'].decode('utf-8')">CONTENT</content-type>
+    <derived-from tal:condition="python:add_metadata['derived-from']">
+      <archive-path tal:content="python:add_metadata['derived-from'].decode('utf-8')"/>
+    </derived-from>
 	<meta tal:condition="python:len(here.metadataprint)>0">
 		<bib type="XX" tal:attributes="type python:here.reftype">
 		 <span tal:replace="structure python:here.metadataprint.decode('utf-8')"/> 
 		</bib>
+      <access-conditions tal:condition="python:add_metadata['access-type']">
+        <access tal:condition="python:add_metadata['access-type']=='free'" type="free"/>
+        <access tal:condition="python:add_metadata['access-type']!='free'" type="institution">
+          <name tal:content="python:add_metadata['access-type'].decode('utf-8')"/>
+        </access>
+      </access-conditions>
 	</meta>
 </resource>