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

DataPropertyStatement optimizations

Browse source
This commit is contained in:
bjl23 2010-12-15 16:02:10 +00:00
parent c6c9ac4ed5
commit a161e5e737
8 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
View file

@ -11,6 +11,10 @@ import com.hp.hpl.jena.rdf.model.Property;
*
*/
public interface DataPropertyStatement {
public Individual getIndividual();
public void setIndividual(Individual individual);
public String getIndividualURI();

13
webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
View file

@ -9,7 +9,8 @@ import java.util.Date;
*
*/
public class DataPropertyStatementImpl implements VitroTimeWindowedResource, DataPropertyStatement
{
{
private Individual individual = null;
private String individualURI = null;
private String data = null;
private String datapropURI = null;
@ -34,7 +35,15 @@ public class DataPropertyStatementImpl implements VitroTimeWindowedResource, Dat
datapropURI = propertyUri;
this.data = data;
}
public Individual getIndividual() {
return this.individual;
}
public void setIndividual(Individual individual) {
this.individual = individual;
}
public String getIndividualURI() {
return individualURI;
}

8
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
View file

@ -30,6 +30,10 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
return innerStmt.toString();
}
public Individual getIndividual() {
return innerStmt.getIndividual();
}
public String getIndividualURI() {
return innerStmt.getIndividualURI();
}
@ -62,6 +66,10 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
return innerStmt.getString();
}
public void setIndividual(Individual individual) {
innerStmt.setIndividual(individual);
}
public void setIndividualURI(String individualURI) {
innerStmt.setIndividualURI(individualURI);
}

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java
View file

@ -154,7 +154,7 @@ public class HiddenFromDisplayBelowRoleLevelFilter extends VitroFiltersImpl {
return false;
}
Individual subject = wdf.getIndividualDao().getIndividualByURI( dPropStmt.getIndividualURI() );
Individual subject = dPropStmt.getIndividual();
if( subject == null ) {
if( ! canViewOddItems() ){ return false; }
}else{

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/ProhibitedFromUpdateBelowRoleLevelFilter.java
View file

@ -126,7 +126,7 @@ public class ProhibitedFromUpdateBelowRoleLevelFilter extends VitroFiltersImpl {
return false;
}
Individual subject = wdf.getIndividualDao().getIndividualByURI( dPropStmt.getIndividualURI() );
Individual subject = dPropStmt.getIndividual();
if( subject == null ) {
if( ! canViewOddItems() ){ return false; }
}else{

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
View file

@ -121,6 +121,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
fillDataPropertyStatementWithJenaLiteral(ed,lit);
ed.setDatapropURI(st.getPredicate().getURI());
ed.setIndividualURI(ind.getURI());
ed.setIndividual(entity);
edList.add(ed);
/* } */
}
@ -180,6 +181,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
Literal lit = (Literal)st.getObject();
fillDataPropertyStatementWithJenaLiteral(ed, lit);
ed.setIndividualURI(entity.getURI());
ed.setIndividual(entity);
ed.setDatapropURI(st.getPredicate().getURI());
edList.add(ed);
}

1
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
View file

@ -99,6 +99,7 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
fillDataPropertyStatementWithJenaLiteral(ed,lit);
ed.setDatapropURI(st.getPredicate().getURI());
ed.setIndividualURI(ind.getURI());
ed.setIndividual(entity);
edList.add(ed);
/* } */
}

4
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
View file

@ -38,8 +38,10 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
private static final Log log = LogFactory.getLog(JenaDataSourceSetupBase.class);
protected final static int DEFAULT_MAXWAIT = 10000, // ms
DEFAULT_INITIALSIZE = 8,
DEFAULT_MAXACTIVE = 300,
DEFAULT_MAXIDLE = 30,
DEFAULT_MINIDLE = 8,
DEFAULT_TIMEBETWEENEVICTIONS = 30 * 60 * 1000, // ms
DEFAULT_TESTSPEREVICTION = 3,
DEFAULT_MINEVICTIONIDLETIME = 1000 * 60 * 30; // ms
@ -167,6 +169,8 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
}
}
ds.setMaxActive(maxActiveInt);
ds.setInitialSize(DEFAULT_INITIALSIZE);
ds.setMinIdle(DEFAULT_MINIDLE);
ds.setMaxIdle(DEFAULT_MAXIDLE);
ds.setMaxWait(DEFAULT_MAXWAIT);
ds.setValidationQuery(DEFAULT_VALIDATIONQUERY);