gnue-reports ./setup.py scripts/gnue-reports-se...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-reports
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/10/29 06:37:44

Modified files:
        .              : setup.py 
        scripts        : gnue-reports-server 
        src/server     : GRServer.py 

Log message:
        * fixed sleep time for win32
        * added gnue-report-server to setup.py
        * updated command line option

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/setup.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/scripts/gnue-reports-server.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/server/GRServer.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gnue-reports/scripts/gnue-reports-server
diff -c gnue-reports/scripts/gnue-reports-server:1.2 
gnue-reports/scripts/gnue-reports-server:1.3
*** gnue-reports/scripts/gnue-reports-server:1.2        Sun Oct  5 14:02:38 2003
--- gnue-reports/scripts/gnue-reports-server    Wed Oct 29 06:37:44 2003
***************
*** 22,25 ****
  from gnue.reports.server.GRServer import GRServer
  
  if __name__ == '__main__':
!   GRServer().run()
--- 22,27 ----
  from gnue.reports.server.GRServer import GRServer
  
  if __name__ == '__main__':
!   grserv=GRServer()
!   grserv.phaseInit()
!   grserv.run()
Index: gnue-reports/setup.py
diff -c gnue-reports/setup.py:1.36 gnue-reports/setup.py:1.37
*** gnue-reports/setup.py:1.36  Tue Oct 21 12:11:38 2003
--- gnue-reports/setup.py       Wed Oct 29 06:37:42 2003
***************
*** 21,27 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.36 2003/10/21 16:11:38 reinhard Exp $
  
  import sys
  import os
--- 21,27 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: setup.py,v 1.37 2003/10/29 11:37:42 btami Exp $
  
  import sys
  import os
***************
*** 60,70 ****
  
      # The Programs
      params ["package_dir"] = {"gnue.reports": "src"}
!     params ["scripts"]     = ["scripts/gnue-reports"]
  
      # The Data
      filterLabels = self.allfiles ("src/adapters/filters/Labels/etc/")
      filterSimple = self.allfiles 
("src/adapters/filters/SimpleTabulation/etc/")
      man1files    = self.allfiles ("doc/man")
      docfiles     = self.allfiles ("doc")
      samp01files  = self.allfiles ("samples/cross-tabulation")
--- 60,72 ----
  
      # The Programs
      params ["package_dir"] = {"gnue.reports": "src"}
!     params ["scripts"]     = ["scripts/gnue-reports",
!                               "scripts/gnue-reports-server"]
  
      # The Data
      filterLabels = self.allfiles ("src/adapters/filters/Labels/etc/")
      filterSimple = self.allfiles 
("src/adapters/filters/SimpleTabulation/etc/")
+     grpcfiles   = ["grpc/GRServer.grpc"]
      man1files    = self.allfiles ("doc/man")
      docfiles     = self.allfiles ("doc")
      samp01files  = self.allfiles ("samples/cross-tabulation")
***************
*** 78,83 ****
--- 80,86 ----
      params ["data_files"] = \
        [("share/gnue/filters/Labels",                        filterLabels),
         ("share/gnue/filters/SimpleTabulation",              filterSimple),
+        ("share/gnue/grpc",                                  grpcfiles),
         ("share/man/man1",                                   man1files),
         ("share/doc/gnue-reports",                           docfiles),
         ("share/doc/gnue-reports/examples/cross-tabulation", samp01files),
Index: gnue-reports/src/server/GRServer.py
diff -c gnue-reports/src/server/GRServer.py:1.14 
gnue-reports/src/server/GRServer.py:1.15
*** gnue-reports/src/server/GRServer.py:1.14    Tue Oct 28 13:23:50 2003
--- gnue-reports/src/server/GRServer.py Wed Oct 29 06:37:44 2003
***************
*** 46,56 ****
    NAME = "GNUe Reports Server"
    USAGE = GServerApp.GServerApp.USAGE
    COMMAND_OPTIONS = [    
!     [ 'rpctype',None,'rpc-type',1,"xmlrpc", 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
!       _("for <type> are 'xmlrpc' and 'pw_xmlrpc'. For more information on ")+
!       _('GNURPC connection types have a look at ')+
!       _('common/doc/RPC-abstraction. ')],
      [ 'rpcport',None,'rpc-port',1,8766, 'port',
        _('Set the GNURPC port. For more information on ')+
        _('GNURPC have a look at common/doc/RPC-abstraction. ')],
--- 46,56 ----
    NAME = "GNUe Reports Server"
    USAGE = GServerApp.GServerApp.USAGE
    COMMAND_OPTIONS = [    
!     [ 'rpctype',None,'rpc-type',1,'xmlrpc', 'type',
        _('Set the GNURPC connection type. The currently supported values ')+
!       _("for <type> are 'xmlrpc','xmlrpc.py_xmlrpc', 'xmlrpc.pw_xmlrpc'")+
!       _("and 'pyro'. For more information on GNURPC connection types have ")+
!       _('a look at common/doc/RPC-abstraction. ')],
      [ 'rpcport',None,'rpc-port',1,8766, 'port',
        _('Set the GNURPC port. For more information on ')+
        _('GNURPC have a look at common/doc/RPC-abstraction. ')],
***************
*** 111,116 ****
--- 111,119 ----
                           self._transports,                         
                           {'GReportServer': self.requestServer })
  
+     # be verbose
+     print _("\n... GNUe Reports server up and running ...\n")
+ 
      # Daemonize (if appropriate)
      GServerApp.GServerApp.run(self)
  
***************
*** 119,126 ****
        servers[key].serveAsNewThread()      
  
      # wait for the servers shut down
!     while 1==1:
!       time.sleep(199999999)
  
  
    def requestServer(self):
--- 122,132 ----
        servers[key].serveAsNewThread()      
  
      # wait for the servers shut down
!     try:
!       while 1==1:
!         time.sleep(1999999)
!     except KeyboardInterrupt:
!       print "Reports server is shuting down....ok"
  
  
    def requestServer(self):