gnue common/src/__init__.py reports/adapters/fi...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/11 13:45:15

Modified files:
        common/src     : __init__.py 
        reports/adapters/filters/sablotron: Adapter.py 

Log message:
        [ticket #87] added urlize function to Common; fixed sablotron driver to 
return file://c:... when c:... is the file name

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/__init__.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/sablotron/Adapter.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/common/src/__init__.py
diff -c gnue/common/src/__init__.py:1.12 gnue/common/src/__init__.py:1.13
*** gnue/common/src/__init__.py:1.12    Sat Jun 15 15:51:35 2002
--- gnue/common/src/__init__.py Wed Sep 11 13:45:15 2002
***************
*** 60,70 ****
  import string
  
  #
! # Open a file or URL resource, 
  # properly handling drive letters.
  #
! def openResource(resource): 
!   drive = os.path.splitdrive(resource) 
    if len(drive[0]):
      return open(resource,'r')
    else:
--- 60,70 ----
  import string
  
  #
! # Open a file or URL resource,
  # properly handling drive letters.
  #
! def openResource(resource):
!   drive = os.path.splitdrive(resource)
    if len(drive[0]):
      return open(resource,'r')
    else:
***************
*** 83,89 ****
      for comp in components[1:]:
          mod = getattr(mod, comp)
      return mod
!   except AttributeError, mesg: 
      raise ImportError, mesg
  
  
--- 83,89 ----
      for comp in components[1:]:
          mod = getattr(mod, comp)
      return mod
!   except AttributeError, mesg:
      raise ImportError, mesg
  
  
***************
*** 111,114 ****
--- 111,126 ----
    return text
    
  
+ 
+ # Try to turn a resource into a valid URI 
+ # (because C:\ confuses some tools)
+ def urlize (resource):
+   if not resource.find(':'):
+     return 'file://%s' % resource
+   else:
+    drive = os.path.splitdrive(resource)
+    if len(drive[0]) and drive[0] == resource[:len(drive[0])]
+      return 'file://%s' % resource
+    else:
+      return resource
  
Index: gnue/reports/adapters/filters/sablotron/Adapter.py
diff -c gnue/reports/adapters/filters/sablotron/Adapter.py:1.6 
gnue/reports/adapters/filters/sablotron/Adapter.py:1.7
*** gnue/reports/adapters/filters/sablotron/Adapter.py:1.6      Tue May 14 
20:27:39 2002
--- gnue/reports/adapters/filters/sablotron/Adapter.py  Wed Sep 11 13:45:15 2002
***************
*** 38,44 ****
  
  
  from gnue.reports.GROutputAdapter import TransformAdapter as Base
! 
  
  class TransformAdapter(Base):
  
--- 38,44 ----
  
  
  from gnue.reports.GROutputAdapter import TransformAdapter as Base
! from gnue.common import urlize
  
  class TransformAdapter(Base):
  
***************
*** 65,71 ****
        raise "Filter configuration file is missing the 'template=' parameter"
  
      # Let sablotron do its thing
!     PySablot.ProcessFiles(xslfile,self.infile,outfile)
      P = Sablot.Sablot()
  
      try:
--- 65,71 ----
        raise "Filter configuration file is missing the 'template=' parameter"
  
      # Let sablotron do its thing
!     PySablot.ProcessFiles(urlize(xslfile),urlize(self.infile),urlize(outfile))
      P = Sablot.Sablot()
  
      try:
***************
*** 79,81 ****
--- 79,82 ----
  
      # clean up our temp files
      self.deleteTempFile(self.infile)
+