litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

Browse source
This commit is contained in:
hudajkhan 2014-04-23 15:00:55 -04:00
commit 55e8538949
59 changed files with 1892 additions and 1041 deletions
Download patch file Download diff file Expand all files Collapse all files

4
productMods/WEB-INF/classes/smokeTests/vivoTests.txt
View file

@ -1,4 +0,0 @@
# Note: The classes mentioned below must be present in
# edu.cornell.mannlib.vitro.webapp.utils.smoketest package.
SolrContextChecker

11
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -13,6 +13,8 @@ edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings$Setup
edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$Setup
edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup
edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup
@ -65,12 +67,13 @@ edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
# For multiple language support # For multiple language support
edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
# Add VIVO specific DocumentModifers, this must come before SolrSetup # Add VIVO specific DocumentModifers, this must come before SearchIndexerSetup
edu.cornell.mannlib.vitro.webapp.search.solr.VivoDocumentModifiers edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers
# The Solr index uses a "public" permission, so the PropertyRestrictionPolicyHelper # The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper
# and the PermissionRegistry must already be set up. # and the PermissionRegistry must already be set up.
edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup edu.cornell.mannlib.vitro.webapp.searchengine.SearchEngineSetup
edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup
edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration$Setup edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration$Setup

21
productMods/WEB-INF/web.xml
View file

