--- OSAS/OSA_system/OSAS_add.py 2004/04/15 09:45:29 1.24 +++ OSAS/OSA_system/OSAS_add.py 2005/02/10 16:17:18 1.44 @@ -14,9 +14,11 @@ from Products.PageTemplates.PageTemplate 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 +from types import * import re def showHelp(helptext): @@ -52,7 +54,7 @@ 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 @@ -67,9 +69,10 @@ def add2(self): self.bibdata={} for referenceType in self.referencetypes: #print referenceType - self.bibdata[referenceType[1].title]=referenceType[1].fields - self.bibdata['data']=referenceType[1] - self.fields=self.bibdata[self.reftype] + 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() @@ -115,6 +118,7 @@ def add3(self): metadata=parse_query_string(self.REQUEST['QUERY_STRING']) self.REQUEST.SESSION['metadata']=metadata vorschlag=[] + if metadata.has_key('author'): vorschlag.append(metadata['author'][:5]) if metadata.has_key('title'): @@ -136,16 +140,35 @@ 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['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) + + 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'])) @@ -153,6 +176,11 @@ def add4(self): 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() @@ -173,14 +201,21 @@ def add6(self): 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) + try: + f.write(renderxml.encode('utf-8')) + except: + f.write(unicode(renderxml,'latin-1').encode('utf-8')) + #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']) @@ -191,15 +226,16 @@ def add6(self): else: #print self.add_metadata['archive-path'] self.viewpath=re.search(r"/mpiwg/online/(.*)",self.add_metadata['archive-path']).group(1) - if not (self.REQUEST.SESSION['no_upload']=="text"): + + 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() - else: - """text upload""" - return 1 - + def date(self): @@ -238,17 +274,21 @@ def addPresentation(self,path): 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() @@ -279,19 +319,54 @@ 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 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['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['path']=path + self.REQUEST.SESSION['pathnew']=path newtemplate=PageTemplateFile('Products/OSA_system/zpt/addText').__of__(self) return newtemplate() @@ -300,7 +375,7 @@ def addText2(self): 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) @@ -359,7 +434,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 @@ -388,7 +463,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 @@ -461,7 +536,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): @@ -577,6 +652,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) @@ -613,23 +695,31 @@ 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() - print urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines() + urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines() if self.REQUEST.has_key('image'): # falls bilder - 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'])) + 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") - f.write(patchedInfoXML(self.REQUEST['path'])) + tmp=patchedInfoXML(self.REQUEST['path']) + f.write(tmp.encode('utf-8')) f.close() splitted=path.split("/") fn=splitted[len(splitted)-1] - remotePath="nausikaa2.rz-berlin.mpg.de:/usr/local/share/archimedes/web/docs/proj/echo/1/docs/"+fn+"/info.xml" + 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): @@ -653,8 +743,15 @@ def patchedInfoXML(path): """not""" ret+="%s\n"%archive.getText(dom.getElementsByTagName('lang')[0].childNodes) - ret+="%s\n"%archive.getText(dom.getElementsByTagName('author')[0].childNodes) - ret+="%s\n"%archive.getText(dom.getElementsByTagName('title')[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