/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 8323

Added by Jing Tao about 11 years ago

Add code the display the SchemaModification exception.

                             String error1 = "SolrSchemaUpdator.update - couldn't determine if the schema.xml in the "+solrHomePath+"/conf"+
                                             " was modified or not. If you did modify it, please manually merge the change to the file "+metacatIndexSolrHome+SCHEMAFILERELATIVEPATH +" and copy it to "+
                                             solrHomePath+"/conf; otherwise, just copy the file "+metacatIndexSolrHome+SCHEMAFILERELATIVEPATH +" to "+solrHomePath+"/conf.";
                             String error2 ="\nAfter copying the schema file, you have to issue a 'reindexall' action as an administrator.";
                             String error3 = "SolrSchemaUpdator.update - Metacat determined the schema.xml in the "+solrHomePath+"/conf"+
                                             " was modified. Please manually merge the change to the file "+metacatIndexSolrHome+SCHEMAFILERELATIVEPATH +" and copy it to overwrite "+
                                             solrHomePath+"/conf/schema.xml.";
                             //String error2 ="After configuring Metacat and restarting Tomcat, you have to issue a 'reindexall' action as an administrator to rebuild the Solr index.";
                             String error3 = "Metacat determined the schema.xml in the "+solrHomePath+"/conf"+
                                             " was customized. You have to manually fix the issue - merge the change to the file "+metacatIndexSolrHome+SCHEMAFILERELATIVEPATH +" and copy it to overwrite the schema.xml in the "+
                                             solrHomePath+"/conf. You may click the OK button When you finish the merging. ";
                             if(checkSum != null) {
                                 String checksumValue = checkSum.getValue();
                                 //System.out.println("the existing schema.xml in the solr home has the checksum ================== "+checksumValue);
-...
                                         } else {
                                             //users changed the schema, we have to throw an exception to ask the administrator to manually merge and overwrite.
                                             throw new SolrSchemaModificationException(error3+error2);
                                             throw new SolrSchemaModificationException(error3);
+                                        }
+                                    }
                                 } else {
                                     throw new SolrSchemaModificationException(error1+error2);
                                     throw new SolrSchemaModificationException(error1);
+                                }
                             } else {
                                 throw new SolrSchemaModificationException(error1+error2);
                                 throw new SolrSchemaModificationException(error1);
+                            }
+                        }
+                    }

     import edu.ucsb.nceas.metacat.MetacatVersion;
     import edu.ucsb.nceas.metacat.admin.upgrade.UpgradeUtilityInterface;
     import edu.ucsb.nceas.metacat.admin.upgrade.solr.SolrSchemaModificationException;
     import edu.ucsb.nceas.metacat.database.DBConnection;
     import edu.ucsb.nceas.metacat.database.DBConnectionPool;
     import edu.ucsb.nceas.metacat.database.DBVersion;
-...
     	private HashSet<String> sqlCommandSet = new HashSet<String>();
     	private Map<String, String> scriptSuffixMap = new HashMap<String, String>();
     	private static DBVersion databaseVersion = null;
     	private SolrSchemaModificationException solrSchemaException = null;
     	/**
     	 * private constructor since this is a singleton
-...
     		String processForm = request.getParameter("processForm");
     		String formErrors = (String) request.getAttribute("formErrors");
     		HttpSession session = request.getSession();
     		String supportEmail = null;
     		if (processForm == null || !processForm.equals("true") || formErrors != null) {
     			// The servlet configuration parameters have not been set, or there
-...
     				request.setAttribute("databaseVersion", dbVersionString);
     				Vector<String> updateScriptList = getUpdateScripts();
     				request.setAttribute("updateScriptList", updateScriptList);
     				String supportEmail = PropertyService.getProperty("email.recipient");
     				supportEmail = PropertyService.getProperty("email.recipient");
     				request.setAttribute("supportEmail", supportEmail);
     				// Forward the request to the JSP page
-...
     				// there is no other easy way to go back to the configure form
     				// and
     				// preserve their entries.
     			    supportEmail = PropertyService.getProperty("email.recipient");
     				validationErrors.addAll(validateOptions(request));
     				upgradeDatabase();
     				// Now that the options have been set, change the
     				// 'databaseConfigured' option to 'true' so that normal metacat
     				// requests will go through
     				PropertyService.setProperty("configutil.databaseConfigured",
     						PropertyService.CONFIGURED);
     				PropertyService.persistMainBackupProperties();
                     if(solrSchemaException != null) {
                         //Show the warning message
                         Vector<String> errorVector = new Vector<String>();
                         errorVector.add(solrSchemaException.getMessage());
                         RequestUtil.clearRequestMessages(request);
                         request.setAttribute("supportEmail", supportEmail);
                         RequestUtil.setRequestErrors(request, errorVector);
                         RequestUtil.forwardRequest(request, response,
                                         "/admin/solr-schema-warn.jsp", null);
                     } else {
                         // Reload the main metacat configuration page
                         processingSuccess.add("Database successfully upgraded");
                         RequestUtil.clearRequestMessages(request);
                         RequestUtil.setRequestSuccess(request, processingSuccess);
                         RequestUtil.forwardRequest(request, response,
                                 "/admin?configureType=configure&processForm=false", null);
                         // Write out the configurable properties to a backup file
                         // outside the install directory.
     				// Reload the main metacat configuration page
     				processingSuccess.add("Database successfully upgraded");
     				RequestUtil.clearRequestMessages(request);
     				RequestUtil.setRequestSuccess(request, processingSuccess);
     				RequestUtil.forwardRequest(request, response,
     						"/admin?configureType=configure&processForm=false", null);
     				// Write out the configurable properties to a backup file
     				// outside the install directory.
     				PropertyService.persistMainBackupProperties();
+                    }
     			} catch (GeneralPropertyException gpe) {
     				throw new AdminException("DBAdmin.configureDatabase - Problem getting or setting " +
     						"property while upgrading database: " + gpe.getMessage());
-...
     				try {
     					utility = (UpgradeUtilityInterface) Class.forName(className).newInstance();
     					utility.upgrade();
     				} catch (SolrSchemaModificationException e) {
     				    //don't throw the exception and continue
     				    solrSchemaException = e;
     				    continue;
     				} catch (Exception e) {
     					throw new AdminException("DBAdmin.upgradeDatabase - error getting utility class: "
     							+ className + ". Error message: "

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 8323

Added by Jing Tao about 11 years ago