[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj Setup.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv12367

Modified Files:
	Setup.java 
Log Message:
Yves Henri AMAIZO's contributions.
Commited by Raul Davidovich on 20040918


Index: Setup.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/Setup.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Setup.java	10 May 2004 18:58:55 -0000	1.25
--- Setup.java	18 Sep 2004 00:05:55 -0000	1.26
***************
*** 469,472 ****
--- 469,475 ----
          int keyCount = 0;
          String oneConfigKey = null;
+ 		String setupKey = null;
+ 
+ 
          for (Enumeration e = ConfigManager.getAllConfigKeys();
               e.hasMoreElements();) {
***************
*** 481,485 ****
              try {
                  oneConfigKey = (String) e.nextElement();
! 
                  /* If the table doesn't exist, unless we're told to force
                  read, don't do it */
--- 484,489 ----
              try {
                  oneConfigKey = (String) e.nextElement();
! 				setupKey = oneConfigKey;
! 				
                  /* If the table doesn't exist, unless we're told to force
                  read, don't do it */
***************
*** 498,505 ****
                  */
                  try {
!                     if (!ConfigManager.getContext(oneConfigKey)
!                             .hasSetupTables()) {
                          skipThisContext = true;
!                     }
                  } catch (ConfigurationException ce) {
                      throw new DBException(ce);
--- 502,516 ----
                  */
                  try {
!                     if (!ConfigManager.getContext(oneConfigKey).hasSetupTables() &&
! 					    !ConfigManager.getContext(oneConfigKey).hasSetupValues()) {
                          skipThisContext = true;
!                     } else 
!                     	if (ConfigManager.getContext(oneConfigKey).hasSetupValues()) {
!                     		setupKey = StringUtil.notNull(ConfigManager.getContext(oneConfigKey).getSetupContext());
!                     		if (setupKey.equals("")) {
!                     			setupKey = "default";
!                     		}
!                     		skipThisContext = false;
!                     	}
                  } catch (ConfigurationException ce) {
                      throw new DBException(ce);
***************
*** 730,732 ****
      }
  
! } /* Setup */
\ No newline at end of file
--- 741,743 ----
      }
  
! } /* Setup */