[BACK]Return to OSAS_addfiles.py CVS log [TXT] [DIR] Up to [Repository] / OSAS / OSA_system

Diff for /OSAS/OSA_system/OSAS_addfiles.py between versions 1.39 and 1.53

version 1.39, 2005/01/21 18:10:45 version 1.53, 2010/02/15 19:09:00
Line 15  from Globals import InitializeClass Line 15  from Globals import InitializeClass
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate  from Products.PageTemplates.PageTemplate import PageTemplate
 import archive # check if this is necessary  import archive # check if this is necessary
   from Globals import package_home
   
 from xml.sax import make_parser  from xml.sax import make_parser
 from xml.sax.handler import ContentHandler  from xml.sax.handler import ContentHandler
   import sys
   import logging
   import xmlrpclib
   #ersetzt logging
   def logger(txt,method,txt2):
       """logging"""
       logging.info(txt+ txt2)
   
   
   
 def spaces(depth):  def spaces(depth):
     """needed in XMLtoTree"""      """needed in XMLtoTree"""
Line 49  class OSAS_add_Document(Folder): Line 58  class OSAS_add_Document(Folder):
     security.declarePublic('add_Document_config')      security.declarePublic('add_Document_config')
     def add_Document_config(self):      def add_Document_config(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_addDocument.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_addDocument.zpt')).__of__(self)
         return pt()          return pt()
           
     security.declarePublic('change_OSAS_add_Document')      security.declarePublic('change_OSAS_add_Document')
Line 107  class OSAS_add_Document(Folder): Line 116  class OSAS_add_Document(Folder):
             #print str(self.metadata[tag]).decode('utf-8').encode('utf-8')              #print str(self.metadata[tag]).decode('utf-8').encode('utf-8')
             self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"              self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
   
     newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)          newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self)
     newtemplate.content_type="text/plain"      newtemplate.content_type="text/plain"
     renderxml = newtemplate(encoding='utf-8')      renderxml = newtemplate(encoding='utf-8')
         #return renderxml          #return renderxml
Line 140  class OSAS_add_Document(Folder): Line 149  class OSAS_add_Document(Folder):
     for tag in self.metadata.keys():      for tag in self.metadata.keys():
         self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"          self.metadataprint=self.metadataprint+"<"+tag+">"+self.metadata[tag]+"</"+tag+">\n"
   
     newtemplate=PageTemplateFile('Products/OSA_system/zpt/index_meta').__of__(self)          newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','index_meta')).__of__(self)
     newtemplate.content_type="text/plain"      newtemplate.content_type="text/plain"
     renderxml = newtemplate(encoding='utf-8')      renderxml = newtemplate(encoding='utf-8')
         metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"          metapath=self.REQUEST.SESSION['pathnew']+"/index.meta"
Line 155  class OSAS_add_Document(Folder): Line 164  class OSAS_add_Document(Folder):
         return OSAS_add.addPdf2(self)          return OSAS_add.addPdf2(self)
   
     def addImages(self,path):      def addImages(self,path):
         """Hinzufügen eines neuen Imagesfolders"""          """Hinzufuegen eines neuen Imagesfolders"""
         return OSAS_add.addImages(self,path)          return OSAS_add.addImages(self,path)
   
     def addImages2(self):      def addImages2(self):
Line 165  class OSAS_add_Document(Folder): Line 174  class OSAS_add_Document(Folder):
           
 def manage_AddOSAS_add_DocumentForm(self):  def manage_AddOSAS_add_DocumentForm(self):
     """interface for adding the OSAS_add_Metadata"""      """interface for adding the OSAS_add_Metadata"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_document.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_document.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_add_Document(self,id,RESPONSE=None):  def manage_AddOSAS_add_Document(self,id,RESPONSE=None):
Line 198  class OSAS_add_Text(Folder): Line 207  class OSAS_add_Text(Folder):
     security.declarePublic('add_Text_config')      security.declarePublic('add_Text_config')
     def add_Text_config(self):      def add_Text_config(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_addText.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_addText.zpt')).__of__(self)
         return pt()          return pt()
           
     security.declarePublic('change_OSAS_add_Text')      security.declarePublic('change_OSAS_add_Text')
Line 226  class OSAS_add_Text(Folder): Line 235  class OSAS_add_Text(Folder):
           
 def manage_AddOSAS_add_TextForm(self):  def manage_AddOSAS_add_TextForm(self):
     """interface for adding the OSAS_add_Metadata"""      """interface for adding the OSAS_add_Metadata"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_text.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_text.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_add_Text(self,id,RESPONSE=None):  def manage_AddOSAS_add_Text(self,id,RESPONSE=None):
