Diff for /OSAS/OSA_system/OSAS_addfiles.py between versions 1.18 and 1.20

version 1.18, 2004/03/19 21:28:21 version 1.20, 2004/03/25 09:57:47
Line 4 Line 4
 from OSAS_helpers import readArchimedesXML, getISO, getText  from OSAS_helpers import readArchimedesXML, getISO, getText
 import os  import os
 import xml.dom.minidom  import xml.dom.minidom
   try:
 from Products.ECHO_content import ECHO_collection  from Products.ECHO_content import ECHO_collection
   except:
       print "Ignoring ECHO_collection import...."
       
 import urllib  import urllib
 import OSAS_add  import OSAS_add
 import OSAS_show  import OSAS_show
Line 410  class OSAS_combineTextImage(Folder): Line 414  class OSAS_combineTextImage(Folder):
     def getProjects(self,obj_ids=None):      def getProjects(self,obj_ids=None):
         """Get the Project title for configuration"""          """Get the Project title for configuration"""
         ret=[]          ret=[]
           print "HI"
         try:          try:
             projects=self.ZopeFind(self.projects,obj_metatypes='OSAS_project',obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie.              projects=self.ZopeFind(self.projects,obj_metatypes=['OSAS_project'],obj_ids=obj_ids)#assumes projects folder somewhere in the hierarchie.
             print projects              print "pr"
             for project in projects:              for project in projects:
                 ret.append((project[1].title,project[0],project[1]))                  ret.append((project[1].title,project[0],project[1]))
             print ret              print ret

Removed from v.1.18  
changed lines
  Added in v.1.20


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