--- OSA_system2/OSAS_helpers.py	2004/11/29 09:48:07	1.1
+++ OSA_system2/OSAS_helpers.py	2005/02/11 16:27:01	1.4
@@ -2,10 +2,12 @@
 import os.path
 from types import *
 import xml.dom.minidom
+import zLOG
 
-OSASObjectTypes=['OSAS_metaDataFile','OSAS_dir','OSAS_file','OSAS_imageFolder']
+OSASObjectTypes=['OSAS_metaDataFile','OSAS_dir','OSAS_file','OSAS_imageFolder','OSAS_dir_archive','OSAS_file_archive']
 OSASExcludedFiles=['TheVolumeSettingsFolder','TheFindByContentFolder']
 
+
 def getText(nodelist):
     """gibt text aus nodelist"""
     rc = ""
@@ -14,62 +16,59 @@ def getText(nodelist):
            rc = rc + node.data
     return rc
 
-def getMetaFile(path):
+def getMetaInfoFromXML(path,xmlInfo):
     """get index.meta and translate it to HTML"""
     html=[]
-    if not os.path.exists(path+"/index.meta"):
-          
-          return "NO_METADATA"
-    else:
-       f = os.popen("cat "+path+"/index.meta","r")
-       lines = f.read()
-       dom = xml.dom.minidom.parseString(lines)
-       try:
-           name=getText(dom.getElementsByTagName("name")[0].childNodes)
-       except:
-           name="NOT_DEFINED!!!"
-       try:
-           creator=getText(dom.getElementsByTagName("creator")[0].childNodes)
-       except:
-           creator="NOT_DEFINED!!!"
-
-       try:
-           creation_date=getText(dom.getElementsByTagName("archive-creation-date")[0].childNodes)
-       except:
-           creation_date="NOT_DEFINED!!!"
-
-       try:
-           description=getText(dom.getElementsByTagName("description")[0].childNodes)
-       except:
-           description="NOT_DEFINED!!!"
-           
-       try:
-       	type=getText(dom.getElementsByTagName("content-type")[0].childNodes) 
-       except:
+    
+    dom = xml.dom.minidom.parseString(xmlInfo)
+    try:
+        name=getText(dom.getElementsByTagName("name")[0].childNodes)
+    except:
+        name="NOT_DEFINED!!!"
+    try:
+        creator=getText(dom.getElementsByTagName("creator")[0].childNodes)
+    except:
+        creator="NOT_DEFINED!!!"
+
+    try:
+        creation_date=getText(dom.getElementsByTagName("archive-creation-date")[0].childNodes)
+    except:
+        creation_date="NOT_DEFINED!!!"
+
+    try:
+        description=getText(dom.getElementsByTagName("description")[0].childNodes)
+    except:
+        description="NOT_DEFINED!!!"
+
+    try:
+        type=getText(dom.getElementsByTagName("content-type")[0].childNodes) 
+    except:
         type=""
-       if type=="scanned document":
-		html="<h3>Document: "+name+"</h3>"
-       elif type=="folder":
-		html="<h3>Folder: "+name+"</h3>"
-       else:
-       		html="<h3>Document: "+name+"</h3>"
-
-       html=html+"<p><i>created by: "+creator+" at: "+creation_date+"</i></p>" 
-       html=html+"<h4>Description</h4><p>"+description+"</p>"
-       try:
+    if type=="scanned document":
+        html="<h3>Document: "+name+"</h3>"
+    elif type=="folder":
+        html="<h3>Folder: "+name+"</h3>"
+    else:
+        html="<h3>Document: "+name+"</h3>"
+
+    html=html+"<p><i>created by: "+creator+" at: "+creation_date+"</i></p>" 
+    html=html+"<h4>Description</h4><p>"+description+"</p>"
+    try:
         bib = dom.getElementsByTagName("meta")[0].getElementsByTagName("bib")[0]
         if bib.attributes.has_key('type'):
-	  html=html+"<h4>Info ("+bib.attributes['type'].value+")</h4>"
-	else:
-	  html=html+"<h4>Info</h4>"
+            html=html+"<h4>Info ("+bib.attributes['type'].value+")</h4>"
+        else:
+            html=html+"<h4>Info</h4>"
         html=html+getBib(bib.childNodes)
-        
-       except:
+
+    except:
         """none"""
        
 #        html=html.encode('utf-8','replace')+getBib(bib.childNodes).encode('utf-8','replace')
-       
-       return html.encode('utf-8')
+
+    
+    return html
+
 
 def getBib(nodelist):
     """ translate bibliographical entries """