Line 325  class OSAS_add_contextData(Folder): Line 334  class OSAS_add_contextData(Folder):
           
     def addContextData(self,path):      def addContextData(self,path):
         """Hinzufuegen zu einer Sammlung"""          """Hinzufuegen zu einer Sammlung"""
           
           server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL'])
           if path[0]=="/": #strip leading slash
           urlpath=path[1:]
       else:
           urlpath=path
         try:          try:
             urllib.urlopen(self.REQUEST['SERVER_URL']+path+"/index.meta")              urllib.urlopen(server+"/"+urlpath+"/index.meta")
                           
         except:          except:
             return self.REQUEST['SERVER_URL']+path+"/index.meta file has to exist!"              logger("OSAS_addfiles (addContextData)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
               return server+"/"+urlpath+"/index.meta file has to exist!"
   
         links=[(path,'standard storage')]          # old version for foxridge storage viewer
           #links=[(path,'storage server view')]
           # libcoll viewer with imagepath: needs pageimg directory
           links=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=imagepath&url=%s/pageimg'%path,'libcoll standard viewer (pageimg)')]
           # libcoll viewer with texttool: needs texttool tag
           links+=[('http://libcoll.mpiwg-berlin.mpg.de/libview?mode=texttool&url=%s/index.meta'%path,'libcoll standard viewer (texttool)')]
                   
         links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link          links+=OSAS_show.readContexts(path) # auslesen von contexten fuer den link
         #print "LINK",links          #print "LINK",links
         #return links          #return links
         self.REQUEST.SESSION['links']=links          self.REQUEST.SESSION['links']=links
         pt=PageTemplateFile('Products/OSA_system/zpt/contextDataMain.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','contextDataMain.zpt')).__of__(self)
         return pt()          return pt()
           
         
