Diff for /OSAS/OSA_system/OSAS_add.py between versions 1.1 and 1.2

version 1.1, 2003/10/01 08:20:47 version 1.2, 2003/10/05 18:16:19
Line 1 Line 1
   
   
   
 #BAUSTELLE  #BAUSTELLE
   
   
 """Methoden zum hinzufügen von Dokumenten ins Archiv"""  """Methoden zum hinzufügen von Dokumenten ins Archiv"""
 #import archive  import archive
 import os  import os
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate  from Products.PageTemplates.PageTemplate import PageTemplate
Line 200  def addPresentation(self,path): Line 197  def addPresentation(self,path):
     <display>yes</display>      <display>yes</display>
 </info>"""%(author,title,date)  </info>"""%(author,title,date)
           
     newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/addPresentation').__of__(self)      newtemplate=PageTemplateFile('products/OSA_system/addPresentation').__of__(self)
     return newtemplate()      return newtemplate()
   
 def addPresentation2(self):  def addPresentation2(self):
     """add presentation """      """add presentation """
     self.folder_name=self.REQUEST['folder_name']      folder_name=self.REQUEST['folder_name']
     #print self.REQUEST['folder_name']      #print self.REQUEST['folder_name']
     self.content_description=self.REQUEST['content_description']      content_description=self.REQUEST['content_description']
   
     self.path=self.REQUEST.SESSION['path']      path=self.REQUEST.SESSION['path']
   
     if not self.REQUEST.has_key('fileupload'):      if not self.REQUEST.has_key('fileupload'):
         self.xmlinfo=self.REQUEST['xmltext']          xmlinfo=self.REQUEST['xmltext']
         file_name="info.xml"          file_name="info.xml"
   
     else:      else:
         file_name=self.REQUEST['fileupload'].filename          file_name=self.REQUEST['fileupload'].filename
         self.xmlinfo=self.REQUEST.form['fileupload'].read()          xmlinfo=self.REQUEST.form['fileupload'].read()
         # hack dW          # hack Multipart auswertung funktioniert nicht ausser bei mozilla
         file_name="info.xml"          file_name="info.xml"
         self.xmlinfo=self.REQUEST['xmltext']          xmlinfo=self.REQUEST['xmltext']
     try:      try:
         os.mkdir(self.path+"/"+self.folder_name)          os.mkdir(path+"/"+folder_name)
     except:      except:
         """nothing"""          """nothing"""
     print "NAME:",file_name      print "NAME:",file_name
     f=open(self.path+"/"+self.folder_name+"/"+file_name,"w")      f=open(path+"/"+folder_name+"/"+file_name,"w")
     f.write(self.xmlinfo)      f.write(xmlinfo)
     f.close()      f.close()
     os.chmod(self.path+"/"+self.folder_name,0755)      os.chmod(path+"/"+folder_name,0755)
     os.chmod(self.path+"/"+self.folder_name+"/"+file_name,0644)      os.chmod(path+"/"+folder_name+"/"+file_name,0644)
     addDirsToIndexMeta(self.path,self.folder_name,self.content_description,'presentation')      addDirsToIndexMeta(path,folder_name,content_description,'presentation')
           
     return self.REQUEST.RESPONSE.redirect('storefiles?path='+self.path)      return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
   
 def addText(self,path):  def addText(self,path):
     """add fulltext to the path"""      """add fulltext to the path"""
     self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files      self.REQUEST.SESSION['existing_names']=['pageimg'] # to be done generate list of existing text files
     self.REQUEST.SESSION['path']=path      self.REQUEST.SESSION['path']=path
     newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/addText').__of__(self)      newtemplate=PageTemplateFile('products/OSA_system/addText').__of__(self)
     return newtemplate()      return newtemplate()
   
 def addText2(self):  def addText2(self):
     self.folder_name=self.REQUEST['folder_name']      folder_name=self.REQUEST['folder_name']
     #print self.REQUEST['folder_name']      #print self.REQUEST['folder_name']
     self.content_description=self.REQUEST['content_description']      content_description=self.REQUEST['content_description']
     self.path=self.REQUEST.SESSION['path']      path=self.REQUEST.SESSION['path']
     self.file_name=self.REQUEST['fileupload'].filename      file_name=self.REQUEST['fileupload'].filename
     self.file=self.REQUEST.form['fileupload'].read()      filedata=self.REQUEST.form['fileupload'].read()
     os.mkdir(self.path+"/"+self.folder_name)      os.mkdir(path+"/"+folder_name)
     f=open(self.path+"/"+self.folder_name+"/"+self.file_name,"w")      f=open(path+"/"+folder_name+"/"+file_name,"w")
     f.write(self.file)      f.write(filedata)
     f.close()      f.close()
     os.chmod(self.path+"/"+self.folder_name,0755)      os.chmod(path+"/"+folder_name,0755)
     os.chmod(self.path+"/"+self.folder_name+"/"+self.file_name,0644)      os.chmod(path+"/"+folder_name+"/"+file_name,0644)
     addDirsToIndexMeta(self.path,self.folder_name,self.content_description,'fulltext')      addDirsToIndexMeta(path,folder_name,content_description,'fulltext')
   
     return self.REQUEST.RESPONSE.redirect('storefiles?path='+self.path)      return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
   
 def addTextExternal(self,path,texturl,version):  def addTextExternal(self,path,texturl,version):
     """hinzufügen eines externen textes"""      """hinzufügen eines externen textes"""
