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

Removing vitro:citation from back end editing and front end display. NIHVIVO-503

Browse source
This commit is contained in:
bdc34 2010-07-05 19:16:50 +00:00
parent 26053fa33e
commit 9e9876cd43
17 changed files with 22 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Individual.java
View file

@ -87,9 +87,6 @@ public interface Individual extends ResourceBean, VitroTimeWindowedResource, Com
String getBlurb();
void setBlurb(String in);
String getCitation();
void setCitation(String in);
int getStatusId();
void setStatusId(int in);

6
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
View file

@ -50,7 +50,6 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
protected String mainImageUri = NOT_INITIALIZED;
protected String imageUrl;
protected String thumbUrl;
protected String citation = null;
protected int statusId = 0;
protected String status = null;
protected List <Link>linksList = null;
@ -262,10 +261,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
public String getBlurb(){return blurb;}
public void setBlurb(String in){blurb=in;}
public String getCitation(){return citation;}
public void setCitation(String in){citation=in;}
public int getStatusId(){return statusId;}
public void setStatusId(int in){statusId=in;}

3
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/CloneEntityServlet.java
View file

@ -112,8 +112,7 @@ public class CloneEntityServlet extends BaseEditController {
ind.setSunrise(new DateTime().toDate());
// cannot set these values to null because they will still be copies
ind.setBlurb("");
ind.setDescription("");
ind.setCitation("");
ind.setDescription("");
String cloneURI=individualDao.insertNewIndividual(ind);
if (cloneURI == null){ log.error("Error inserting cloned individual"); return; }

12
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
View file

@ -192,12 +192,8 @@ public class IndividualFiltering implements Individual {
public String getBlurb() {
return _innerIndividual.getBlurb();
}
public String getCitation() {
return _innerIndividual.getCitation();
}
}
public String getDescription() {
return _innerIndividual.getDescription();
}
@ -356,10 +352,6 @@ public class IndividualFiltering implements Individual {
_innerIndividual.setBlurb(in);
}
public void setCitation(String in) {
_innerIndividual.setCitation(in);
}
public void setDatatypePropertyList(List<DataProperty> datatypePropertyList) {
_innerIndividual.setDatatypePropertyList(datatypePropertyList);
}

5
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
View file

@ -306,7 +306,6 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
addPropertyStringValue(ind,MONIKER,ent.getMoniker(),ontModel);
addPropertyStringValue(ind,BLURB,ent.getBlurb(),ontModel);
addPropertyStringValue(ind,DESCRIPTION,ent.getDescription(),ontModel);
addPropertyStringValue(ind,CITATION,ent.getCitation(),ontModel);
addPropertyDateTimeValue(ind,SUNRISE,ent.getSunrise(), ontModel);
addPropertyDateTimeValue(ind,SUNSET,ent.getSunset(), ontModel);
addPropertyDateTimeValue(ind,TIMEKEY,ent.getTimekey(), ontModel);
@ -369,7 +368,6 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
private void initInd(Individual ent) {
ent.getAnchor();
ent.getBlurb();
ent.getCitation();
ent.getClass();
ent.getVClasses(false);
ent.getDataPropertyList();
@ -468,8 +466,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
}
updatePropertyStringValue(ind,MONIKER,ent.getMoniker(),ontModel);
updatePropertyStringValue(ind,BLURB,ent.getBlurb(),ontModel);
updatePropertyStringValue(ind,DESCRIPTION,ent.getDescription(),ontModel);
updatePropertyStringValue(ind,CITATION,ent.getCitation(),ontModel);
updatePropertyStringValue(ind,DESCRIPTION,ent.getDescription(),ontModel);
updatePropertyDateTimeValue(ind,SUNRISE,ent.getSunrise(), ontModel);
updatePropertyDateTimeValue(ind,SUNSET,ent.getSunset(), ontModel);
updatePropertyDateTimeValue(ind,TIMEKEY,ent.getTimekey(), ontModel);

16
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
View file

@ -457,21 +457,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
ind.getOntModel().leaveCriticalSection();
}
}
}
public String getCitation() {
if (this.citation != null) {
return citation;
} else {
ind.getOntModel().enterCriticalSection(Lock.READ);
try {
citation = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().CITATION);
return citation;
} finally {
ind.getOntModel().leaveCriticalSection();
}
}
}
}
@Override
public String getMainImageUri() {

5
webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroHighlighter.java
View file

@ -55,7 +55,6 @@ public abstract class VitroHighlighter extends UnaryFunctor<String,String> {
ent.setName( this.highlight(ent.getName()));
ent.setMoniker( this.highlight(ent.getMoniker()));
ent.setDescription( this.highlight(ent.getDescription()));
ent.setCitation(this.highlight(ent.getCitation()));
Iterator edIt = ent.getDataPropertyStatements().iterator();
while (edIt.hasNext()) {
DataPropertyStatement dataPropertyStmt = (DataPropertyStatement)edIt.next();
@ -99,10 +98,6 @@ public abstract class VitroHighlighter extends UnaryFunctor<String,String> {
sb.append(ent.getDescription());
sb.append(' ');
}
if(ent.getCitation() != null){
sb.append(ent.getCitation());
sb.append(' ');
}
if(ent.getDataPropertyStatements() != null) {
Iterator edIt = ent.getDataPropertyStatements().iterator();
while (edIt.hasNext()) {

3
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -620,9 +620,6 @@ public class PagedSearchController extends VitroHttpServlet implements Searcher{
if(ent.getDescription() != null )
sb.append(ent.getDescription()).append(' ');
if(ent.getCitation() != null)
sb.append(ent.getCitation()).append(' ');
if(ent.getDataPropertyList() != null) {
Iterator edIt = ent.getDataPropertyList().iterator();
while (edIt.hasNext()) {

1
webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
View file

@ -211,7 +211,6 @@ public class Entity2LuceneDoc implements Obj2DocIface{
value+= " "+ ( ((t=ent.getMoniker()) == null)?"":t );
value+= " "+ ( ((t=ent.getDescription()) == null)?"":t );
value+= " "+ ( ((t=ent.getBlurb()) == null)?"":t );
value+= " "+ ( ((t=ent.getCitation()) == null)?"":t );
value+= " "+ getKeyterms(ent);

6
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/IndividualTemplateModel.java
View file

@ -105,11 +105,7 @@ public class IndividualTemplateModel extends BaseTemplateModel {
public String getBlurb() {
return individual.getBlurb();
}
public String getCitation() {
return individual.getBlurb();
}
}
public List<String> getKeywords() {
return individual.getKeywords();