gnue common/setup.py common/src/GConfig.py repo...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/04/27 18:13:02

Modified files:
        common         : setup.py 
        common/src     : GConfig.py 
        reports/samples/dcl: personnel-summary.grd 
        reports/src    : GRFilters.py 

Log message:
        misc fixes for reports filters

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/setup.py.diff?cvsroot=OldCVS&tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GConfig.py.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/samples/dcl/personnel-summary.grd.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRFilters.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/common/setup.py
diff -c gnue/common/setup.py:1.36 gnue/common/setup.py:1.37
*** gnue/common/setup.py:1.36   Sat Apr 27 16:59:51 2002
--- gnue/common/setup.py        Sat Apr 27 18:13:01 2002
***************
*** 173,190 ****
  ## .. and our settings
  ##
  common_etc = install_prefix + '/etc'
! common_images = install_prefix + '/shared/images'
  common_appbase = install_prefix
  
  # forms_etc = common_etc
  # forms_images = common_images
  # forms_appbase = common_appbase
  
  # reports_etc = common_etc
  # reports_images = common_images
  # reports_appbase = common_appbase
  
  # designer_etc = common_etc
  # designer_images = common_images
  
  ##
--- 173,194 ----
  ## .. and our settings
  ##
  common_etc = install_prefix + '/etc'
! common_shared = install_prefix + '/shared'
! common_images = common_shared + '/images'
  common_appbase = install_prefix
  
  # forms_etc = common_etc
+ # forms_shared = common_shared
  # forms_images = common_images
  # forms_appbase = common_appbase
  
  # reports_etc = common_etc
+ # reports_shared = common_shared
  # reports_images = common_images
  # reports_appbase = common_appbase
  
  # designer_etc = common_etc
+ # designer_shared = common_shared
  # designer_images = common_images
  
  ##
Index: gnue/common/src/GConfig.py
diff -c gnue/common/src/GConfig.py:1.15 gnue/common/src/GConfig.py:1.16
*** gnue/common/src/GConfig.py:1.15     Sat Apr 27 16:30:42 2002
--- gnue/common/src/GConfig.py  Sat Apr 27 18:13:02 2002
***************
*** 190,197 ****
    _site_config = {
        'install_prefix': install_prefix,
        'common_etc': os.path.join(install_prefix,'etc'),
!       'common_images': os.path.join(install_prefix,'shared/images'),
!       'common_appbase': install_prefix
    }
  
  
--- 190,198 ----
    _site_config = {
        'install_prefix': install_prefix,
        'common_etc': os.path.join(install_prefix,'etc'),
!       'common_images': os.path.join(install_prefix,'shared','images'),
!       'common_appbase': install_prefix,
!       'common_shared': os.path.join(install_prefix,'shared')
    }
  
  
Index: gnue/reports/samples/dcl/personnel-summary.grd
diff -c gnue/reports/samples/dcl/personnel-summary.grd:1.2 
gnue/reports/samples/dcl/personnel-summary.grd:1.3
*** gnue/reports/samples/dcl/personnel-summary.grd:1.2  Sat Oct 20 03:07:12 2001
--- gnue/reports/samples/dcl/personnel-summary.grd      Sat Apr 27 18:13:02 2002
***************
*** 11,17 ****
      <datasource name="projects" table="projects" database="dcl"
                  master="personnel" masterlink="id" detaillink="reportto"/>
    </sources>
!   <layout>
    &lt;personnel&gt;
      <section name="personSect" source="personnel">
      &lt;person&gt;
--- 11,17 ----
      <datasource name="projects" table="projects" database="dcl"
                  master="personnel" masterlink="id" detaillink="reportto"/>
    </sources>
!   <layout xmlns:out="GNUe:Reports:SimpleTabulation">
    &lt;personnel&gt;
      <section name="personSect" source="personnel">
      &lt;person&gt;
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.7 gnue/reports/src/GRFilters.py:1.8
*** gnue/reports/src/GRFilters.py:1.7   Sat Apr 27 16:30:42 2002
--- gnue/reports/src/GRFilters.py       Sat Apr 27 18:13:02 2002
***************
*** 120,126 ****
      # Get the base directory for filters
      filterBase = GConfig.get('FiltersDir','filters')
      if filterBase[0] != '/':
!       filterBase = GConfig.getInstalledBase('reports_shared') + filterBase
  
      # Pull in all the other sections
      for section in self._parser.sections():
--- 120,126 ----
      # Get the base directory for filters
      filterBase = GConfig.get('FiltersDir','filters')
      if filterBase[0] != '/':
!       filterBase = GConfig.getInstalledBase('reports_shared', 
'common_shared') + filterBase
  
      # Pull in all the other sections
      for section in self._parser.sections():