--- OSAS/OSA_system/OSAS_add.py 2004/04/06 15:12:48 1.19
+++ OSAS/OSA_system/OSAS_add.py 2005/01/21 15:20:10 1.42
@@ -9,15 +9,24 @@ except:
print "archive not imported"
import os
+
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate
import string
import urllib
+import zLOG
import xml.dom.minidom
from time import localtime,strftime
from Globals import package_home
import re
+def showHelp(helptext):
+ """show helptext"""
+ return """
+
+ %
+
+ """%helptext
def add(self, no_upload=0):
""" Add metadata or metadata and documents to the repository
no_upload=0 kein upload sonst upload von documententen"""
@@ -44,23 +53,26 @@ def getISO():
ret={}
for lineraw in f:
- line=lineraw.encode('ascii','replace')
+ line=lineraw.encode('ascii','replace').strip()
value=string.split(line,'\t')[0].encode('ascii','replace')
key=string.split(line,'\t')[1].encode('ascii','replace')
ret[key]=value
except:
ret={}
- return ret
+ return ret
+
def add2(self):
self.reftype=self.REQUEST['Reference Type']
self.REQUEST.SESSION['reftype']=self.reftype
self.bibdata={}
for referenceType in self.referencetypes:
- print referenceType
- self.bibdata[referenceType[1].title]=referenceType[1].fields
-
- self.fields=self.bibdata[self.reftype]
+ #print referenceType
+ if referenceType[1].title == self.reftype:
+ self.bibdata[referenceType[1].title]=referenceType[1].fields
+ self.bibdata['data']=referenceType[1]
+ self.fields=self.bibdata[self.reftype]
+
self.isolist=getISO()
tmp=getISO().keys()
tmp.sort()
@@ -126,20 +138,47 @@ def add3(self):
def add4(self):
+
self.path=re.search(r"/mpiwg(.*)",self.REQUEST.SESSION['path']).group(1)
self.folder_name=self.REQUEST['folder_name']
# next has to be changed -> error if back button is used!!
- self.REQUEST.SESSION['path']=self.REQUEST.SESSION['path']+"/"+self.REQUEST['folder_name']
+ self.REQUEST.SESSION['folder_name']=self.folder_name
+ #return self.REQUEST['submit']
+ try:
+ #os.popen('mkdir '+self.REQUEST.SESSION['path'])
+ os.mkdir(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+ os.chmod(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']),0775)
- self.REQUEST.SESSION['folder_name']=self.folder_name
- self.image_folder_name="pageimg"
- newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_upload').__of__(self)
- return newtemplate()
+ except:
+
+ """nothing"""
+
+ if self.REQUEST['submit']=="upload images":
+ self.REQUEST.SESSION['path']=os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name'])
+
+
+ self.image_folder_name="pageimg"
+ newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_upload').__of__(self)
+
+ return newtemplate()
+
+ elif self.REQUEST['submit']=="upload pdf":
+ os.mkdir(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+ return addPdf(self,os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+ else:
+ os.mkdir(os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+ return addText(self,os.path.join(self.REQUEST.SESSION['path'],self.REQUEST['folder_name']))
+
def add5(self):
"""ADD INDEX.META"""
+ try:
+ os.chmod(self.REQUEST.SESSION['path'],0775)
+ except:
+ pass
+
newtemplate=PageTemplateFile('Products/OSA_system/zpt/OSAS_add_metadata').__of__(self)
return newtemplate()
@@ -155,18 +194,21 @@ def add6(self):
self.metadata=self.REQUEST.SESSION['metadata']
self.metadataprint=""
for tag in self.metadata.keys():
- self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+""+tag+">\n"
+ if tag!="":
+ self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+""+tag+">\n"
newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)
newtemplate.content_type="text/plain"
- renderxml = newtemplate()
+ renderxml = newtemplate(encode='utf-8')
+
+
if self.REQUEST.SESSION.has_key('no_upload'):
metapath=self.REQUEST.SESSION['path']+"/index.meta"
else:
metapath=self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name']+"/index.meta"
f=open(metapath,'w')
- f.writelines(renderxml)
+ f.write(renderxml.encode('utf-8'))
f.close()
os.chmod(metapath,0664)
os.popen('chmod -R 0775 %s'%self.add_metadata['archive-path']+"/"+self.add_metadata['folder_name'])
@@ -176,17 +218,17 @@ def add6(self):
return self.REQUEST.response.redirect(self.REQUEST['URL2']+"?path="+self.REQUEST.SESSION['path'])
else:
#print self.add_metadata['archive-path']
- self.viewpath=re.search(r"/mpiwg/online/(.*)",self.add_metadata['archive-path']).group(1)
- newtemplate2=PageTemplateFile('Products/OSA_system/zpt/OSAS_saved').__of__(self)
+ self.viewpath=re.search(r"/mpiwg/online/(.*)",self.add_metadata['archive-path']).group(1)
+ if (self.REQUEST.SESSION.has_key('no_upload')) and (self.REQUEST.SESSION['no_upload']=="text"):
+ """text upload"""
+ return 1
+ else:
+ newtemplate2=PageTemplateFile('Products/OSA_system/zpt/OSAS_saved').__of__(self)
+ newtemplate2.content_type="text/html"
+ self.REQUEST.response.setHeader('Content-Type','text/html')
+ return newtemplate2()
- newtemplate2.content_type="text/html"
- self.REQUEST.response.setHeader('Content-Type','text/html')
-
-
- return newtemplate2()
-
-
def date(self):
@@ -205,28 +247,41 @@ def addPresentation(self,path):
try:
author=archive.getText(dom.getElementsByTagName('Author')[0].childNodes)
except:
- author=archive.getText(dom.getElementsByTagName('Editor')[0].childNodes)
-
- title=archive.getText(dom.getElementsByTagName('title')[0].childNodes)
+ try:
+ author=archive.getText(dom.getElementsByTagName('Editor')[0].childNodes)
+ except:
+ author=""
+ try:
+ title=archive.getText(dom.getElementsByTagName('title')[0].childNodes)
+ except:
+ title=""
+
try:
date=archive.getText(dom.getElementsByTagName('year')[0].childNodes)
except:
try:
date=archive.getText(dom.getElementsByTagName('Year')[0].childNodes)
except:
- date=archive.getText(dom.getElementsByTagName('date')[0].childNodes)
+ try:
+ date=archive.getText(dom.getElementsByTagName('date')[0].childNodes)
+ except:
+ date=""
i=1
- while os.path.exists("%02d-presentation"%i):
+ while os.path.exists(path+"/%02d-presentation"%i):
i+=1
self.REQUEST.SESSION['presentationname']="%02d-presentation"%i
self.REQUEST.SESSION['path']=path
- self.REQUEST.SESSION['xmlvorschlag']="""
+
+ tmpTxt="""
+
%s
%s
%s
yes
"""%(author,title,date)
+ self.REQUEST.SESSION['xmlvorschlag']=tmpTxt.encode('utf-8')
+
newtemplate=PageTemplateFile('Products/OSA_system/zpt/addPresentation').__of__(self)
return newtemplate()
@@ -257,27 +312,63 @@ def addPresentation2(self):
f.write(xmlinfo)
f.close()
try:
- os.chmod(path+"/"+folder_name,0755)
+ os.chmod(path+"/"+folder_name,0775)
except:
"""NO"""
- os.chmod(path+"/"+folder_name+"/"+file_name,0644)
+ os.chmod(path+"/"+folder_name+"/"+file_name,0664)
addDirsToIndexMeta(path,folder_name,content_description,'presentation')
return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
-def addText(self,path):
+
+def addPdf(self,path,folder=None):
"""add fulltext to the path"""
self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files
- self.REQUEST.SESSION['path']=path
+ self.REQUEST.SESSION['pathnew']=path
+ newtemplate=PageTemplateFile('Products/OSA_system/zpt/addPdf').__of__(self)
+ return newtemplate()
+
+def addPdf2(self):
+ """addtext"""
+ folder_name="pdf" # foldername fixed
+
+ if self.REQUEST['file_name']=="":
+ file_name=self.REQUEST['fileupload'].filename
+ else:
+ file_name=self.REQUEST['file_name']
+
+ #print self.REQUEST['folder_name']
+ content_description=self.REQUEST['content_description']
+ path=self.REQUEST.SESSION['pathnew']
+
+ filedata=self.REQUEST.form['fileupload'].read()
+ try:
+ os.mkdir(path+"/"+folder_name)
+ except:
+ """nothing"""
+ f=open(path+"/"+folder_name+"/"+file_name,"w")
+ f.write(filedata)
+ f.close()
+ os.chmod(path+"/"+folder_name,0755)
+ os.chmod(path+"/"+folder_name+"/"+file_name,0644)
+ addDirsToIndexMeta(path,folder_name,content_description,'pdf')
+
+ return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
+
+def addText(self,path,folder=None):
+ """add fulltext to the path"""
+ self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files
+ self.REQUEST.SESSION['pathnew']=path
newtemplate=PageTemplateFile('Products/OSA_system/zpt/addText').__of__(self)
return newtemplate()
def addText2(self):
+ """addtext"""
folder_name=self.REQUEST['folder_name']
#print self.REQUEST['folder_name']
content_description=self.REQUEST['content_description']
- path=self.REQUEST.SESSION['path']
+ path=self.REQUEST.SESSION['pathnew']
file_name=self.REQUEST['fileupload'].filename
filedata=self.REQUEST.form['fileupload'].read()
os.mkdir(path+"/"+folder_name)
@@ -336,7 +427,7 @@ def addTextExternal(self,path,texturl,ve
node.appendChild(subnode)
writefile=file(path+"/index.meta","w")
- writefile.write(dom.toxml().encode('utf-8'))
+ writefile.write(dom.toxml(encoding="UTF-8"))
writefile.close()
#change texttool tag
@@ -365,7 +456,7 @@ def addTextExternal(self,path,texturl,ve
#index.meta ausgeben
writefile=file(path+"/index.meta","w")
- writefile.write(dom.toxml().encode('utf-8'))
+ writefile.write(dom.toxml(encoding="UTF-8"))
writefile.close()
#registrieren
@@ -438,7 +529,7 @@ def addDirsToIndexMeta(path,folder_name,
node.appendChild(subnode)
writefile=file(path+"/index.meta","w")
- writefile.write(dom.toxml().encode('utf-8'))
+ writefile.write(dom.toxml(encoding='UTF-8'))
writefile.close()
def readArchimedesXML(folder):
@@ -554,6 +645,13 @@ def combineTextImage2(self,path):
xsltnodetext=dom.createTextNode(self.REQUEST['project'])
xsltnode.appendChild(xsltnodetext)
subnode.appendChild(xsltnode)
+
+ if self.REQUEST.has_key('digiliburlprefix'):
+ if not self.REQUEST['digiliburlprefix']=="":
+ xsltnode=dom.createElement('digiliburlprefix')
+ xsltnodetext=dom.createTextNode(self.REQUEST['digiliburlprefix'])
+ xsltnode.appendChild(xsltnodetext)
+ subnode.appendChild(xsltnode)
node.appendChild(subnode)
@@ -561,7 +659,6 @@ def combineTextImage2(self,path):
node2=node.getElementsByTagName('bib')[0]
subs=node2.getElementsByTagName('lang')
for sub in subs:
- print "X",sub
node2.removeChild(sub)
except:
"""nothing"""
@@ -569,7 +666,6 @@ def combineTextImage2(self,path):
main=dom.getElementsByTagName('bib')[0]
node=dom.createElement('lang')
textnode=dom.createTextNode(self.REQUEST['lang'])
- print "LANG:",lang
node.appendChild(textnode)
main.appendChild(node)
except:
@@ -592,14 +688,63 @@ def combineTextImage2(self,path):
"""nothing"""
writefile=file(path+"/index.meta","w")
- writefile.write(dom.toxml().encode('utf-8'))
+ writefile.write(dom.toxml(encoding="UTF-8"))
writefile.close()
urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
- #return urllib.quote("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
- os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 >> /tmp/sc.out &"% re.sub('/mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))
-
- #return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+self.REQUEST['path'])
+
+ if self.REQUEST.has_key('image'): # falls bilder
+ path=re.sub('//','/',self.REQUEST['path']) # falls '//' im Pfad
+ dlpath = re.sub('/mpiwg/online/','',path)+"/"+self.REQUEST['image']
+
+ zLOG.LOG('OSas',zLOG.INFO,"ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath )
+ ret=os.popen("ssh archive@nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat -src=/mpiwg/online -dest=/mpiwg/temp/online/scaled/thumb -dir=%s -scaleto=90 -sync >> /tmp/sc.out &"%dlpath ).read()
+ zLOG.LOG('OSAS (combine)',zLOG.INFO,ret)
+
+
+
+ else: # falls keine Bilder (bug in reg.cgi info file ersetzen)
+ f=file("/tmp/tmp_info.xml","w")
+ tmp=patchedInfoXML(self.REQUEST['path'])
+ f.write(tmp.encode('utf-8'))
+ f.close()
+ splitted=path.split("/")
+ fn=splitted[len(splitted)-1]
+ remotePath="archive@nausikaa2.rz-berlin.mpg.de:/usr/local/share/archimedes/web/docs/proj/echo/1/docs/"+fn+"/info.xml"
+ os.popen("scp /tmp/tmp_info.xml %s"%remotePath)
+
+def patchedInfoXML(path):
+ dom=xml.dom.minidom.parse(path+"/index.meta")
+ ret="\n"
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('text')[0].childNodes)
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('pagebreak')[0].childNodes)
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('display')[0].childNodes)
+ try:
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('toptemplate')[0].childNodes)
+ except:
+ """not"""
+ try:
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('thumbtemplate')[0].childNodes)
+ except:
+ """not"""
+ try:
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('startpage')[0].childNodes)
+ except:
+ """not"""
+
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes)
+ try:
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes)
+ except:
+ """not"""
+ try:
+ ret+="%s\n"%archive.getText(dom.getElementsByTagName('title')[0].childNodes)
+ except:
+ """not"""
+
+ ret+=""
+
+ return ret