Line 347  class OSAS_add_contextData(Folder): Line 368  class OSAS_add_contextData(Folder):
         #print "BLU"          #print "BLU"
         id=splitted[len(splitted)-1]          id=splitted[len(splitted)-1]
         title=splitted[len(splitted)-1]          title=splitted[len(splitted)-1]
         metalink=self.REQUEST['SERVER_URL']+path+"/index.meta"          server=getattr(self,'serverUrl',self.REQUEST['SERVER_URL'])
           if path[0]=="/": #strip leading slash
           urlpath=path[1:]
       else:
           urlpath=path
   
   
           metalink=server+"/"+urlpath+"/index.meta"
                   
         #link=TOBEDONE"          #link=TOBEDONE"
         """Hinzufuegen 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})          params=urllib.urlencode({'id':id,'title':title,'link':link,'label':label,'description':description,'contentType':content_type,'responsible':responsible,'weight':weight,'credits':credits,'metalink':metalink})
   
           server=xmlrpclib.ServerProxy(collection,allow_none=True)   
         try:          try:
             retStr=urllib.urlopen(collection+"/addResource",params).read()              #retStr=urllib.urlopen(collection+"/addResource",params).read()
               
               retStr=server.addResource(id,title,label,description,content_type,responsible,link,metalink,weight,credits)
                 
         except:          except:
             return "An Error occured adding the resource\n", collection,params              return "An Error occured adding the resource A\n", collection,params,str(sys.exc_info()[0]),str(sys.exc_info()[1])
                   
     #print "added"      #print "added"
           logging.debug("Add an resource:"+repr(retStr))
     if not retStr:      if not retStr:
             return "An Error occured adding the resource\n", collection,params              return "An Error occured adding the resource B\n", collection,params
           
         #print collection+"/"+id+"/copyIndex_meta2echo_resource"          #print collection+"/"+id+"/copyIndex_meta2echo_resource"
           #TODO: fehler falls generate label oder title nicht funktioniert abfangen, bei ECHO geht das z.B. manchmal nicht.
         urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()          #server=xmlrpclib.ServerProxy(collection+"/"+id,allow_none=True)
           #server2=getattr(server,id)
           #server2.copyIndex_meta2echo_resource()
           #urllib.urlopen(collection+"/"+id+"/copyIndex_meta2echo_resource").read()
     #print "copy2res"      #print "copy2res"
         urllib.urlopen(collection+"/"+id+"/generate_label").read()      #try:
     #print "label"              #urllib.urlopen(collection+"/"+id+"/generate_label").read()
         urllib.urlopen(collection+"/"+id+"/generate_title").read()     #         server2.generate_label()
     #print "title"        #  except:
       #        logger("OSAS_addfiles (addContextData2,label not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
       #try:
               #urllib.urlopen(collection+"/"+id+"/generate_title").read()
      #         server2.generate_title()
       #except:
       #    logger("OSAS_addfiles (addContextData2,title not generated)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
               
   
         return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)          return self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?path='+path)
                   
     manage_options = Folder.manage_options+(      manage_options = Folder.manage_options+(
Line 381  class OSAS_add_contextData(Folder): Line 424  class OSAS_add_contextData(Folder):
             
     def add_contextData_config(self):      def add_contextData_config(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_add_contextData.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_add_contextData.zpt')).__of__(self)
         return pt()          return pt()
           
           
     def change_OSAS_add_contextData(self,collection,pwstr=None,RESPONSE=None):      def change_OSAS_add_contextData(self,collection,serverUrl,pwstr=None,RESPONSE=None):
         """Change"""          """Change"""
         self.pwstr=pwstr          self.pwstr=pwstr
         self.collection=collection          self.collection=collection
           self.serverUrl=serverUrl
         if RESPONSE is not None:          if RESPONSE is not None:
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
                           
 def manage_AddOSAS_add_contextDataForm(self):  def manage_AddOSAS_add_contextDataForm(self):
     """interface for adding the OSAS_add_Metadata"""      """interface for adding the OSAS_add_Metadata"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_contextData.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_contextData.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None):  def manage_AddOSAS_add_contextData(self,id,collection,RESPONSE=None):