Line 367  def addImages(self,path): Line 364  def addImages(self,path):
     return newtemplate()      return newtemplate()
   
 def addImages2(self):  def addImages2(self):
       
     self.image_folder_name=self.REQUEST['folder_name']      self.image_folder_name=self.REQUEST['folder_name']
     #print self.REQUEST['folder_name']      #print self.REQUEST['folder_name']
     self.content_description=self.REQUEST['content_description']      self.content_description=self.REQUEST['content_description']
Line 380  def addImages2(self): Line 378  def addImages2(self):
     return newtemplate()      return newtemplate()
   
   
   
 def addDirsToIndexMeta(path,folder_name,content_description,content_type):  def addDirsToIndexMeta(path,folder_name,content_description,content_type):
     #f=file(path+"/index.meta",r)      #f=file(path+"/index.meta",r)
     dom=xml.dom.minidom.parse(path+"/index.meta")      dom=xml.dom.minidom.parse(path+"/index.meta")
Line 437  def combineTextImage(self,path): Line 436  def combineTextImage(self,path):
     self.REQUEST.SESSION['imagefolders']=imagefolders      self.REQUEST.SESSION['imagefolders']=imagefolders
     self.REQUEST.SESSION['presentationfolders']=presentationfolders      self.REQUEST.SESSION['presentationfolders']=presentationfolders
     self.REQUEST.SESSION['filelanguage']=filelanguage      self.REQUEST.SESSION['filelanguage']=filelanguage
     newtemplate=PageTemplateFile('/usr/local/mpiwg/Zope/Extensions/ImageandText').__of__(self)      newtemplate=PageTemplateFile('products/OSA_system/ImageandText').__of__(self)
     return newtemplate()      return newtemplate()
           
   
Line 499  def combineTextImage2(self,path): Line 498  def combineTextImage2(self,path):
           
           
   
     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()
     #return urllib.quote("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)      #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 &"% re.sub('mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))      os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/thumb 90 &"% re.sub('mpiwg/online/','',self.REQUEST['path']+"/"+self.REQUEST['image']))
     return self.REQUEST.RESPONSE.redirect('storefiles?path='+self.REQUEST['path'])      return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+self.REQUEST['path'])
           

Removed from v.1.1  
changed lines
  Added in v.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>