From 892d69b876b07cdb7d41fc2e6abbef0568d213b6 Mon Sep 17 00:00:00 2001
From: gdetrez <none>
Date: Fri, 6 Oct 2006 21:01:49 +0200
Subject: [PATCH] evolution, plus propre

darcs-hash:20061006190149-f46e9-26dccef11b6ed60711c19e004496559cba92e1bb.gz
---
 intranet/Root.py | 104 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 37 deletions(-)

diff --git a/intranet/Root.py b/intranet/Root.py
index 5a58085d..3dfed6ef 100755
--- a/intranet/Root.py
+++ b/intranet/Root.py
@@ -5,6 +5,58 @@
 import cherrypy, sys, os, datetime
 sys.path.append('/usr/scripts/gestion/')
 
+            
+# ######################################################## #
+#                 COMMAND LINE OPTION                      #
+# ######################################################## #
+# 
+#
+
+from optparse import OptionParser
+
+parser = OptionParser()
+parser.add_option("-d", "--dev",
+    action="store_true", dest="dev", default=False,
+    help="launch in dev mode")
+parser.add_option("-p", "--port",
+    action="store", type="int", dest="port",
+    help="change server port")
+     
+(options, args) = parser.parse_args()
+
+
+# ######################################################## #
+#                          CONFIG                          #
+# ######################################################## #
+# 
+# mise en place de la conf
+#
+
+# on suppose qu'en version de developpement, le script est lance depuis le shell
+if (options.dev):
+    cherrypy.config.update(file=os.getcwd() + "/conf/dev.cfg") 
+    cherrypy.config.update(file=os.getcwd() + "/conf/intranet.cfg")
+    settings={'global': { 'rootDir': os.getcwd() } }                                                                                                                                         
+    cherrypy.config.update(settings)                                                                                                               
+                
+else:
+    cherrypy.config.update(file="/usr/scripts/intranet/conf/prod.cfg") 
+    cherrypy.config.update(file="/usr/scripts/intranet/conf/intranet.cfg") 
+
+# changer le port ??
+if (options.port):
+    settings={'global':{'server.socketPort':options.port}}
+    cherrypy.config.update(settings)                                                                                                               
+    
+
+if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
+    from ldap_crans_test import crans_ldap
+    print("settings : unsing test ldap : env=" + cherrypy.config.configMap["global"]["server.environment"])
+else:
+    from ldap_crans import crans_ldap
+    print("settings : unsing prod ldap : env=" + cherrypy.config.configMap["global"]["server.environment"])
+cherrypy.config.update({'global':{'crans_ldap':crans_ldap()}})
+
 # ######################################################## #
 #                     FILTRES MAISON                       #
 # ######################################################## #
@@ -47,6 +99,14 @@ class Intranet:
     }
     info.exposed = True
     
+    '''
+    def _cp_on_http_error(self, status, message):
+        cherrypy.response.body = {
+            'template':'error',
+            'values':{'status':status, 'message':message }, 
+            'standalone':False,
+        }
+    '''
     '''
     def nounous(self):
         return "coucou"
@@ -98,52 +158,22 @@ def verifLogin(login = '', password = ''):
         #print("sth empty")
         message = u"L'authentification a echou&eacute;."
     return message    
-            
-# ######################################################## #
-#                 COMMAND LINE OPTION                      #
-# ######################################################## #
-# 
-#
-
-from optparse import OptionParser
-
-parser = OptionParser()
-parser.add_option("-d", "--dev",
-    action="store_true", dest="dev", default=False,
-    help="launch in dev mode")
-     
-(options, args) = parser.parse_args()
 
 
-# ######################################################## #
-#                         CHERRYPY                         #
-# ######################################################## #
-# 
-# mise en place de cherrypy + conf
-#
-
-cherrypy.config.update(file="/usr/scripts/intranet/conf/intranet.cfg") 
-if (options.dev):
-    cherrypy.config.update(file="/usr/scripts/intranet/conf/dev.cfg") 
-else:
-    cherrypy.config.update(file="/usr/scripts/intranet/conf/prod.cfg") 
 
 
+
+# on indique tout ca a cherrypy
 settings={'/': {
     'sessionAuthenticateFilter.checkLoginAndPassword': verifLogin,
     'sessionAuthenticateFilter.loginScreen': login
     }}
 cherrypy.config.update(settings)
 
-if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
-    from ldap_crans_test import crans_ldap
-    print("settings : unsing test ldap : env=" + cherrypy.config.configMap["global"]["server.environment"])
-else:
-    from ldap_crans import crans_ldap
-    print("settings : unsing prod ldap : env=" + cherrypy.config.configMap["global"]["server.environment"])
-cherrypy.config.update({'global':{'crans_ldap':crans_ldap()}})
-cherrypy.root = Intranet()
 
+    
+# ######################################################## #
+#                 LANCEMENT DE CHERRYPY                    #
+# ######################################################## #
+cherrypy.root = Intranet()
 cherrypy.server.start()
-    
-