@ -1120,7 +1120,7 @@
<servlet> <servlet>
<servlet-name>SparqlQuery</servlet-name> <servlet-name>SparqlQuery</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.admin.SparqlQueryController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
@ -1128,6 +1128,16 @@
<url-pattern>/admin/sparqlquery</url-pattern> <url-pattern>/admin/sparqlquery</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>SparqlQueryApi</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.api.SparqlQueryApiController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SparqlQueryApi</servlet-name>
<url-pattern>/api/sparqlQuery</url-pattern>
</servlet-mapping>
<servlet> <servlet>
<servlet-name>SparqlUpdateApi</servlet-name> <servlet-name>SparqlUpdateApi</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.api.SparqlUpdateApiController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.api.SparqlUpdateApiController</servlet-class>
@ -1390,15 +1400,6 @@
<url-pattern>/searchService/*</url-pattern> <url-pattern>/searchService/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet>
<servlet-name>SmokeTestController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SmokeTestController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SmokeTestController</servlet-name>
<url-pattern>/smoketest</url-pattern>
</servlet-mapping>
<!-- ==================== tag libraries ============================== --> <!-- ==================== tag libraries ============================== -->
<jsp-config> <jsp-config>

6
productMods/js/homePageUtils.js
View file

@ -23,7 +23,7 @@ $(document).ready(function(){
var individualList = ""; var individualList = "";
if ( facultyMemberCount > 0 ) { if ( facultyMemberCount > 0 ) {
// determine the row at which to start the solr query // determine the row at which to start the search query
var rowStart = Math.floor((Math.random()*facultyMemberCount)); var rowStart = Math.floor((Math.random()*facultyMemberCount));
var diff; var diff;
var pageSize = 4; // the number of faculty to display on the home page var pageSize = 4; // the number of faculty to display on the home page
@ -34,7 +34,7 @@ $(document).ready(function(){
} }
// in case the random number is equal to or within 3 of the facultyMemberCount // in case the random number is equal to or within 3 of the facultyMemberCount
// subtract 1 from the facultyMemberCount because the Solr rows begin at 0, not 1 // subtract 1 from the facultyMemberCount because the search rows begin at 0, not 1
if ( (rowStart + (pageSize-1)) > (facultyMemberCount-1) ) { if ( (rowStart + (pageSize-1)) > (facultyMemberCount-1) ) {
diff = (rowStart + (pageSize-1)) - (facultyMemberCount-1); diff = (rowStart + (pageSize-1)) - (facultyMemberCount-1);
if ( diff == 0 ) { if ( diff == 0 ) {
@ -48,7 +48,7 @@ $(document).ready(function(){
rowStart = 0; rowStart = 0;
} }
var dataServiceUrl = urlsBase + "/dataservice?getRandomSolrIndividualsByVClass=1&vclassId="; var dataServiceUrl = urlsBase + "/dataservice?getRandomSearchIndividualsByVClass=1&vclassId=";
var url = dataServiceUrl + encodeURIComponent("http://vivoweb.org/ontology/core#FacultyMember"); var url = dataServiceUrl + encodeURIComponent("http://vivoweb.org/ontology/core#FacultyMember");
url += "&page=" + rowStart + "&pageSize=" + pageSize; url += "&page=" + rowStart + "&pageSize=" + pageSize;

2
productMods/js/menupage/processDataGetterUtils.js
View file

@ -11,7 +11,7 @@ var processDataGetterUtils = {
"sparqlQuery": processSparqlDataGetterContent, "sparqlQuery": processSparqlDataGetterContent,
"fixedHtml":processFixedHTMLDataGetterContent, "fixedHtml":processFixedHTMLDataGetterContent,
"internalClass":processInternalClassDataGetterContent, "internalClass":processInternalClassDataGetterContent,
"solrIndividuals":processSolrDataGetterContent}, "searchIndividuals":processSearchDataGetterContent},
selectDataGetterType:function(pageContentSection) { selectDataGetterType:function(pageContentSection) {
var contentType = pageContentSection.attr("contentType"); var contentType = pageContentSection.attr("contentType");
//The form can provide "browse class group" as content type but need to check //The form can provide "browse class group" as content type but need to check

2
productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
View file

@ -103,7 +103,7 @@
<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" > <#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
<#--Passing in object types only if there are any types returned, otherwise <#--Passing in object types only if there are any types returned, otherwise
the parameter should not be passed at all to the solr search. the parameter should not be passed at all to the search.
Also multiple types parameter set to true only if more than one type returned--> Also multiple types parameter set to true only if more than one type returned-->
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {

2
productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
View file

@ -58,7 +58,7 @@
<#--Not including defaultFormScripts.ftl which would trigger tinyMce--> <#--Not including defaultFormScripts.ftl which would trigger tinyMce-->
<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" > <#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
<#--Passing in object types only if there are any types returned, otherwise <#--Passing in object types only if there are any types returned, otherwise
the parameter should not be passed at all to the solr search. the parameter should not be passed at all to the search.
Also multiple types parameter set to true only if more than one type returned--> Also multiple types parameter set to true only if more than one type returned-->
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {

2
productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
View file

@ -15,7 +15,7 @@ scripts list.-->
"internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter",
"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter",
"solrIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter" "searchIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
} }
}; };
</script> </script>

2
productMods/templates/freemarker/lib/lib-home-page.ftl
View file

@ -30,7 +30,7 @@
</section> </section>
</#macro> </#macro>
<#-- We need the faculty count in order to randomly select 4 faculty using a solr query --> <#-- We need the faculty count in order to randomly select 4 faculty using a search query -->
<#macro facultyMemberCount classGroups> <#macro facultyMemberCount classGroups>
<#assign foundClassGroup = false /> <#assign foundClassGroup = false />
<#list classGroups as group> <#list classGroups as group>

8
rdf/display/everytime/vivoListViewConfig.rdf
View file

@ -43,18 +43,10 @@
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile> <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
</rdf:Description> </rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#dateTime">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#expirationDate"> <rdf:Description rdf:about="http://vivoweb.org/ontology/core#expirationDate">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile> <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
</rdf:Description> </rdf:Description>
<rdf:Description rdf:about="http://purl.org/spar/c4o/hasGlobalCountDate">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#start"> <rdf:Description rdf:about="http://vivoweb.org/ontology/core#start">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile> <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeValue.xml</display:listViewConfigFile>
</rdf:Description> </rdf:Description>

7
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
View file

@ -18,10 +18,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropetyOptions; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSearchQueryOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaSolrQueryOptions;
/** /**
* This generator is for the case where a new concept is being added for an object property other than research/subject areas where the * This generator is for the case where a new concept is being added for an object property other than research/subject areas where the
@ -121,8 +119,7 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope
types.add(v.getURI()); types.add(v.getURI());
} }
String[] typesArray = types.toArray(new String[types.size()]); String[] typesArray = types.toArray(new String[types.size()]);
field.setOptions( new IndividualsViaSolrQueryOptions( field.setOptions( new IndividualsViaSearchQueryOptions(
vreq.getSession().getServletContext(),
getSubjectUri(), getSubjectUri(),
predicateUri, predicateUri,
getObjectUri(), getObjectUri(),

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
View file

@ -18,7 +18,7 @@ public class ProcessDataGetterN3Map {
map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3"); map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3");
map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3"); map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessInternalClassDataGetterN3");
map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3"); map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3");
map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSolrIndividualsDataGetterN3"); map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSearchIndividualsDataGetterN3");
return map; return map;
} }

12
src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -10,7 +10,6 @@ import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.solr.common.SolrInputDocument;
import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.Query; import com.hp.hpl.jena.query.Query;
@ -27,8 +26,9 @@ import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier;
public class CalculateParameters implements DocumentModifier { public class CalculateParameters implements DocumentModifier {
@ -241,17 +241,18 @@ public class CalculateParameters implements DocumentModifier {
} }
@Override @Override
public void modifyDocument(Individual individual, SolrInputDocument doc, StringBuffer addUri) { public void modifyDocument(Individual individual, SearchInputDocument doc, StringBuffer addUri) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
// calculate beta value. // calculate beta value.
log.debug("Parameter calculation starts.."); log.debug("Parameter calculation starts..");
float beta = calculateBeta(individual.getURI()); float beta = calculateBeta(individual.getURI());
doc.addField(VitroSearchTermNames.BETA, beta); doc.addField(VitroSearchTermNames.BETA, (Object) beta);
doc.setDocumentBoost(beta + doc.getDocumentBoost() ); doc.setDocumentBoost(beta + doc.getDocumentBoost() );
log.debug("Parameter calculation is done"); log.debug("Parameter calculation is done");
} }
@Override
public void shutdown(){ public void shutdown(){
shutdown=true; shutdown=true;
} }
@ -267,6 +268,7 @@ class TotalInd implements Runnable{
this.totalCountQuery = totalCountQuery; this.totalCountQuery = totalCountQuery;
} }
@Override
public void run(){ public void run(){
int totalInd=0; int totalInd=0;
Query query; Query query;

16
src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED;
@ -9,17 +9,17 @@ import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.PREFE
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.solr.common.SolrInputDocument;
import com.hp.hpl.jena.query.QuerySolution; import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet; import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.RDFNode;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier;
/** /**
* If there are any VCards on this Individual with Title objects, store the text * If there are any VCards on this Individual with Title objects, store the text
@ -44,7 +44,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
private static final ResultParser PREFERRED_TITLE_PARSER = new ResultParser() { private static final ResultParser PREFERRED_TITLE_PARSER = new ResultParser() {
@Override @Override
public void parse(String uri, QuerySolution solution, SolrInputDocument doc) { public void parse(String uri, QuerySolution solution, SearchInputDocument doc) {
String title = getLiteralValue(solution, "title"); String title = getLiteralValue(solution, "title");
if (StringUtils.isNotBlank(title)) { if (StringUtils.isNotBlank(title)) {
doc.addField(PREFERRED_TITLE, title); doc.addField(PREFERRED_TITLE, title);
@ -68,7 +68,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
private static final ResultParser EMAIL_PARSER = new ResultParser() { private static final ResultParser EMAIL_PARSER = new ResultParser() {
@Override @Override
public void parse(String uri, QuerySolution solution, public void parse(String uri, QuerySolution solution,
SolrInputDocument doc) { SearchInputDocument doc) {
String email = getLiteralValue(solution, "email"); String email = getLiteralValue(solution, "email");
if (StringUtils.isNotBlank(email)) { if (StringUtils.isNotBlank(email)) {
doc.addField(ALLTEXT, email); doc.addField(ALLTEXT, email);
@ -85,7 +85,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
} }
@Override @Override
public void modifyDocument(Individual individual, SolrInputDocument doc, public void modifyDocument(Individual individual, SearchInputDocument doc,
StringBuffer addUri) { StringBuffer addUri) {
if (individual == null) if (individual == null)
return; return;
@ -96,7 +96,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
} }
private void processQuery(Individual individual, String queryTemplate, private void processQuery(Individual individual, String queryTemplate,
ResultParser resultParser, SolrInputDocument doc) { ResultParser resultParser, SearchInputDocument doc) {
String uri = "<" + individual.getURI() + "> "; String uri = "<" + individual.getURI() + "> ";
String query = queryTemplate.replaceAll("\\?uri", uri); String query = queryTemplate.replaceAll("\\?uri", uri);
@ -124,7 +124,7 @@ public class VIVOValuesFromVcards implements DocumentModifier {
} }
private abstract static class ResultParser { private abstract static class ResultParser {
public abstract void parse(String uri, QuerySolution solution, SolrInputDocument doc); public abstract void parse(String uri, QuerySolution solution, SearchInputDocument doc);
String getLiteralValue(QuerySolution solution, String name) { String getLiteralValue(QuerySolution solution, String name) {
RDFNode node = solution.get(name); RDFNode node = solution.get(name);

8
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java
View file

@ -1,16 +1,14 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields;
/** /**
* Class that adds text from context nodes to Solr Documents for * Class that adds text from context nodes to Search Documents for
* foaf:Agent individuals. * foaf:Agent individuals.
*/ */
public class VivoAgentContextNodeFields extends ContextNodeFields{ public class VivoAgentContextNodeFields extends ContextNodeFields{

20
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java
View file

@ -1,5 +1,5 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -13,9 +13,17 @@ import com.hp.hpl.jena.query.DatasetFactory;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.CalculateParameters;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeBasedOnNamespace; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.SearchIndexExcluder; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeBasedOnNamespace;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SearchIndexExcluder;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VIVOValuesFromVcards;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFAdvisingFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFBasicFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFEducationFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFGrantFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFMemberFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoInformationResourceContextNodeFields;
public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{ public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{
@ -36,9 +44,9 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen
Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getJenaOntModel()); Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getJenaOntModel());
/* Put DocumentModifiers into servlet context for use later in startup by SolrSetup /* Put DocumentModifiers into servlet context for use later in startup by SearchSetup
* This adds the code for VIVO specific additions to the building * This adds the code for VIVO specific additions to the building
* of solr Documents. */ * of search input Documents. */
List<DocumentModifier> modifiers = (List<DocumentModifier>)context.getAttribute("DocumentModifiers"); List<DocumentModifier> modifiers = (List<DocumentModifier>)context.getAttribute("DocumentModifiers");
if( modifiers == null ){ if( modifiers == null ){
modifiers = new ArrayList<DocumentModifier>(); modifiers = new ArrayList<DocumentModifier>();

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/** /**
* DocumentModifier for adding rdfs:labels of individuals related via * DocumentModifier for adding rdfs:labels of individuals related via

8
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFBasicFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java
View file

@ -1,17 +1,17 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/** /**
* DocumentModifier to populate Solr fields for the basic ISF relationships. * DocumentModifier to populate Search index fields for the basic ISF relationships.
* *
* This will add the all rdfs:labels of the related individuals to the solr document. * This will add the all rdfs:labels of the related individuals to the search document.
* *
* @author bdc34 * @author bdc34
*/ */

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFEducationFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
public class VivoISFEducationFields extends ContextNodeFields { public class VivoISFEducationFields extends ContextNodeFields {
private static String VIVONS = "http://vivoweb.org/ontology/core#"; private static String VIVONS = "http://vivoweb.org/ontology/core#";

36
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFGrantFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java
View file

@ -1,24 +1,24 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/* /*
* This DocumentModifier is for the ISF style grants. * This DocumentModifier is for the ISF style grants.
* It will * It will
* add people's names to the grant's Solr Document * add people's names to the grant's search Document
* add the grant's name to the people's Solr Document * add the grant's name to the people's search Document
* add the grant's name to the Organization's Solr Document * add the grant's name to the Organization's search Document
* add the organization's name to the grant's Solr Document * add the organization's name to the grant's search Document
* add the grant's names to the project's Solr Document * add the grant's names to the project's search Document
* add the people's names to the project's Solr Document * add the people's names to the project's search Document
* add the project's name to the grant's Solr Document * add the project's name to the grant's search Document
* add the project's name to the people's Solr Document * add the project's name to the people's search Document
*/ */
public class VivoISFGrantFields extends ContextNodeFields { public class VivoISFGrantFields extends ContextNodeFields {
private static String VIVONS = "http://vivoweb.org/ontology/core#"; private static String VIVONS = "http://vivoweb.org/ontology/core#";
@ -35,7 +35,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
} }
/** /**
* Query to add people's names to the grant's Solr Document. * Query to add people's names to the grant's search Document.
* ?uri is the URI of a grant. * ?uri is the URI of a grant.
*/ */
private static String peopleForGrant = private static String peopleForGrant =
@ -48,7 +48,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the grant's name to the people's Solr Document. * Query to add the grant's name to the people's search Document.
* ?uri is the URI of a person. * ?uri is the URI of a person.
*/ */
private static String grantsForPerson = private static String grantsForPerson =
@ -63,7 +63,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the grant's name to the Organization's Solr Document. * Query to add the grant's name to the Organization's search Document.
* ?uri is the URI of an Organization. * ?uri is the URI of an Organization.
*/ */
private static String grantsForOrganization = private static String grantsForOrganization =
@ -76,7 +76,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the organization's name to the grant's Solr Document. * Query to add the organization's name to the grant's search Document.
* ?uri is the URI of a grant. * ?uri is the URI of a grant.
*/ */
private static String organizationsForGrant = private static String organizationsForGrant =
@ -89,7 +89,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the grant's names to the project's Solr Document. * Query to add the grant's names to the project's search Document.
* ?uir is the URI of a Project. * ?uir is the URI of a Project.
*/ */
private static String grantsForProject = private static String grantsForProject =
@ -103,7 +103,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the people's names to the project's Solr Document. * Query to add the people's names to the project's search Document.
* ?uri is the URI of a Project. * ?uri is the URI of a Project.
*/ */
private static String peopleForProject = private static String peopleForProject =
@ -117,7 +117,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the project's name to the grant's Solr Document. * Query to add the project's name to the grant's search Document.
* ?uri is the URI of a grant. * ?uri is the URI of a grant.
*/ */
private static String projectsForGrant = private static String projectsForGrant =
@ -133,7 +133,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}"; "}";
/** /**
* Query to add the project's name to the people's Solr Document. * Query to add the project's name to the people's search Document.
* ?uri is the URI of a person. * ?uri is the URI of a person.
*/ */
private static String projectsForPerson = private static String projectsForPerson =

12
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFMemberFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java
View file

@ -1,17 +1,17 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/** /**
* This class will: * This class will:
* add people's names to organization's Solr Documents. * add people's names to organization's search Documents.
* add organization names to people's Solr Documents. * add organization names to people's search Documents.
* *
* @author bdc34 * @author bdc34
* *
@ -31,7 +31,7 @@ public class VivoISFMemberFields extends ContextNodeFields {
} }
/** /**
* Add people's names to organization's Solr Documents. * Add people's names to organization's search Documents.
*/ */
private static String peopleForOrganization = private static String peopleForOrganization =
prefix + prefix +
@ -43,7 +43,7 @@ public class VivoISFMemberFields extends ContextNodeFields {
"}"; "}";
/** /**
* add organization names to people's Solr Documents. * add organization names to people's search Documents.
*/ */
private static String organizationForPeople = private static String organizationForPeople =
prefix + prefix +

8
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java
View file

@ -1,16 +1,14 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields;
/** /**
* Class that adds text from context nodes to Solr Documents for * Class that adds text from context nodes to search index Documents for
* obo:IAO_0000030 individuals. * obo:IAO_0000030 individuals.
* *
* @author bdc34 * @author bdc34

0
test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NIHVIVO3853_DataSet1.rdf
View file

0
test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVO146_DataSet1.n3
View file

6
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java
View file

@ -1,11 +1,11 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import static org.junit.Assert.*; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.InputStream; import java.io.InputStream;
import org.apache.solr.common.SolrInputDocument;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

6
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import static org.junit.Assert.*; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.InputStream; import java.io.InputStream;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.solr.common.SolrInputDocument;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;

14
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java
View file

@ -1,24 +1,29 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collection; import java.util.Collection;
import org.apache.solr.common.SolrInputDocument;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import stubs.edu.cornell.mannlib.vitro.webapp.modules.ApplicationStub;
import stubs.edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineStub;
import stubs.javax.servlet.ServletContextStub;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec; import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.ModelFactory;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena; import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle;
@ -32,6 +37,7 @@ public class VivoInformationResourceContextNodeFieldsTest extends AbstractTestCl
@Test @Test
public void testNoLabel() throws IOException{ public void testNoLabel() throws IOException{
ApplicationStub.setup(new ServletContextStub(), new SearchEngineStub());
//Test that rdfs:label is NOT added by the VivoInformationResourceContextNodeFields //Test that rdfs:label is NOT added by the VivoInformationResourceContextNodeFields
@ -51,13 +57,13 @@ public class VivoInformationResourceContextNodeFieldsTest extends AbstractTestCl
RDFService rdfService = new RDFServiceModel(ontModel); RDFService rdfService = new RDFServiceModel(ontModel);
RDFServiceFactory rdfServiceFactory = new RDFServiceFactorySingle(rdfService); RDFServiceFactory rdfServiceFactory = new RDFServiceFactorySingle(rdfService);
SolrInputDocument doc = new SolrInputDocument(); SearchInputDocument doc = ApplicationUtils.instance().getSearchEngine().createInputDocument();
doc.addField("ALLTEXT", ""); doc.addField("ALLTEXT", "");
VivoInformationResourceContextNodeFields vircnf = new VivoInformationResourceContextNodeFields(rdfServiceFactory); VivoInformationResourceContextNodeFields vircnf = new VivoInformationResourceContextNodeFields(rdfServiceFactory);
vircnf.modifyDocument(ind, doc, new StringBuffer()); vircnf.modifyDocument(ind, doc, new StringBuffer());
Collection values = doc.getFieldValues("ALLTEXT"); Collection<Object> values = doc.getField("ALLTEXT").getValues();
for( Object value : values){ for( Object value : values){
Assert.assertFalse("rdf:label erroneously added by document modifier:", value.toString().contains(RDFS_LABEL_VALUE)); Assert.assertFalse("rdf:label erroneously added by document modifier:", value.toString().contains(RDFS_LABEL_VALUE));
} }

0
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.n3 → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3
View file

2
themes/wilma/templates/page-home.ftl
View file

@ -25,7 +25,7 @@
</head> </head>
<body class="${bodyClasses!}" onload="${bodyOnload!}"> <body class="${bodyClasses!}" onload="${bodyOnload!}">
<#-- supplies the faculty count to the js function that generates a random row number for the solr query --> <#-- supplies the faculty count to the js function that generates a random row number for the search query -->
<@lh.facultyMemberCount vClassGroups! /> <@lh.facultyMemberCount vClassGroups! />
<#include "identity.ftl"> <#include "identity.ftl">

70
utilities/acceptance-tests/suites/AddNonPersonThings/DeleteIndexStuff.html
View file

@ -2769,76 +2769,6 @@
<td>Index of Contents</td> <td>Index of Contents</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=County</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>County</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Mozamia</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Mozamia</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Edit this individual</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Control Panel</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@value='Edit This Individual']</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Individual Editing Form</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>name=_delete</td>
<td></td>
</tr>
<tr>
<td>assertConfirmation</td>
<td>Are you SURE you want to delete this individual? If in doubt, CANCEL.</td>
<td></td>
</tr>
<tr>
<td>waitForPageToLoad</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Index</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Index of Contents</td>
<td></td>
</tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Facility</td> <td>link=Facility</td>

105
utilities/acceptance-tests/suites/AddNonPersonThings/TestMenuManagement.html
View file

@ -663,21 +663,6 @@
<td>link=Primate Memorial Building</td> <td>link=Primate Memorial Building</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>click</td>
<td>link=County (1)</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Mozamia</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>link=Facility (5)</td> <td>link=Facility (5)</td>
@ -754,6 +739,36 @@
<td>xpath=(//img[@alt='delete this page'])[2]</td> <td>xpath=(//img[@alt='delete this page'])[2]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>assertConfirmation</td>
<td>Are you sure you wish to delete this page:&nbsp;&nbsp;Activities?</td>
<td></td>
</tr>
<tr>
<td>waitForPageToLoad</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Pages</td> <td>Pages</td>
@ -779,6 +794,26 @@
<td>Pages</td> <td>Pages</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>xpath=(//img[@alt='delete this page'])[6]</td> <td>xpath=(//img[@alt='delete this page'])[6]</td>
@ -799,6 +834,26 @@
<td>Pages</td> <td>Pages</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>xpath=(//img[@alt='delete this page'])[7]</td> <td>xpath=(//img[@alt='delete this page'])[7]</td>
@ -819,6 +874,26 @@
<td>Pages</td> <td>Pages</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<!--Logout--> <!--Logout-->
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>

15
utilities/acceptance-tests/suites/AddPublications/AddArticle.html
View file

@ -359,8 +359,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=relatedIndLabel</td> <td>id=relatedIndLabel</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=relatedIndLabel</td>
<td>Child</td> <td>Child</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=relatedIndLabel</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>

15
utilities/acceptance-tests/suites/AddPublications/AddChapter.html
View file

@ -259,8 +259,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=relatedIndLabel</td> <td>id=relatedIndLabel</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=relatedIndLabel</td>
<td>Child</td> <td>Child</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=relatedIndLabel</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>

15
utilities/acceptance-tests/suites/AddPublications/AddConference.html
View file

@ -209,8 +209,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=relatedIndLabel</td> <td>id=relatedIndLabel</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=relatedIndLabel</td>
<td>Child</td> <td>Child</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=relatedIndLabel</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>

12
utilities/acceptance-tests/suites/AddPublications/DeleteValidationStuff.html
View file

@ -299,12 +299,12 @@
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Kids Now!</td> <td>link=Focus on Kids!</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Kids Now!</td> <td>Focus on Kids!</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -560,12 +560,12 @@
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Kids Now!</td> <td>link=Focus on Kids Too!</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Kids Now!</td> <td>Focus on Kids Too!</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -860,12 +860,12 @@
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>link=Kids Now!</td> <td>link=Focus on Kids Project</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Kids Now!</td> <td>Focus on Kids Project</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

81
utilities/acceptance-tests/suites/AddPublications/ValidateFields.html
View file

@ -845,8 +845,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=lastName</td> <td>id=lastName</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=lastName</td>
<td>Mous</td> <td>Mous</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=lastName</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>
@ -984,6 +999,11 @@
<td>link=Cancel</td> <td>link=Cancel</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Nintendo O.K. for Kids</td> <td>Nintendo O.K. for Kids</td>
@ -1103,7 +1123,7 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=label</td> <td>id=label</td>
<td>Kids Now!</td> <td>Focus on Kids!</td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
@ -1412,7 +1432,22 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=object</td> <td>id=object</td>
<td>United States of</td> <td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=object</td>
<td>United States of Am</td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=object</td>
<td>${KEY_DOWN}</td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>click</td>
@ -2065,13 +2100,7 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=label</td> <td>id=label</td>
<td>Kids No</td> <td>Focus on Kids Project</td>
</tr>
<!--Select Kids Now!-->
<tr>
<td>click</td>
<td>id=ui-active-menuitem</td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
@ -2285,16 +2314,15 @@
<td>link=Cancel</td> <td>link=Cancel</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>selectWindow</td>
<td>null</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=label</td> <td>id=label</td>
<td>Kids Now C</td> <td>Focus on Kids Too!</td>
</tr>
<!--Select Kids Now!-->
<tr>
<td>click</td>
<td>id=ui-active-menuitem</td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
@ -2355,7 +2383,7 @@
<tr> <tr>
<td>select</td> <td>select</td>
<td>id=objectVar</td> <td>id=objectVar</td>
<td>label=Kids Now!</td> <td>label=Focus on Kids!</td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
@ -2657,7 +2685,17 @@
</tr> </tr>
<tr> <tr>
<td>verifyElementPresent</td> <td>verifyElementPresent</td>
<td>link=Kids Now!</td> <td>link=Focus on Kids Project</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Focus on Kids!</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Focus on Kids Too!</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -2870,7 +2908,12 @@
<!--Verify Book Chapter is there--> <!--Verify Book Chapter is there-->
<tr> <tr>
<td>click</td> <td>click</td>
<td>//div[@id='wrapper-content']/ul/li[6]</td> <td>//div[@id='wrapper-content']/ul/li[4]</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

12
utilities/acceptance-tests/suites/AddRoles/AddFacultyMemberRoles2.html
View file

@ -1024,7 +1024,7 @@
<!--Verify activities displayed for Jane Faculty--> <!--Verify activities displayed for Jane Faculty-->
<tr> <tr>
<td>click</td> <td>click</td>
<td>css=li.nonSelectedGroupTab.clickable</td> <td>//div[@id='wrapper-content']/ul/li[10]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -1047,11 +1047,6 @@
<td>Ape Health Program Founder 1993 -</td> <td>Ape Health Program Founder 1993 -</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>click</td>
<td>//div[@id='wrapper-content']/ul/li[6]</td>
<td></td>
</tr>
<tr> <tr>
<td>verifyElementPresent</td> <td>verifyElementPresent</td>
<td>link=History of Apes in Africa</td> <td>link=History of Apes in Africa</td>
@ -1072,11 +1067,6 @@
<td>Habitats for Apes Researcher 1980 - 1985</td> <td>Habitats for Apes Researcher 1980 - 1985</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>click</td>
<td>//div[@id='wrapper-content']/ul/li[8]</td>
<td></td>
</tr>
<tr> <tr>
<td>verifyElementPresent</td> <td>verifyElementPresent</td>
<td>link=Working with Primates</td> <td>link=Working with Primates</td>

45
utilities/acceptance-tests/suites/CheckVisualizations/AddCoInvestigators.html
View file

@ -105,8 +105,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=grant</td> <td>id=grant</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=grant</td>
<td>Future of</td> <td>Future of</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=grant</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>ui-active-menuitem</td> <td>ui-active-menuitem</td>
@ -176,8 +191,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=grant</td> <td>id=grant</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=grant</td>
<td>Nix N</td> <td>Nix N</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=grant</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>ui-active-menuitem</td> <td>ui-active-menuitem</td>
@ -241,8 +271,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=grant</td> <td>id=grant</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=grant</td>
<td>Nix N</td> <td>Nix N</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=grant</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>ui-active-menuitem</td> <td>ui-active-menuitem</td>

4
utilities/acceptance-tests/suites/CheckVisualizations/CheckGrantDates.html
View file

@ -383,7 +383,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>from 2002 through 2012</td> <td>from 2004 through 2013</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -398,7 +398,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>from 2003 through 2012</td> <td>from 2004 through 2013</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

86
utilities/acceptance-tests/suites/CheckVisualizations/TestTemporalGraphs.html
View file

@ -134,8 +134,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=person</td> <td>id=person</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>Furter</td> <td>Furter</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>
@ -184,8 +199,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=person</td> <td>id=person</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>John</td> <td>John</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>
@ -234,7 +264,22 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=person</td> <td>id=person</td>
<td>smith</td> <td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>Smith</td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>${KEY_DOWN}</td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>click</td>
@ -284,7 +329,22 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=person</td> <td>id=person</td>
<td>zink</td> <td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>Zink</td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=person</td>
<td>${KEY_DOWN}</td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>click</td>
@ -363,6 +423,11 @@
<td>link=Organizations</td> <td>link=Organizations</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Organizations</td> <td>Organizations</td>
@ -622,10 +687,15 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>selectAndWait</td> <td>select</td>
<td>//div[@id='leftUpper']/div/select</td> <td>//div[@id='leftUpper']/div/select</td>
<td>label=by Grants</td> <td>label=by Grants</td>
</tr> </tr>
<tr>
<td>pause 10000</td>
<td></td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Child Development - Temporal Graph Visualization</td> <td>Child Development - Temporal Graph Visualization</td>
@ -919,6 +989,11 @@
<td>link=Organizations</td> <td>link=Organizations</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Organizations</td> <td>Organizations</td>
@ -949,6 +1024,11 @@
<td>id=organizationMoniker</td> <td>id=organizationMoniker</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>College of Human Ecology</td> <td>College of Human Ecology</td>

5
utilities/acceptance-tests/suites/CreatePeople/AssociateLibToFac.html
View file

@ -177,6 +177,11 @@
<td>Assistant Professor</td> <td>Assistant Professor</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr> <tr>
<td>verifyElementPresent</td> <td>verifyElementPresent</td>
<td>link=Librarian, Lily Lou</td> <td>link=Librarian, Lily Lou</td>

33
utilities/acceptance-tests/suites/CreatePeople/EditFacultyInfo.html
View file

@ -167,13 +167,18 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>assertConfirmation</td>
<td>id=showAddForm</td> <td>Are you sure you want to remove this web page?</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>assertTitle</td> <td>waitForPageToLoad</td>
<td>Edit</td> <td>5000</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>id=showAddForm</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -822,26 +827,6 @@
<td>Faculty, Jane</td> <td>Faculty, Jane</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>css=a.delete-relatedBy &gt; img.delete-individual</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Edit</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>id=submit</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Faculty, Jane</td>
<td></td>
</tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>css=#backgroundGroup &gt; article.property &gt; #relatedBy &gt; a.add-relatedBy &gt; img.add-individual</td> <td>css=#backgroundGroup &gt; article.property &gt; #relatedBy &gt; a.add-relatedBy &gt; img.add-individual</td>

15
utilities/acceptance-tests/suites/CustomAwardsForm/AddAwards.html
View file

@ -219,8 +219,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=org</td> <td>id=org</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=org</td>
<td>Carr</td> <td>Carr</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=org</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>

11
utilities/acceptance-tests/suites/CustomAwardsForm/ChangeAwards.html
View file

@ -211,7 +211,7 @@
<!--Remove year but add year range to Primate Expert award--> <!--Remove year but add year range to Primate Expert award-->
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>xpath=(//img[@alt='edit this entry'])[5]</td> <td>xpath=(//img[@alt='edit this entry'])[4]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -290,10 +290,15 @@
<td>link=Primates-R-Us</td> <td>link=Primates-R-Us</td>
<td></td> <td></td>
</tr> </tr>
<!--Remove the year for the last award--> <!--Remove the year for the Professor of the Decade award-->
<tr>
<td>selectWindow</td>
<td>null</td>
<td></td>
</tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>xpath=(//img[@alt='edit this entry'])[5]</td> <td>css=a.edit-relatedBy &gt; img.edit-individual</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

10
utilities/acceptance-tests/suites/InitialSetup/EditSiteInfo.html
View file

@ -303,12 +303,12 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Version rel-1.6.1-rc2</td> <td>Version rel-1.6.1-rc4</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>verifyElementPresent</td> <td>verifyElementPresent</td>
<td>link=rel-1.6.1-rc2</td> <td>link=rel-1.6.1-rc4</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -532,7 +532,7 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Version rel-1.6.1-rc2</td> <td>Version rel-1.6.1-rc4</td>
<td></td> <td></td>
</tr> </tr>
<!--Set site information back to default--> <!--Set site information back to default-->
@ -639,12 +639,12 @@
</tr> </tr>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Version rel-1.6.1-rc2</td> <td>Version rel-1.6.1-rc4</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>verifyElementPresent</td> <td>verifyElementPresent</td>
<td>link=rel-1.6.1-rc2</td> <td>link=rel-1.6.1-rc4</td>
<td></td> <td></td>
</tr> </tr>
<!--Logout--> <!--Logout-->

92
utilities/acceptance-tests/suites/InitialSetup/RemoveMenuChanges.html
View file

@ -131,12 +131,42 @@
<td>Test HTML Page</td> <td>Test HTML Page</td>
<td></td> <td></td>
</tr> </tr>
<!--Delete new menu items--> <!--Delete new menu items one at a time, after going back to Page Management-->
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td>xpath=(//img[@alt='delete this page'])[2]</td> <td>xpath=(//img[@alt='delete this page'])[2]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>assertConfirmation</td>
<td>Are you sure you wish to delete this page:&nbsp;&nbsp;Activities?</td>
<td></td>
</tr>
<tr>
<td>waitForPageToLoad</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr> <tr>
<td>assertTitle</td> <td>assertTitle</td>
<td>Pages</td> <td>Pages</td>
@ -162,6 +192,26 @@
<td>Pages</td> <td>Pages</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>xpath=(//img[@alt='delete this page'])[6]</td> <td>xpath=(//img[@alt='delete this page'])[6]</td>
@ -182,6 +232,26 @@
<td>Pages</td> <td>Pages</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>xpath=(//img[@alt='delete this page'])[7]</td> <td>xpath=(//img[@alt='delete this page'])[7]</td>
@ -202,6 +272,26 @@
<td>Pages</td> <td>Pages</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Page management</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Pages</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>xpath=(//img[@alt='delete this page'])[11]</td> <td>xpath=(//img[@alt='delete this page'])[11]</td>

124
utilities/acceptance-tests/suites/LinkedOpenData/AddTestRDF.html Normal file
View file

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="" />
<title>CreateTestFacultyMember</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">CreateTestFacultyMember</td></tr>
</thead><tbody>
<!--Add test RDF-->
<tr>
<td>deleteAllVisibleCookies</td>
<td></td>
<td></td>
</tr>
<tr>
<td>setTimeout</td>
<td>100000000000</td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>/vivo/</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Log in</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Log in to VIVO</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>id=loginName</td>
<td>testAdmin@cornell.edu</td>
</tr>
<tr>
<td>type</td>
<td>id=loginPassword</td>
<td>Password</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>name=loginForm</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO</td>
<td></td>
</tr>
<!------->
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Add/Remove RDF data</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Ingest RDF Data</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>name=rdfStream</td>
<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\LinkedOpenData\TestLinkedOpenData.n3</td>
</tr>
<tr>
<td>select</td>
<td>name=language</td>
<td>label=N3</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>id=submit</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Ingest RDF Data</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>RDF upload successful.</td>
<td></td>
</tr>
<!------->
<tr>
<td>open</td>
<td>/vivo/</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Log out</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>

46
utilities/acceptance-tests/suites/LinkedOpenData/CheckDataHiding.html
View file

@ -36,18 +36,29 @@
<!--Check that ScopusID is not publicly visible but eRACommonsID is--> <!--Check that ScopusID is not publicly visible but eRACommonsID is-->
<tr> <tr>
<td>open</td> <td>open</td>
<td>/vivo/individual/lodFacultyMember/lodFacultyMember.rdf</td> <td>/testApp/TestLinkedOpenData.html</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>id=N3_EXTENSION_button</td>
<td></td> <td></td>
</tr> </tr>
<!--Pause to check results-->
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>10000</td> <td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>vivo:eRACommonsId</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>vivo:scopusId</td>
<td></td> <td></td>
</tr> </tr>
<!--Should see ~80 lines of RDF/XML-->
<!--vivo:eRACommonsId should be displayed-->
<!--vivo:scopusId should NOT be displayed-->
<!-------> <!------->
<!--Log in as Editor, Curator or Admin --> <!--Log in as Editor, Curator or Admin -->
<tr> <tr>
@ -94,18 +105,29 @@
<!--Check that ScopusID and eRACommonsID are visible for admin--> <!--Check that ScopusID and eRACommonsID are visible for admin-->
<tr> <tr>
<td>open</td> <td>open</td>
<td>/vivo/individual/lodFacultyMember/lodFacultyMember.rdf</td> <td>/testApp/TestLinkedOpenData.html</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>id=N3_EXTENSION_button</td>
<td></td> <td></td>
</tr> </tr>
<!--Pause to check results-->
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>10000</td> <td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>vivo:eRACommonsId</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>vivo:scopusId</td>
<td></td> <td></td>
</tr> </tr>
<!--Should see ~80 lines of RDF/XML-->
<!--Check that it now includes a line for vivo:scopusId-->
<!--Check that ScopusID is visible to Editors, Curators and Admins-->
<!-------> <!------->
<tr> <tr>
<td>open</td> <td>open</td>

129
utilities/acceptance-tests/suites/LinkedOpenData/RemoveTestRDF.html Normal file
View file

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="" />
<title>CreateTestFacultyMember</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">CreateTestFacultyMember</td></tr>
</thead><tbody>
<!--Remove test RDF-->
<tr>
<td>deleteAllVisibleCookies</td>
<td></td>
<td></td>
</tr>
<tr>
<td>setTimeout</td>
<td>100000000000</td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>/vivo/</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Log in</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Log in to VIVO</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>id=loginName</td>
<td>testAdmin@cornell.edu</td>
</tr>
<tr>
<td>type</td>
<td>id=loginPassword</td>
<td>Password</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>name=loginForm</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO</td>
<td></td>
</tr>
<!------->
<tr>
<td>clickAndWait</td>
<td>link=Site Admin</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO Site Administration</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Add/Remove RDF data</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Ingest RDF Data</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>name=rdfStream</td>
<td>C:\VIVO\vivo\utilities\acceptance-tests\suites\LinkedOpenData\TestLinkedOpenData.n3</td>
</tr>
<tr>
<td>click</td>
<td>xpath=(//input[@name='mode'])[3]</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>name=language</td>
<td>label=N3</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>id=submit</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Ingest RDF Data</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Removed RDF from file TestLinkedOpenData.n3. Removed 33 statements.</td>
<td></td>
</tr>
<!------->
<tr>
<td>open</td>
<td>/vivo/</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Log out</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>

3
utilities/acceptance-tests/suites/LinkedOpenData/Suite.html
View file

@ -9,10 +9,11 @@
<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody> <table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
<tr><td><b>Test Suite</b></td></tr> <tr><td><b>Test Suite</b></td></tr>
<tr><td><a href="RebuildSearchIndex.html">RebuildSearchIndex</a></td></tr> <tr><td><a href="RebuildSearchIndex.html">RebuildSearchIndex</a></td></tr>
<tr><td><a href="AddTestRDF.html">AddTestRDF</a></td></tr>
<tr><td><a href="TestUserCreated.html">TestUserCreated</a></td></tr> <tr><td><a href="TestUserCreated.html">TestUserCreated</a></td></tr>
<tr><td><a href="TestVariousRequests.html">TestVariousRequests</a></td></tr> <tr><td><a href="TestVariousRequests.html">TestVariousRequests</a></td></tr>
<tr><td><a href="CheckDataHiding.html">CheckDataHiding</a></td></tr> <tr><td><a href="CheckDataHiding.html">CheckDataHiding</a></td></tr>
<tr><td><a href="TestRDFAccept.html">TestRDFAccept</a></td></tr> <tr><td><a href="RemoveTestRDF.html">RemoveTestRDF</a></td></tr>
</tbody></table> </tbody></table>
</body> </body>
</html> </html>

723
utilities/acceptance-tests/suites/LinkedOpenData/TestRDFAccept.html
View file

@ -1,723 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head profile="http://selenium-ide.openqa.org/profiles/test-case">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="selenium.base" href="" />
<title>CreateTestFacultyMember</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">CreateTestFacultyMember</td></tr>
</thead><tbody>
<!--Ask for various types of RDF by ACCEPT header-->
<tr>
<td>deleteAllVisibleCookies</td>
<td></td>
<td></td>
</tr>
<tr>
<td>setTimeout</td>
<td>100000000000</td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>/vivo/</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Log in</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>Log in to VIVO</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>id=loginName</td>
<td>testAdmin@cornell.edu</td>
</tr>
<tr>
<td>type</td>
<td>id=loginPassword</td>
<td>Password</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>name=loginForm</td>
<td></td>
</tr>
<tr>
<td>assertTitle</td>
<td>VIVO</td>
<td></td>
</tr>
<!------->
<tr>
<td>open</td>
<td>/vivo/TestLinkedOpenData.html</td>
<td></td>
</tr>
<!--See the test page-->
<!--Selenium and HTML can’t issue HTTP requests with specific “Accept” headers-->
<!--This page uses AJAX calls to submit the requests-->
<tr>
<td>verifyTextPresent</td>
<td>Test the Linked Open Data requests</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Try various accept headers</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=RDFXML_button</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=N3_button</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=TTL_button</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=JSONLD_button</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Try non-existent URI with RDFXML accept header</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=BOGUS_URI_button</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=BOGUS_ACCEPT_button</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=BOGUS_FORMAT_button</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=BOGUS_EXTENSION_button</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response data</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=RDFXML_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 200</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is application/rdf+xml</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>&lt;rdf:RDF xmlns:vitro-public=&quot;http://vitro.mannlib.cornell.edu/ns/vitro/public#&quot; xmlns:c4o=&quot;http://purl.org/spar/c4o/&quot; xmlns:geo=&quot;http://aims.fao.org/aos/geopolitical.owl#&quot; xmlns:skos=&quot;http://www.w3.org/2004/02/skos/core#&quot; xmlns:obo=&quot;http://purl.obolibrary.org/obo/&quot; xmlns:ocrer=&quot;http://purl.org/net/OCRe/research.owl#&quot; xmlns:event=&quot;http://purl.org/NET/c4dm/event.owl#&quot; </td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=N3_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 200</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is text/n3</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>@prefix ocresd: &lt;http://purl.org/net/OCRe/study_design.owl#&gt; . @prefix geo: &lt;http://aims.fao.org/aos/geopolitical.owl#&gt; . @prefix foaf: &lt;http://xmlns.com/foaf/0.1/&gt; . @prefix scires: &lt;http://vivoweb.org/ontology/scientific-research#&gt; . @prefix cito: &lt;http://purl.org/spar/cito/&gt; . @prefix fabio: &lt;http://purl.org/spar/fabio/&gt; . @prefix vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt; . </td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=TTL_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 200</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is text/turtle</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>@prefix ocresd: &lt;http://purl.org/net/OCRe/study_design.owl#&gt; . @prefix geo: &lt;http://aims.fao.org/aos/geopolitical.owl#&gt; . @prefix foaf: &lt;http://xmlns.com/foaf/0.1/&gt; . @prefix scires: &lt;http://vivoweb.org/ontology/scientific-research#&gt; . @prefix cito: &lt;http://purl.org/spar/cito/&gt; . @prefix fabio: &lt;http://purl.org/spar/fabio/&gt; . @prefix vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt; . </td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=JSONLD_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 200</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is application/json</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=BOGUS_URI_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 404</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is text/html</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>&lt;!DOCTYPE html&gt; &lt;html lang=&quot;en&quot;&gt; &lt;head&gt; &lt;meta charset=&quot;utf-8&quot; /&gt; &lt;!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--&gt; &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge,chrome=1&quot;&gt; &lt;title&gt;Individual Not Found&lt;/title&gt; &lt;!-- vitro base styles (application-wide) --&gt; &lt;link </td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=BOGUS_ACCEPT_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 200</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is text/html</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>&lt;!DOCTYPE html&gt; &lt;html lang=&quot;en&quot;&gt; &lt;head&gt; &lt;meta charset=&quot;utf-8&quot; /&gt; &lt;!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--&gt; &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge,chrome=1&quot;&gt; &lt;title&gt;Example, Bad &lt;/title&gt; &lt;!-- vitro base styles (application-wide) --&gt; &lt;link </td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Mr. Bad Example</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=BOGUS_FORMAT_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 200</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is text/html</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>&lt;!DOCTYPE html&gt; &lt;html lang=&quot;en&quot;&gt; &lt;head&gt; &lt;meta charset=&quot;utf-8&quot; /&gt; &lt;!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--&gt; &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge,chrome=1&quot;&gt; &lt;title&gt;Example, Bad &lt;/title&gt; &lt;!-- vitro base styles (application-wide) --&gt; &lt;link </td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Mr. Bad Example</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=BOGUS_EXTENSION_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 404</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is text/html</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>No text</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>&lt;!DOCTYPE html&gt; &lt;html lang=&quot;en&quot;&gt; &lt;head&gt; &lt;meta charset=&quot;utf-8&quot; /&gt; &lt;!-- Google Chrome Frame open source plug-in brings Google Chrome's open web technologies and speedy JavaScript engine to Internet Explorer--&gt; &lt;meta http-equiv=&quot;X-UA-Compatible&quot; content=&quot;IE=edge,chrome=1&quot;&gt; &lt;title&gt;Individual Not Found&lt;/title&gt; &lt;!-- vitro base styles (application-wide) --&gt; &lt;link </td>
<td></td>
</tr>
<tr>
<td>verifyTextNotPresent</td>
<td>Mr. Bad Example</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Individual not found</td>
<td></td>
</tr>
<!------->
<tr>
<td>click</td>
<td>id=CLEAR_button</td>
<td></td>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Response code is 000</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>MIME type is No type</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>Text is:</td>
<td></td>
</tr>
<tr>
<td>verifyTextPresent</td>
<td>No text</td>
<td></td>
</tr>
<!------->
<tr>
<td>open</td>
<td>/vivo/</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Log out</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>

922
utilities/acceptance-tests/suites/LinkedOpenData/TestVariousRequests.html
View file

File diff suppressed because it is too large Load diff

5
utilities/acceptance-tests/suites/OpenSocialGadgets/CheckGadgets.html
View file

@ -143,11 +143,6 @@
<td>OpenSocial</td> <td>OpenSocial</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>verifyTextPresent</td>
<td>KNODE Search Results</td>
<td></td>
</tr>
<!--Log out--> <!--Log out-->
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>

6
utilities/acceptance-tests/suites/ProxyEditing/DeleteNewUsers.html
View file

@ -119,7 +119,7 @@
</tr> </tr>
<tr> <tr>
<td>assertConfirmation</td> <td>assertConfirmation</td>
<td>Are you sure you want to delete these accounts??</td> <td>Are you sure you want to delete this account??</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -150,7 +150,7 @@
</tr> </tr>
<tr> <tr>
<td>assertConfirmation</td> <td>assertConfirmation</td>
<td>Are you sure you want to delete these accounts??</td> <td>Are you sure you want to delete this account??</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
@ -176,7 +176,7 @@
</tr> </tr>
<tr> <tr>
<td>assertConfirmation</td> <td>assertConfirmation</td>
<td>Are you sure you want to delete these accounts??</td> <td>Are you sure you want to delete this account??</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

2
utilities/acceptance-tests/suites/SelfEditing/CreateNewSelfEditorUser.html
View file

@ -123,7 +123,7 @@
<tr> <tr>
<td>sendKeys</td> <td>sendKeys</td>
<td>id=associateProfileName</td> <td>id=associateProfileName</td>
<td>Facul</td> <td>Faculty, Ja</td>
</tr> </tr>
<tr> <tr>
<td>pause</td> <td>pause</td>

30
utilities/acceptance-tests/suites/ShortViews/CreateTestPeople.html
View file

@ -195,8 +195,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=activity</td> <td>id=activity</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=activity</td>
<td>Depart</td> <td>Depart</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=activity</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>
@ -282,8 +297,23 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>id=activity</td> <td>id=activity</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=activity</td>
<td>Depart</td> <td>Depart</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td></td>
</tr>
<tr>
<td>sendKeys</td>
<td>id=activity</td>
<td>${KEY_DOWN}</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>id=ui-active-menuitem</td> <td>id=ui-active-menuitem</td>

6
utilities/acceptance-tests/suites/SparqlQueryApi/EnableSparqlQueryApi.n3 Normal file
View file

@ -0,0 +1,6 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
@prefix simplePermission: <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#> .
auth:ADMIN
auth:hasPermission simplePermission:UseSparqlQueryApi ;

11
utilities/acceptance-tests/suites/SparqlQueryApi/SparqlQueryTestData.n3 Normal file
View file

@ -0,0 +1,11 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
@prefix vivo: <http://vivoweb.org/ontology/core#> .
@prefix myDomain: <http://vivo.mydomain.edu/individual/> .
myDomain:SQapiPerson
a foaf:Person;
rdfs:label "Baker, Able "^^xsd:string ;
vitro:mostSpecificType foaf:Person;
vivo:overview "A simple bread-maker." .

75
utilities/acceptance-tests/testApp/TestSparqlQueryApi.html Normal file
View file

@ -0,0 +1,75 @@
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<script src="js/jquery.js"></script>
<script>
function TestLOD() {
self = this;
this.setup = setupButtons;
function setupButtons() {
document.getElementById("submit_button").onclick = function() {
requestWithAcceptHeader(
$("#acceptHeader").val(),
$("#email").val(),
$("#password").val(),
$("#query").val());
}
}
function requestWithAcceptHeader(mimetype, email, password, query) {
var parms = {
type: "POST",
url: "/vivo/api/sparqlQuery",
headers: {Accept: mimetype},
data: {query: query, email: email, password: password},
dataType: "text",
complete: displayResult
};
$.ajax(parms);
}
function displayResult(xhr, status) {
$("#responseCode").text(xhr.status);
$("#mimeType").text(xhr.getResponseHeader("Content-Type"));
$("#responseText").text(xhr.responseText);
}
}
$(document).ready(function() {
new TestLOD().setup();
});
</script>
<h1>Test the Linked Open Data requests</h1>
<h3>Request data</h3>
<table>
<tr>
<td>User email</td>
<td><input type="text" size="25" id="email"></td>
</tr>
<tr>
<td>User password</td>
<td><input type="password" size="15" id="password"></td>
</tr>
<tr>
<td>Accept header</td>
<td><input type="text" size="40" id="acceptHeader"></td>
</tr>
<tr>
<td>Query text</td>
<td><textarea cols="60" rows="10" id="query"></textarea></td>
</tr>
<tr>
<td><input type="submit" value="submit the request" id="submit_button"></td>
<td>&nbsp;</td>
</tr>
</table>
<h2>Response data</h2>
<div>Response code is <b><span id="responseCode">000</span></b></div>
<div>MIME type is <b><span id="mimeType">No type</span></b></div>
<div>Text is:</div>
<div><pre id="responseText" style="font-size:small; font-family:monospace">No text</pre></div>