Line 408  def manage_AddOSAS_add_contextData(self, Line 452  def manage_AddOSAS_add_contextData(self,
 InitializeClass(OSAS_add_contextData)  InitializeClass(OSAS_add_contextData)
   
 class OSAS_add_Presentation(Folder):  class OSAS_add_Presentation(Folder):
     """Hinzufügen der Presentationsinformationen"""      """Hinzufuegen der Presentationsinformationen"""
     security=ClassSecurityInfo()      security=ClassSecurityInfo()
   
     def __init__(self,id):      def __init__(self,id):
Line 426  class OSAS_add_Presentation(Folder): Line 470  class OSAS_add_Presentation(Folder):
     security.declarePublic('add_Presentation_config')      security.declarePublic('add_Presentation_config')
     def add_Presentation_config(self):      def add_Presentation_config(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_addPresentation.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_addPresentation.zpt')).__of__(self)
         return pt()          return pt()
           
     security.declarePublic('change_OSAS_add_Presentation')      security.declarePublic('change_OSAS_add_Presentation')
Line 437  class OSAS_add_Presentation(Folder): Line 481  class OSAS_add_Presentation(Folder):
             RESPONSE.redirect('manage_main')              RESPONSE.redirect('manage_main')
   
     def addPresentation(self,path):      def addPresentation(self,path):
         """Hinzufügen der Presenationsinformation"""          """Hinzufuegen der Presenationsinformation"""
         return OSAS_add.addPresentation(self,path)          return OSAS_add.addPresentation(self,path)
   
     def addPresentation2(self):      def addPresentation2(self):
Line 446  class OSAS_add_Presentation(Folder): Line 490  class OSAS_add_Presentation(Folder):
           
 def manage_AddOSAS_add_PresentationForm(self):  def manage_AddOSAS_add_PresentationForm(self):
     """interface for adding the OSAS_add_Metadata"""      """interface for adding the OSAS_add_Metadata"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_presentation.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_presentation.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None):  def manage_AddOSAS_add_Presentation(self,id,RESPONSE=None):
Line 460  def manage_AddOSAS_add_Presentation(self Line 504  def manage_AddOSAS_add_Presentation(self
 InitializeClass(OSAS_add_Presentation)  InitializeClass(OSAS_add_Presentation)
   
 class OSAS_combineTextImage(Folder):  class OSAS_combineTextImage(Folder):
     """Hinzufüge der Combine Text und Image"""      """Hinzufuege der Combine Text und Image"""
     security=ClassSecurityInfo()      security=ClassSecurityInfo()
   
     def __init__(self,id):      def __init__(self,id):
Line 478  class OSAS_combineTextImage(Folder): Line 522  class OSAS_combineTextImage(Folder):
     security.declarePublic('combineTextImage_config')      security.declarePublic('combineTextImage_config')
     def combineTextImage_config(self):      def combineTextImage_config(self):
         """Main configuration"""          """Main configuration"""
         pt=PageTemplateFile('Products/OSA_system/zpt/ChangeOSAS_combineTextImage.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeOSAS_combineTextImage.zpt')).__of__(self)
         return pt()          return pt()
           
     security.declarePublic('change_OSAS_combineTextImage')      security.declarePublic('change_OSAS_combineTextImage')
Line 490  class OSAS_combineTextImage(Folder): Line 534  class OSAS_combineTextImage(Folder):
                           
     security.declarePublic('combineTextImage')      security.declarePublic('combineTextImage')
     def combineTextImage(self,path):      def combineTextImage(self,path):
         """Hinzufügen der Presenationsinformation"""          """Hinzufuegen der Presenationsinformation"""
         """gibt input formular zur erstellung des texttools meta tag aus"""          """gibt input formular zur erstellung des texttools meta tag aus"""
     files = os.listdir(path)      files = os.listdir(path)
           
Line 530  class OSAS_combineTextImage(Folder): Line 574  class OSAS_combineTextImage(Folder):
     self.REQUEST.SESSION['filelanguage']=filelanguage      self.REQUEST.SESSION['filelanguage']=filelanguage
     self.REQUEST.SESSION['externxml']=externxml      self.REQUEST.SESSION['externxml']=externxml
   
     newtemplate=PageTemplateFile('Products/OSA_system/zpt/ImageandText').__of__(self)          newtemplate=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ImageandText')).__of__(self)
     return newtemplate()      return newtemplate()
           
     def getViewerTemplateSets(self,obj_ids=None):      def getViewerTemplateSets(self,obj_ids=None):
Line 587  class OSAS_combineTextImage(Folder): Line 631  class OSAS_combineTextImage(Folder):
                   
         writeToContext(path,linkViewerEnvironment,"ECHO standard environment",unique="yes")          writeToContext(path,linkViewerEnvironment,"ECHO standard environment",unique="yes")
                   
         pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_combineTextImageFinal.zpt').__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_combineTextImageFinal.zpt')).__of__(self)
   
         return pt()          return pt()
   
     def isSelectedViewerTemplateSet(self,obj,id):      def isSelectedViewerTemplateSet(self,obj,id):
         """is ausgewählt"""          """is ausgewaehlt"""
                   
         if self.REQUEST['viewerTemplateSet']==id:          if self.REQUEST['viewerTemplateSet']==id:
             return 1              return 1
Line 637  def writeToContext(path,link,description Line 681  def writeToContext(path,link,description
   
 def manage_AddOSAS_combineTextImageForm(self):  def manage_AddOSAS_combineTextImageForm(self):
     """interface for adding the OSAS_add_Metadata"""      """interface for adding the OSAS_add_Metadata"""
     pt=PageTemplateFile('Products/OSA_system/zpt/AddOSAS_combineTextImage.zpt').__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddOSAS_combineTextImage.zpt')).__of__(self)
     return pt()      return pt()
   
 def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):  def manage_AddOSAS_combineTextImage(self,id,RESPONSE=None):
Removed from v.1.39  
changed lines
  Added in v.1.53

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