updates to include "prepare" method from base edit configuration since old prepare has been removed from edit request dispatch controller - also commented out agrovoc from appearing on the search page

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java

@@ -129,6 +129,8 @@ public class AddAssociatedConceptGenerator  extends VivoBaseGenerator implements
         //Adding term should return to this same page, not the subject
         //Return takes the page back to the individual form
         editConfiguration.setUrlPatternToReturnTo(EditConfigurationUtils.getFormUrlWithoutContext(vreq));
+    	//prepare
+        prepare(vreq, editConfiguration);
         return editConfiguration;
     }
     

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java

@@ -66,6 +66,7 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
      	
          //Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
+        prepare(vreq, editConfiguration);
      	return editConfiguration;
     }
 

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditWebpageFormGenerator.java

@@ -92,7 +92,7 @@ public class AddEditWebpageFormGenerator extends BaseEditConfigurationGenerator
                 
         //might be null
         config.addFormSpecificData("subjectName", getName( config, vreq));
-        
+        prepare(vreq, config);
         return config;
     }
 

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPublicationToPersonGenerator.java

@@ -92,6 +92,7 @@ public class AddPublicationToPersonGenerator extends VivoBaseGenerator implement
 
         // Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
+        prepare(vreq, editConfiguration);
         return editConfiguration;
     }
 

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddRoleToPersonTwoStageGenerator.java

@@ -168,6 +168,8 @@ public abstract class AddRoleToPersonTwoStageGenerator extends BaseEditConfigura
         addPreprocessors(editConfiguration, vreq.getWebappDaoFactory());
         //Adding additional data, specifically edit mode
         addFormSpecificData(editConfiguration, vreq);
+        //prepare
+        prepare(vreq, editConfiguration);
     	return editConfiguration;
     }    	
 

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddUserDefinedConceptGenerator.java

@@ -119,6 +119,7 @@ public class AddUserDefinedConceptGenerator  extends VivoBaseGenerator implement
         //Adding term should return to this same page, not the subject
         //Return takes the page back to the individual form
         editConfiguration.setUrlPatternToReturnTo(getUrlPatternToReturnTo(vreq));
+    	prepare(vreq, editConfiguration);
         return editConfiguration;
     }
     

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java

@@ -76,7 +76,7 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
         }else{
             config.addFormSpecificData("subjectName", null);
         }
-        
+        prepare(vreq, config);
         return config;
     }
   

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java

@@ -78,7 +78,7 @@ public class NewIndividualFormGenerator extends BaseEditConfigurationGenerator i
         //Note, the spaces are important - they were added by ProcessRdfFormController earlier
         //as a means of ensuring the substitution worked correctly - as the regex expects spaces
         config.setEntityToReturnTo(" ?newInd ");
-        
+        prepare(vreq, config);
     	return config;
     }
     

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/OrganizationHasPositionHistoryGenerator.java

@@ -222,7 +222,7 @@ public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 
 		conf.addValidator(new DateTimeIntervalValidationVTwo("startField",
 				"endField"));
-
+		prepare(vreq, conf);
 		return conf;
 	}
 }

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java

@@ -179,6 +179,7 @@ public class PersonHasEducationalTraining  extends VivoBaseGenerator implements
         conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField"));
       //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
+        prepare(vreq, conf);
         return conf;
     }
 

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java

@@ -158,7 +158,7 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
 
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
-
+        prepare(vreq, conf);
         return conf;
     }
 

src/edu/cornell/mannlib/vitro/webapp/utils/ConceptSearchService/ConceptSearchServiceUtils.java

@@ -38,8 +38,9 @@ public class ConceptSearchServiceUtils {
 	public static HashMap<String, VocabSourceDescription> getVocabSources() {
 		HashMap<String, VocabSourceDescription> map = new HashMap<String, VocabSourceDescription>();
     	map.put(UMLSVocabSource, new VocabSourceDescription("UMLS", UMLSVocabSource, "http://www.nlm.nih.gov/research/umls/", "Unified Medical Language System"));
-    	map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "http://www.fao.org/agrovoc/", "Agricultural Vocabulary"));
+    	//Commenting out agrovoc for now until implementation is updated
-    	map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "General Multilingual Environmental Thesaurus"));
+    	//	map.put(AgrovocVocabSource, new VocabSourceDescription("AGROVOC", AgrovocVocabSource, "www.fao.org/agrovoc/", "Agricultural Vocabulary"));
+    	map.put(GemetVocabSource, new VocabSourceDescription("GEMET", GemetVocabSource, "http://www.eionet.europa.eu/gemet", "GEneral Multilingual Environmental Thesaurus"));
     	return map;
 	}