gnue/reports README setup.py src/GRServer.py cl...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/10/24 14:37:59

Modified files:
        reports        : README setup.py 
        reports/src    : GRServer.py 
Added files:
        reports/client : grserve.in 

Log message:
        simplified the setup scripts; continued work on report server

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/README.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/setup.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/client/grserve.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRServer.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/reports/README
diff -u gnue/reports/README:1.4 gnue/reports/README:1.5
--- gnue/reports/README:1.4     Tue May 29 22:19:49 2001
+++ gnue/reports/README Wed Oct 24 14:37:59 2001
@@ -1,17 +1,5 @@
-GNUe-Reports is in an early alpha state and is not currently useful.
-You have been warned :) 
-
 GNUe-Reports requires gnue-common to be installed, including the setup
 of the connections file (see gnue-common README for details). 
-
-In the src directory, there is a "grrun" program.  It creates a 
-Report Engine, passes the engine a report, and prints the output 
-from the engine to stdout.  Execute "grrun --help" to see all 
-available run-time options (user parameters, sorting options, etc).  
-
-
-At the time of this writing, only postgresql is supported. This will
-quickly change. 
 
 For questions, use the reports mailing list at http://lists.gnue.org/ 
 or visit us in IRC at irc.openprojects.net, channel #gnuenterprise
Index: gnue/reports/setup.py
diff -u gnue/reports/setup.py:1.1 gnue/reports/setup.py:1.2
--- gnue/reports/setup.py:1.1   Sun Oct  7 02:28:34 2001
+++ gnue/reports/setup.py       Wed Oct 24 14:37:59 2001
@@ -51,8 +51,7 @@
 
 def developer_install():
   pwd = os.getcwd()
-  grcvs = """
-#!/bin/sh     
+  grcvs = """#!/bin/sh
      if [ "z$GNUE_CONNECTIONS" = "z" ]
       then
        if [ -f /usr/local/gnue/etc/connections.conf ]
@@ -67,9 +66,29 @@
        export INSTALL_PREFIX
      fi
      PYTHONPATH=%s/.cvsdevelbase:$PYTHONPATH; export PYTHONPATH
-     %s %s/.cvsdevelbase/gnue/reports/GFClient.py $*
+     %s %s/.cvsdevelbase/gnue/reports/GRun.py $*
   """ % (pwd, sys.executable, pwd)
 
+  grdcvs = """#!/bin/sh
+     if [ "z$GNUE_CONNECTIONS" = "z" ]
+      then
+       if [ -f /usr/local/gnue/etc/connections.conf ]
+       then
+         GNUE_CONNECTIONS=/usr/local/gnue/etc/connections.conf
+         export GNUE_CONNECTIONS
+       fi
+     fi
+     if [ "z$INSTALL_PREFIX" = "z" ]
+     then
+       INSTALL_PREFIX=/usr/local/gnue/
+       export INSTALL_PREFIX
+     fi
+     PYTHONPATH=%s/.cvsdevelbase:$PYTHONPATH; export PYTHONPATH
+     %s %s/.cvsdevelbase/gnue/reports/GRServer.py $*
+  """ % (pwd, sys.executable, pwd)
+
+
+
   if os.path.isdir('.cvsdevelbase'):
     os.system ('rm -rf .cvsdevelbase')
 
@@ -224,7 +243,7 @@
               
        packages = ["gnue.reports"],
        package_dir = {"gnue.reports" : "src"},
-       scripts = ["client/grrun"]
+       scripts = ["client/grrun", "client/grserve"]
        )
 
 if 'install' in sys.argv:
Index: gnue/reports/src/GRServer.py
diff -u gnue/reports/src/GRServer.py:1.1 gnue/reports/src/GRServer.py:1.2
--- gnue/reports/src/GRServer.py:1.1    Mon Oct 22 19:01:34 2001
+++ gnue/reports/src/GRServer.py        Wed Oct 24 14:37:59 2001
@@ -37,28 +37,24 @@
   # GClientApp() overrides
   #
   VERSION = "0.0.1"
-  COMMAND = "grrun"
-  NAME = "GNUe Reports Client"
-  USAGE = "%s [options] file" % COMMAND
+  COMMAND = "grserve"
+  NAME = "GNUe Reports Server"
+  USAGE = "%s [options]" % COMMAND
   COMMAND_OPTIONS = [ ]
   SUMMARY = \
      "GNUe Reports is the primary reporting agent of the GNU Enterprise 
system."
-  USAGE = GClientApp.USAGE % COMMAND + " [param1=val] [param2=val] [...]"
 
   # 
   # Initialize the class
   #
   def __init__(self):    
     GServerApp.__init__(self)
-    lh = LoginHandler()
 
-    try: 
-      if len(self.OPTIONS['user']):
-        lh.defaults['_username'] = self.OPTIONS['user']
-      if len(self.OPTIONS['password']):
-        lh.defaults['_password'] = self.OPTIONS['password']
-    except: 
-      pass
+
+  def run(self): 
+
+    # Take us into daemon mode...
+    GServerApp.run(self)
 
 
   def runInstance(self):