Diff for /OSAS/OSA_system/OSAS_add.py between versions 1.4 and 1.5

version 1.4, 2003/10/11 10:54:13 version 1.5, 2003/10/13 22:24:35
Line 223  def addPresentation2(self): Line 223  def addPresentation2(self):
         os.mkdir(path+"/"+folder_name)          os.mkdir(path+"/"+folder_name)
     except:      except:
         """nothing"""          """nothing"""
     print "NAME:",file_name      #print "NAME:",file_name
     f=open(path+"/"+folder_name+"/"+file_name,"w")      f=open(path+"/"+folder_name+"/"+file_name,"w")
     f.write(xmlinfo)      f.write(xmlinfo)
     f.close()      f.close()
Line 336  def addTextExternal(self,path,texturl,ve Line 336  def addTextExternal(self,path,texturl,ve
     writefile.close()      writefile.close()
           
     #registrieren      #registrieren
     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 "DONE:"+textpath+"/"+name      return "DONE:"+textpath+"/"+name
   
 def TextExternalError(text):  def TextExternalError(text):
     firsts=text[0:10]      firsts=text[0:10]
     print firsts      #print firsts
     try:      try:
         match=re.search(r".*<?xml.*",firsts)          match=re.search(r".*<?xml.*",firsts)
     except:      except:
Line 408  def addDirsToIndexMeta(path,folder_name, Line 408  def addDirsToIndexMeta(path,folder_name,
     writefile.write(dom.toxml().encode('utf-8'))      writefile.write(dom.toxml().encode('utf-8'))
     writefile.close()      writefile.close()
   
   def readArchimedesXML(folder):
       """gib URL aus """
       XML=urllib.urlopen("http://archimedes.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.cgi?step=xmlcorpusmanifest").read()
       #print XML
       dom=xml.dom.minidom.parseString(XML)
       items=dom.getElementsByTagName('item')
       dict={}
       
       for item in items:
           #print item.attributes['dir'].value
           try:        
               dict[item.attributes['dir'].value]=item.attributes['uri'].value
               #print item.attributes['dir'].value,item.attributes['text'].value
           except:
               """nothing"""
           
       if dict.has_key(folder):
           return dict[folder]
       else:
           return ""
 def combineTextImage(self,path):  def combineTextImage(self,path):
     """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 416  def combineTextImage(self,path): Line 436  def combineTextImage(self,path):
     imagefolders=[]      imagefolders=[]
     presentationfolders=[]      presentationfolders=[]
           
     for filename in files:      splitted=path.split("/")
       externxml=readArchimedesXML(splitted[len(splitted)-1])
                   
       for filename in files:
           #print "FN",filename
         if archive.isdigilib2(path+"/"+filename):          if archive.isdigilib2(path+"/"+filename):
             imagefolders.append(filename)              imagefolders.append(filename)
                           
         if archive.isFullText(path,filename):          if archive.isFullText(path,filename):
               #print "HI"
             texts.append(filename)              texts.append(filename)
         if archive.isPresentation(path,filename):          if archive.isPresentation(path,filename):
             presentationfolders.append(filename)              presentationfolders.append(filename)
Line 437  def combineTextImage(self,path): Line 461  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
       self.REQUEST.SESSION['externxml']=externxml
   
     newtemplate=PageTemplateFile('Products/OSA_system/ImageandText').__of__(self)      newtemplate=PageTemplateFile('Products/OSA_system/ImageandText').__of__(self)
     return newtemplate()      return newtemplate()
           
Line 477  def combineTextImage2(self,path): Line 503  def combineTextImage2(self,path):
         textfoldernode.appendChild(textfoldernodetext)          textfoldernode.appendChild(textfoldernodetext)
         subnode.appendChild(textfoldernode)          subnode.appendChild(textfoldernode)
   
       if self.REQUEST.has_key('external'):#USE CVS instead of local text
           textfoldernode=dom.createElement('text')
           textfoldernodetext=dom.createTextNode(self.REQUEST.SESSION['externxml'])
           textfoldernode.appendChild(textfoldernodetext)
           subnode.appendChild(textfoldernode)
           
     if self.REQUEST.has_key('pagebreak'):         if self.REQUEST.has_key('pagebreak'):   
         pagebreaknode=dom.createElement('pagebreak')          pagebreaknode=dom.createElement('pagebreak')
         pagebreaknodetext=dom.createTextNode(self.REQUEST['pagebreak'])          pagebreaknodetext=dom.createTextNode(self.REQUEST['pagebreak'])
Line 491  def combineTextImage2(self,path): Line 523  def combineTextImage2(self,path):
           
     node.appendChild(subnode)      node.appendChild(subnode)
   
     # node=dom.getElementsByTagName('lang')[0] #getNode      try:
           node=dom.getElementsByTagName('bib')[0]
           sub=dom.getElementsByTagName('lang')[0]
   
           node.removeChild(sub)
       except:
           """nothing"""
       try:
           main=dom.getElementsByTagName('bib')[0]
           node=dom.createElement('lang')
           textnode=dom.createTextNode(self.REQUEST['lang'])
           node.appendChild(textnode)
           main.appendChild(node)
       except:
           """nothing"""
     writefile=file(path+"/index.meta","w")      writefile=file(path+"/index.meta","w")
     writefile.write(dom.toxml().encode('utf-8'))      writefile.write(dom.toxml().encode('utf-8'))
     writefile.close()      writefile.close()

Removed from v.1.4  
changed lines
  Added in v.1.5


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