Project

General

Profile

« Previous | Next » 

Revision 4479

Added by daigle about 16 years ago

Handle exception during database update

View differences:

src/edu/ucsb/nceas/metacat/admin/MetaCatAdminServlet.java
131 131 
				// Forward the request main configuration page
132 132 
				request.setAttribute("metaCatVersion", SystemUtil.getMetacatVersion());
133 133 
			    request.setAttribute("propsConfigured", new Boolean(PropertyService.arePropertiesConfigured()));
134 
			    if (PropertyService.arePropertiesConfigured()) {
135 
					request.setAttribute("databaseVersion",
136 
							DBAdmin.getInstance().getDBVersion());
137 
				}
138 134 
			    request.setAttribute("ldapConfigured", new Boolean(LDAPUtil.isLDAPConfigured()));
139 135 
			    // TODO MCD figure out if we still need an org section
140 136 
			    //request.setAttribute("orgsConfigured", new Boolean(OrganizationUtil.areOrganizationsConfigured()));
......
143 139 
			    request.setAttribute("geoserverConfigured",
144 140 
			    		PropertyService.getProperty("configutil.geoserverConfigured"));
145 141 
			    request.setAttribute("metcatServletInitialized", MetaCatServlet.isFullyInitialized());
142 
			    if (PropertyService.arePropertiesConfigured()) {
143 
					request.setAttribute("databaseVersion",
144 
							DBAdmin.getInstance().getDBVersion());
145 
				}
146 146 
				RequestUtil.forwardRequest(request, response,
147 147 
						"/admin/metacat-configuration.jsp?configureType=configure");
148 148 
				return;
......
201 201 
		if (processingErrors.size() > 0) {
202 202 
			RequestUtil.clearRequestMessages(request);
203 203 
			RequestUtil.setRequestErrors(request,processingErrors);
204 
			RequestUtil.forwardRequest(request, response, "/admin/metacat-configuration.jsp");
204 
			// if the action that threw an exception was "configure" just go straight to the metacat
205 
			// configuration.  This will avoid a loop.  Otherwise, call the admin servlet with
206 
			// configuration action.
207 
			if (action != null && action.equals("configure")) {
208 
				RequestUtil.forwardRequest(request, response, "/admin/metacat-configuration.jsp");
209 
			} else {
210 
				RequestUtil.forwardRequest(request, response, "/admin?configureType=configure");
211 
			}
205 212 
		}
206 213 
	}
207 214 
}

Also available in: Unified diff