--- OSAS/OSA_system/OSAS_addfiles.py 2004/04/15 21:30:42 1.29
+++ OSAS/OSA_system/OSAS_addfiles.py 2004/10/04 12:57:03 1.37
@@ -76,6 +76,7 @@ class OSAS_add_Document(Folder):
def add4(self):
"""Applet"""
+
return OSAS_add.add4(self)
def add5(self):
@@ -92,9 +93,44 @@ class OSAS_add_Document(Folder):
metadata['archive-creation-date']=OSAS_add.date(self)
metadata['creator']=self.REQUEST['creator']
metadata['description']=self.REQUEST['content_description']
- metadata['archive-path']=os.path.split(self.REQUEST.SESSION['path'])[0]
+ metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0]
+ #metadata['folder_name']=self.REQUEST.SESSION['folder_name']
+ metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1]
+ metadata['content-type']="fulltext document"
+ self.reftype=self.REQUEST.SESSION['reftype']
+ self.REQUEST.SESSION['add_metadata']=metadata
+ self.add_metadata=metadata
+ self.metadata=self.REQUEST.SESSION['metadata']
+ self.metadataprint=""
+ for tag in self.metadata.keys():
+
+ #print str(self.metadata[tag]).decode('utf-8').encode('utf-8')
+ self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"\n"
+
+ newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
+ newtemplate.content_type="text/plain"
+ renderxml = newtemplate(encoding='utf-8')
+ #return renderxml
+ metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
+
+ f=open(metapath,'w')
+
+ f.write(renderxml)
+ f.close()
+ os.chmod(metapath,0664)
+ os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name'])
+
+ return OSAS_add.addText2(self)
+
+ def addPdf2(self):
+ """add only a pdf"""
+ metadata=OSAS_add.parse_query_string(self.REQUEST['QUERY_STRING'])
+ metadata['archive-creation-date']=OSAS_add.date(self)
+ metadata['creator']=self.REQUEST['creator']
+ metadata['description']=self.REQUEST['content_description']
+ metadata['archive-path']=os.path.split(self.REQUEST.SESSION['pathnew'])[0]
#metadata['folder_name']=self.REQUEST.SESSION['folder_name']
- metadata['folder_name']=os.path.split(self.REQUEST.SESSION['path'])[1]
+ metadata['folder_name']=os.path.split(self.REQUEST.SESSION['pathnew'])[1]
metadata['content-type']="fulltext document"
self.reftype=self.REQUEST.SESSION['reftype']
self.REQUEST.SESSION['add_metadata']=metadata
@@ -106,17 +142,17 @@ class OSAS_add_Document(Folder):
newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
newtemplate.content_type="text/plain"
- renderxml = newtemplate()
- metapath=self.REQUEST.SESSION['path']+"/index.meta"
+ renderxml = newtemplate(encoding='utf-8')
+ metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
f=open(metapath,'w')
- f.writelines(renderxml)
+ f.write(renderxml)
f.close()
os.chmod(metapath,0664)
os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name'])
- return OSAS_add.addText2(self)
+ return OSAS_add.addPdf2(self)
def addImages(self,path):
"""Hinzufügen eines neuen Imagesfolders"""
@@ -172,6 +208,14 @@ class OSAS_add_Text(Folder):
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+ def addPdf(self,path):
+ """Add a pdf"""
+ return OSAS_add.addPdf(self,path)
+
+ def addPdf2(self):
+ """Read the file and store it"""
+ return OSAS_add.addPdf2(self)
+
def addText(self,path):
"""Add a fulltext"""
return OSAS_add.addText(self,path)
@@ -179,6 +223,7 @@ class OSAS_add_Text(Folder):
def addText2(self):
"""Read the file and store it"""
return OSAS_add.addText2(self)
+
def manage_AddOSAS_add_TextForm(self):
"""interface for adding the OSAS_add_Metadata"""
pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_text.zpt').__of__(self)
@@ -206,7 +251,6 @@ class OSAS_add_contextData(Folder):
def XmlToTree(self,URL):
"""Collection XML to Tree"""
-
class requestHandler(ContentHandler):
def __init__(self):
self.depth=0
@@ -221,7 +265,7 @@ class OSAS_add_contextData(Folder):
begin=""
end=""
- self.retStr+=spaces(self.depth)+"%s"%(attrs.get('url'),begin+attrs.get('name')+end)+"
\n"
+ self.retStr+=spaces(self.depth)+"%s"%(attrs.get('url'),begin+urllib.unquote(attrs.get('name'))+end)+"
\n"
@@ -238,9 +282,12 @@ class OSAS_add_contextData(Folder):
parser.parse(urllib.urlopen(URL))
return curHandler.retStr
+
except:
+ return URL
return urllib.urlopen(URL).read()
-
+
+
def __init__(self,id,collection):
self.id=id
self.collection=collection
@@ -256,25 +303,23 @@ class OSAS_add_contextData(Folder):
def startElement(self,name,attrs):
if name=="partner":
- self.ret.append((attrs.get('id'),attrs.get('title')))
+ self.ret.append((attrs.get('id'),attrs.get('title').encode('utf-8')))
URL+="/getPartnersXML"
-
- try:
-
- parser=make_parser()
- curHandler=requestHandler()
- parser.setContentHandler(curHandler)
-
- parser.parse(urllib.urlopen(URL))
- return curHandler.ret
+ parser=make_parser()
+ curHandler=requestHandler()
+ parser.setContentHandler(curHandler)
+ parser.parse(urllib.urlopen(URL))
+ try:
+
+ return curHandler.ret
except:
- return [("",urllib.urlopen(URL).read())]
-
+ return [("",URL)]
+
def addContextData(self,path):
- """Hinzufügen zu einer Sammlung"""
+ """Hinzufuegen zu einer Sammlung"""
try:
urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")
@@ -283,14 +328,14 @@ class OSAS_add_contextData(Folder):
links=[(path,'standard storage')]
- links+=OSAS_show.readContexts(path) # auslesen von contexten für den link
+ links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link
#print "LINK",links
#return links
self.REQUEST.SESSION['links']=links
pt=PageTemplateFile('Products/OSA_system/zpt/contextDataMain.zpt').__of__(self)
return pt()
-
+
def addContextData2(self,path,collection,link,label,description,content_type,responsible,weight,credits=None):
"""Hinzufuegen der Resource"""
splitted=path.split("/")
@@ -300,18 +345,25 @@ class OSAS_add_contextData(Folder):
metalink=self.REQUEST['SERVER_URL']+path+"/index.meta"
#link=TOBEDONE"
- """Hinzufügen der Ressource"""
+ """Hinzufuegen der Ressource"""
params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
- retStr=urllib.urlopen(collection+"/addResource",params).read()
+
+ retStr=urllib.urlopen(collection+"/addResource",params).read()
+ #print "added"
if not retStr:
- return "An Error occured adding the resource\n"
+ return "An Error occured adding the resource\n", collection,params
+ #print collection+"/"+id+"/copyIndex_meta2echo_resource"
- urllib.urlopen(collection+"/"+id+"/ECHO_getResourceMD").read()
-
+ urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
+ #print "copy2res"
+ urllib.urlopen(collection+"/"+id+"/generate_label").read()
+ #print "label"
+ urllib.urlopen(collection+"/"+id+"/generate_title").read()
+ #print "title"
return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
manage_options = Folder.manage_options+(
@@ -472,20 +524,21 @@ class OSAS_combineTextImage(Folder):
newtemplate=PageTemplateFile('Products/OSA_system/zpt/ImageandText').__of__(self)
return newtemplate()
- def getProjects(self,obj_ids=None):
- """Get the Project title for configuration"""
+ def getViewerTemplateSets(self,obj_ids=None):
+ """Get the ViewerTemplateSet title for configuration"""
ret=[]
-
+ viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
+
try:
- projects=self.ZopeFind(self.projects,obj_metatypes=['OSAS_project'],obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie.
+ viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
- for project in projects:
- ret.append((project[1].title,project[0],project[1]))
+ for viewerTemplateSet in viewerTemplateSets:
+ ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
return ret
except:
- return [('no Projectfolders','')]
+ return [('no ViewerTemplateSetfolders','')]
def getTextToolsField(self,path,name,default=''):
"""Lese Textoolsfelder aus index.meta im path aus"""
@@ -494,14 +547,22 @@ class OSAS_combineTextImage(Folder):
dom=xml.dom.minidom.parse(path+"/index.meta")
node=dom.getElementsByTagName('texttool')[0] #getNode
subnode=node.getElementsByTagName(name)[0]
-
- return getText(subnode.childNodes)
+
+ # bei text wird nur der Folder gebraucht
+ if name=="text":
+ splitted=getText(subnode.childNodes).split("/")
+ return splitted[len(splitted)-2]
+ else:
+ return getText(subnode.childNodes)
except:
return default
-
+
def combineTextImage2(self,path):
"""Eingabe von Metadateninformationen"""
+
+ # correct path
+ path=re.sub("//","/",path)
OSAS_add.combineTextImage2(self,path) # Add images
splitted=path.split("/")
linkPath=splitted[len(splitted)-1]
@@ -521,10 +582,10 @@ class OSAS_combineTextImage(Folder):
return pt()
- def isSelectedProject(self,obj,id):
+ def isSelectedViewerTemplateSet(self,obj,id):
"""is ausgewählt"""
- if self.REQUEST['project']==id:
+ if self.REQUEST['viewerTemplateSet']==id:
return 1
else:
return None
@@ -562,7 +623,7 @@ def writeToContext(path,link,description
writefile=file(path+"/index.meta","w")
#print path+"/index.meta"
- writefile.write(dom.toxml().encode('utf-8'))
+ writefile.write(dom.toxml(encoding="UTF-8"))
writefile.close()
def manage_AddOSAS_combineTextImageForm(self):