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:
Holly Mistlebauer 2013-10-22 17:02:33 -04:00
commit 46cc823846
51 changed files with 875 additions and 615 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
languages/example/themes/wilma/i18n/all_es.properties
View file

@ -109,6 +109,7 @@ websites = Websites
advisee_label = etiqueta aconsejado
advisor_label = etiqueta asesor
candidate = candidato
candidate = candidatura
advisingRel_label = Etiqueta de advertencia
editor_abbreviated = Ed.

14
productMods/config/listViewConfig-additionalEmail.xml
View file

@ -7,12 +7,13 @@
<query-select>
PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;
SELECT DISTINCT ?vcard ?email
SELECT DISTINCT ?vcard
?email
?emailAddress
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email
OPTIONAL { ?email vcard:email ?emailAddress }
?vcard vcard:hasEmail ?email .
?email vcard:email ?emailAddress
MINUS {?email a vcard:Work}
}
</query-select>
@ -24,17 +25,10 @@
?vcard vcard:hasEmail ?email .
?email ?emailProperty ?emailValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email ?emailProperty ?emailValue
}
}
</query-construct>
<template>propStatement-emailAddress.ftl</template>

74
productMods/config/listViewConfig-adviseeIn.xml
View file

@ -33,14 +33,11 @@
OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel }
OPTIONAL { ?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
?advisorRole a core:AdvisorRole .
OPTIONAL { ?advisor rdfs:label ?advisorLabel }
}
OPTIONAL { ?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
OPTIONAL { ?degree rdfs:label ?degreeLabel }
OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
OPTIONAL { ?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
}
<collated>
OPTIONAL { ?advisingRel vitro:mostSpecificType ?subclass .
@ -76,31 +73,18 @@
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel .
} WHERE {
{
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel
@ -118,15 +102,13 @@
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
?advisor rdfs:label ?advisorLabel .
?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
?advisor rdfs:label ?advisorLabel .
?advisorRole a core:AdvisorRole .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
} WHERE {
@ -134,23 +116,11 @@
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
?advisor &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?advisorRole .
?advisorRole a core:AdvisorRole
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisor .
?advisor a foaf:Person .
@ -161,27 +131,8 @@
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel
} UNION {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?degree .
?degree a core:AcademicDegree .
?advisingRel core:degreeCandidacy ?degree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
}
@ -192,20 +143,20 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?advisingRel .
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
@ -215,11 +166,10 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
@ -228,7 +178,7 @@
?adviseeRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}

31
productMods/config/listViewConfig-advisorIn.xml
View file

@ -28,7 +28,6 @@
WHERE {
?subject ?property ?advisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
LET ( ?localName := afn:localname(?advisingRel) )
OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel }
OPTIONAL { ?advisingRel core:relates ?advisee .
@ -63,9 +62,15 @@
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?advisingRel vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:AdvisingRelationship
} WHERE {
?subject ?property ?advisorRole .
?advisorRole core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:AdvisingRelationship
}
</query-construct>
@ -77,7 +82,6 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel .
@ -86,22 +90,17 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel ?advisingRelProperty ?advisingRelValue .
?advisingRel rdfs:label ?advisingRelLabel
}
}
@ -117,14 +116,13 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
?advisee rdfs:label ?adviseeLabel .
?advisee &lt;http://purl.obolibrary.org/obo/RO_0000053&gt; ?adviseeRole .
?adviseeRole a core:AdviseeRole .
?advisingRel core:relates ?degree .
?advisingRel core:degreeCandidacy ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr
@ -133,13 +131,11 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
@ -149,7 +145,6 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:relates ?advisee .
?advisee a foaf:Person .
@ -160,11 +155,17 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:degreeCandidacy ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel .
} UNION {
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:degreeCandidacy ?degree .
?degree a core:AcademicDegree .
?degree core:abbreviation ?degreeAbbr
}
}
@ -176,7 +177,6 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
@ -185,7 +185,6 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
@ -199,7 +198,6 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
@ -208,7 +206,6 @@
?subject ?property ?advisorRole .
?advisorRole a core:AdvisorRole .
?advisorRole core:relatedBy ?advisingRel .
?subject core:relatedBy ?advisingRel .
?advisingRel a core:AdvisingRelationship .
?advisingRel core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .

1
productMods/config/listViewConfig-authorInAuthorship.xml
View file

@ -131,7 +131,6 @@
?infoResource core:hasPublicationVenue ?publishedIn .
?publishedIn rdfs:label ?journal
}
}
</query-construct>

42
productMods/config/listViewConfig-awardOrHonor.xml
View file

@ -66,7 +66,9 @@
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel
?assignedBy rdfs:label ?assignedByLabel .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
{
?subject ?property ?awardReceipt .
@ -75,13 +77,6 @@
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
@ -96,19 +91,13 @@
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel
} UNION {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:relates ?award .
?award a core:Award .
?award core:relatedBy ?awardReceipt .
?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy .
?assignedBy rdfs:label ?assignedByLabel
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
}
</query-construct>
@ -146,22 +135,5 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
</query-construct>
<template>propStatement-awardOrHonor.ftl</template>
</list-view-config>

29
productMods/config/listViewConfig-editorship.xml
View file

@ -60,7 +60,9 @@
?subject ?property ?editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource rdfs:label ?infoResourceName
?infoResource rdfs:label ?infoResourceName .
?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
{
?subject ?property ?editorship .
@ -70,29 +72,9 @@
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt;
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource rdfs:label ?infoResourceName
} UNION {
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource rdfs:label ?infoResourceName
}
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
CONSTRUCT {
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
?infoResource a &lt;http://purl.obolibrary.org/obo/IAO_0000030&gt; .
?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
?subject ?property ?editorship .
?editorship a core:Editorship .
?editorship core:relates ?infoResource .
@ -100,6 +82,7 @@
?infoResource core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
}
</query-construct>
<template>propStatement-editorship.ftl</template>

47
productMods/config/listViewConfig-educationalTraining.xml
View file

@ -11,9 +11,8 @@
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT <collated> ?subclass </collated>
SELECT DISTINCT ?subclass
?edTraining
?typeName
?org ?orgName
?degreeName ?degreeAbbr
?majorField ?deptOrSchool ?info
@ -21,10 +20,7 @@
WHERE {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess
OPTIONAL {?edTraining vitro:mostSpecificType ?subclass .
?trainingType rdfs:subClassOf core:EducationalProcess .
?trainingType rdfs:label ?typeName
}
OPTIONAL { ?edTraining vitro:mostSpecificType ?subclass . }
OPTIONAL { ?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree
@ -52,11 +48,14 @@
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subclass rdfs:subClassOf core:EducationalProcess .
?edTraining vitro:mostSpecificType ?subclass
} WHERE {
?subclass rdfs:subClassOf core:EducationalProcess .
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?subclass .
}
</query-construct>
@ -86,11 +85,6 @@
?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
}
UNION {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
}
UNION {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
@ -143,33 +137,6 @@
}
</query-construct>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining .
?trainingType rdfs:label ?typeName
} WHERE {
{
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining
} UNION
{
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining .
?trainingType rdfs:label ?typeName
}
}
</query-construct>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;

13
productMods/config/listViewConfig-faxNumber.xml
View file

@ -12,9 +12,8 @@
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone a vcard:Fax
OPTIONAL { ?phone vcard:telephone ?number }
?phone a vcard:Fax .
?phone vcard:telephone ?number
}
</query-select>
@ -26,19 +25,11 @@
?phone a vcard:Fax .
?phone ?phoneProperty ?phoneValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone a vcard:Fax
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone a vcard:Fax .
?phone ?phoneProperty ?phoneValue
}
}
</query-construct>
<template>propStatement-phoneFaxNumber.ftl</template>

3
productMods/config/listViewConfig-fullName.xml
View file

@ -34,9 +34,6 @@
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasName ?fullName
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasName ?fullName .

52
productMods/config/listViewConfig-hasAttendeeRole.xml
View file

@ -175,24 +175,12 @@
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2 .
?event2 rdfs:label ?event2Label
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event2 &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
@ -221,13 +209,6 @@
?event2 rdfs:label ?event2Label
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
@ -235,13 +216,6 @@
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event2 .
?event2 rdfs:label ?event2Label
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?event2 a event:Event .
?event2 &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
@ -270,24 +244,12 @@
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series .
?series rdfs:label ?seriesLabel
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?series &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
@ -315,13 +277,6 @@
?series rdfs:label ?seriesLabel
} WHERE {
{
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
@ -329,13 +284,6 @@
?event1 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?event3 .
?event3 &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?series .
?series rdfs:label ?seriesLabel
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?event1 .
?series a vivo:EventSeries .
?series &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event3 .
?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?event1
} UNION {
?subject ?property ?role .
?role a vivo:AttendeeRole .

5
productMods/config/listViewConfig-hasEditorRole.xml
View file

@ -69,11 +69,6 @@
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName .
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass
} UNION {
?subject ?property ?role .
?role a core:EditorRole .

34
productMods/config/listViewConfig-personInPosition.xml
View file

@ -9,6 +9,7 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
SELECT DISTINCT <collated>?subclass</collated>
?position
@ -22,9 +23,9 @@
?subject ?property ?position
OPTIONAL { ?position core:relates ?org .
?org rdfs:label ?orgName
OPTIONAL { ?org core:subOrganizationWithin ?middleOrg .
OPTIONAL { ?org obo:BFO_0000050 ?middleOrg .
?middleOrg rdfs:label ?middleOrgName
OPTIONAL { ?middleOrg core:subOrganizationWithin ?outerOrg .
OPTIONAL { ?middleOrg obo:BFO_0000050 ?outerOrg .
?outerOrg rdfs:label ?outerOrgName
}
}
@ -71,14 +72,15 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;
CONSTRUCT {
?subject ?property ?position .
?position a core:Position .
?position ?positionProperty ?positionValue .
?org rdfs:label ?orgName .
?org core:subOrganizationWithin ?middleOrg .
?org obo:BFO_0000050 ?middleOrg .
?middleOrg rdfs:label ?middleOrgName .
?middleOrg core:subOrganizationWithin ?outerOrg .
?middleOrg obo:BFO_0000050 ?outerOrg .
?outerOrg rdfs:label ?outerOrgName
} WHERE {
{
@ -103,28 +105,28 @@
?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg
?org obo:BFO_0000050 ?middleOrg
} UNION {
?subject ?property ?position .
?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg .
?org obo:BFO_0000050 ?middleOrg .
?middleOrg rdfs:label ?middleOrgName
} UNION {
?subject ?property ?position .
?position a core:Position .
?position core:relates ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg .
?middleOrg core:subOrganizationWithin ?outerOrg
?org obo:BFO_0000050 ?middleOrg .
?middleOrg obo:BFO_0000050 ?outerOrg
} UNION {
?subject ?property ?position .
?position a core:Position .
?position core:positionInOrganization ?org .
?org a foaf:Organization .
?org core:subOrganizationWithin ?middleOrg .
?middleOrg core:subOrganizationWithin ?outerOrg .
?org obo:BFO_0000050 ?middleOrg .
?middleOrg obo:BFO_0000050 ?outerOrg .
?outerOrg rdfs:label ?outerOrgName
}
}
@ -137,16 +139,20 @@
?position a core:Position .
?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
?dateTimeStartValue core:dateTime ?dateTimeStart .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
?subject ?property ?position .
?position a core:Position .
?position core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
?dateTimeStartValue core:dateTime ?dateTimeStart .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
<!--
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
@ -163,6 +169,6 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
-->
<template>propStatement-personInPosition.ftl</template>
</list-view-config>

12
productMods/config/listViewConfig-primaryEmail.xml
View file

@ -12,8 +12,8 @@
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email a vcard:Work
OPTIONAL { ?email vcard:email ?emailAddress }
?email a vcard:Work .
?email vcard:email ?emailAddress
}
</query-select>
@ -26,19 +26,11 @@
?email a vcard:Work .
?email ?emailProperty ?emailValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email a vcard:Work
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasEmail ?email .
?email a vcard:Work .
?email ?emailProperty ?emailValue
}
}
</query-construct>
<template>propStatement-emailAddress.ftl</template>

11
productMods/config/listViewConfig-telephoneNumber.xml
View file

@ -11,8 +11,8 @@
?number
WHERE {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone
OPTIONAL { ?phone vcard:telephone ?number }
?vcard vcard:hasTelephone ?phone .
?phone vcard:telephone ?number
MINUS {?phone a vcard:Fax}
}
</query-select>
@ -24,17 +24,10 @@
?vcard vcard:hasTelephone ?phone .
?phone ?phoneProperty ?phoneValue
} WHERE {
{
?subject ?property ?vcard
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone
} UNION {
?subject ?property ?vcard .
?vcard vcard:hasTelephone ?phone .
?phone ?phoneProperty ?phoneValue
}
}
</query-construct>
<template>propStatement-phoneFaxNumber.ftl</template>

2
productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
View file

@ -22,7 +22,7 @@
</#if>
<#if statement.degreeLabel??>
${statement.degreeAbbr!statement.degreeLabel!}
<#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidate},<#else>&nbsp;${i18n().candidate}</#if>
<#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidacy},<#else>&nbsp;${i18n().candidacy}</#if>
</#if>
<#elseif statement.advisingRelLabel??>
<a href="${profileUrl(statement.uri("advisingRel"))}" title="${i18n().advisingRel_label}">${statement.advisingRelLabel!statement.localName}</a>

4
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
View file

@ -15,9 +15,9 @@
<#local linkedIndividual>
<#if statement.award??>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!statement.localName!}</a>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!}</a>
<#else>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!statement.localName!}</a>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!}</a>
</#if>
</#local>

2
productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
View file

@ -24,5 +24,5 @@
</#local>
<#-- If property is collated, then subclass label is redundant information -->
${linkedIndividual} <#if ! property.collatedBySubclass>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
${linkedIndividual} <#if (! property.collatedBySubclass) && statement.subclassLabel?has_content>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
</#macro>

9
productMods/templates/freemarker/edit/forms/js/advisorRelationshipUtils.js
View file

@ -25,6 +25,7 @@ var advisorRelUtils = {
this.form = $('#personHasAdvisingRelationship');
this.adRelshiplabel = $('#advisingRelLabel');
this.advisee = $('#advisee');
this.fauxLabel = $('#maskLabelBuilding');
this.subjArea = $('#SubjectArea');
this.firstName = $('#firstName');
this.lastName = $('#lastName');
@ -56,6 +57,7 @@ var advisorRelUtils = {
this.form.submit(function() {
advisorRelUtils.resolveAdviseeNames();
advisorRelUtils.buildAdvisingRelLabel();
});
},
@ -75,9 +77,16 @@ var advisorRelUtils = {
lastName = this.advisee.val();
name = lastName;
if (firstName) {
name += ', ' + firstName;
}
// we don't want the user to see the label getting built, so hide the acSelector
// field and display a bogus field that just has the last name in it.
this.fauxLabel.val(lastName);
this.advisee.hide();
this.fauxLabel.show();
this.advisee.val(name);
this.lastName.val(lastName);
}

1
productMods/templates/freemarker/edit/forms/personHasAdvisorRelationship.ftl
View file

@ -124,6 +124,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<p >
<label for="advisee">${i18n().advisee_capitalized}: ${i18n().last_name} ${requiredHint}<span style="padding-left:322px">${i18n().first_name} ${requiredHint}</span></label>
<input class="acSelector" size="50" type="text" acGroupName="advisee" id="advisee" name="adviseeLabel" value="${adviseeLabelValue}" >
<input type="text" size="50" id="maskLabelBuilding" name="maskLabelBuilding" value="" style="display:none" >
<input size="30" type="text" id="firstName" name="firstName" value="${firstNameValue}" ><br />
<input type="hidden" id="lastName" name="lastName" value="">
<input class="display" type="hidden" acGroupName="advisee" id="adviseeDisplay" name="adviseeLabelDisplay" value="${adviseeLabelDisplayValue}" >

12
rdf/display/everytime/PropertyConfig.n3
View file

@ -69,7 +69,7 @@ local:hasServiceProviderRoleContext a :ConfigContext ;
local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "service to the profession" ;
vitro:displayRankAnnot 1;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -129,7 +129,7 @@ local:hasTeacherRoleContext a :ConfigContext ;
local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "teaching activities" ;
vitro:displayRankAnnot 1;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -219,7 +219,7 @@ local:hasResearcherRoleContext a :ConfigContext ;
local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "research activities" ;
vitro:displayRankAnnot 10;
vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -234,7 +234,7 @@ local:hasInvestigatorRoleContext a :ConfigContext ;
local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "investigator on" ;
vitro:displayRankAnnot 25;
vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -249,7 +249,7 @@ local:hasPrincipalInvestigatorRoleContext a :ConfigContext ;
local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "principal investigator on" ;
vitro:displayRankAnnot 15;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -264,7 +264,7 @@ local:hasCo-PrincipalInvestigatorRoleContext a :ConfigContext ;
local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "co-principal investigator on" ;
vitro:displayRankAnnot 20;
vitro:displayRankAnnot 25;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;

73
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisorRelationshipGenerator.java
View file

@ -93,7 +93,7 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
conf.addSparqlForExistingUris("advisingRelType", advisingRelTypeQuery);
conf.addSparqlForExistingUris("advisorRole", existingAdvisorRoleQuery);
conf.addSparqlForExistingUris("advisingRelationship", existingAdvisingRelQuery);
conf.addSparqlForExistingUris("adviseeRole", existingAdviseeRoleQuery);
conf.addSparqlForExistingUris("existingSubjArea", subjAreaQuery);
conf.addSparqlForExistingUris("existingAdvisee", adviseeQuery);
@ -286,41 +286,63 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
/* Queries for editing an existing entry */
final static String existingAdvisingRelQuery =
"SELECT ?advisingRelationship WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
"}";
final static String advisingRelTypeQuery =
"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
"SELECT ?advisingRelType WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship vitro:mostSpecificType ?advisingRelType . \n" +
"}";
final static String advisingRelLabelQuery =
"SELECT ?existingAdvisingRelLabel WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + label + "> ?existingAdvisingRelLabel . \n" +
"}";
final static String adviseeQuery =
"SELECT ?existingAdvisee WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisee . \n" +
" ?existingAdvisee <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?existingAdvisee a <" + adviseeClass + "> . \n" +
" FILTER (?person != ?existingAdvisee) . \n" +
"}";
final static String existingAdvisorRoleQuery =
"SELECT ?existingAdvisorRole WHERE { \n" +
"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisorRole . \n" +
"?existingAdvisorRole a <" + advisorRoleClass + "> . \n" +
"}";
final static String existingAdviseeRoleQuery =
"SELECT ?existingAdviseeRole WHERE { \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdviseeRole . \n" +
" ?existingAdvisee <http://purl.obolibrary.org/obo/RO_0000053> ?existingAdviseeRole . \n" +
" ?existingAdviseeRole a <" + adviseeRoleClass + "> . \n" +
"}";
final static String adviseeLabelQuery =
"SELECT ?existingAdviseeLabel WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisee . \n" +
" ?existingAdvisee <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?existingAdvisee a <" + adviseeClass + "> . \n" +
" ?existingAdvisee <" + label + "> ?existingAdviseeLabel . \n" +
" FILTER (?person != ?existingAdvisee) . \n" +
" ?existingAdvisee <http://purl.obolibrary.org/obo/RO_0000053> ?existingAdviseeRole . \n" +
" ?existingAdviseeRole a <" + adviseeRoleClass + "> . \n" +
"}";
final static String existingAdviseeRoleQuery =
"SELECT ?existingAdviseeRole WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdviseeRole . \n" +
" ?existingAdviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?existingAdviseeRole a <" + adviseeRoleClass + "> . \n" +
"}";
final static String subjAreaQuery =
"SELECT ?existingSubjArea WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
" ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept> . \n" +
" ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
@ -328,25 +350,26 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
final static String subjAreaLabelQuery =
"SELECT ?existingSubjAreaLabel WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#hasSubjectArea> ?existingSubjArea . \n" +
" ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept> . \n" +
" ?existingSubjArea <" + label + "> ?existingSubjAreaLabel . \n" +
" ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
"}";
final static String advisingRelLabelQuery =
"SELECT ?existingAdvisingRelLabel WHERE { \n" +
" ?advisingRelationship <" + label + "> ?existingAdvisingRelLabel . \n" +
"}";
final static String degreeQuery =
"SELECT ?existingDegree WHERE {\n"+
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#degreeCandidacy> ?existingDegree . \n" +
" ?existingDegree a <" + degreeClass + "> . \n" +
"}";
final static String existingStartDateQuery =
"SELECT ?existingDateStart WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
@ -355,6 +378,8 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
final static String existingEndDateQuery =
"SELECT ?existingEndDate WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n " +
" ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +
@ -363,11 +388,15 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
final static String existingIntervalNodeQuery =
"SELECT ?existingIntervalNode WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?existingIntervalNode . \n" +
" ?existingIntervalNode a <" + intervalType + "> . }";
final static String existingStartNodeQuery =
"SELECT ?existingStartNode WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToStart + "> ?existingStartNode . \n" +
@ -375,6 +404,8 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
final static String existingEndNodeQuery =
"SELECT ?existingEndNode WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToEnd + "> ?existingEndNode . \n" +
@ -382,6 +413,8 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
final static String existingStartPrecisionQuery =
"SELECT ?existingStartPrecision WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToStart + "> ?startNode . \n" +
@ -390,6 +423,8 @@ public class PersonHasAdvisorRelationshipGenerator extends VivoBaseGenerator imp
final static String existingEndPrecisionQuery =
"SELECT ?existingEndPrecision WHERE { \n" +
" ?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
" ?advisingRelationship <" + advisingRelToInterval + "> ?intervalNode . \n" +
" ?intervalNode a <" + intervalType + "> . \n" +
" ?intervalNode <" + intervalToEnd + "> ?endNode . \n" +

1
themes/wilma/i18n/all.properties
View file

@ -109,6 +109,7 @@ websites = Websites
advisee_label = advisee label
advisor_label = advisor label
candidate = candidate
candidacy = candidacy
advisingRel_label = advisory label
editor_abbreviated = Ed.

64
utilities/ISF-transition/obsoleteUris/directory_walker.rb Normal file
View file

@ -0,0 +1,64 @@
require 'find'
class DirectoryWalker
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------
def start_walking()
Find.find(@directory_root) do |path|
if FileTest.directory?(path)
if File.basename(path).start_with?(".")
Find.prune # Don't look any further into this directory.
else
next
end
elsif @known_exceptions.skip?(path)
Find.prune
else
scan_file(path)
end
end
end
def scan_file(path)
@report.register_file(path)
lines = File.readlines(path)
lines.each_index do |index|
line_number = index + 1
line = lines[index].strip
scan_line(path, line_number, line) unless @known_exceptions.skip?(path, line_number)
end
end
def scan_line(path, line_number, line)
@obsolete_uris.uris.each do |uri|
next if @known_exceptions.skip?(path, line_number, uri)
@report.add_event(Event.new(path, line_number, line, uri)) if line =~ Regexp.new(Regexp.quote(uri))
end
if @complete
@obsolete_uris.localnames.each do |localname|
term = ":#{localname}"
next if @known_exceptions.skip?(path, line_number, term)
@report.add_event(Event.new(path, line_number, line, term)) if line =~ Regexp.new(Regexp.quote(term))
end
end
end
# ------------------------------------------------------------------------------------
public
# ------------------------------------------------------------------------------------
def initialize(directory_root, obsolete_uris, known_exceptions, report, complete)
@directory_root = File.expand_path(directory_root)
@obsolete_uris = obsolete_uris
@known_exceptions = known_exceptions
@report = report
@complete = complete
end
def walk()
start_walking()
end
end

21
utilities/ISF-transition/obsoleteUris/event.rb Normal file
View file

@ -0,0 +1,21 @@
class Event
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------
# ------------------------------------------------------------------------------------
public
# ------------------------------------------------------------------------------------
def initialize(path, line_number, line, string)
@path = path
@line_number = line_number
@line = line
@string = string
@is_localname = string[0] == ?:
end
def to_s()
"#{@path} \n #{@line_number} #{@line} \n #{@string} #{@is_localname ? "Localname" : "URI"}"
end
end

77
utilities/ISF-transition/obsoleteUris/known_exceptions.rb Normal file
View file

@ -0,0 +1,77 @@
class KnownExceptionsError < StandardError; end
class ExtensionSkipper
def initialize(extension)
@extension = extension
end
def skip?(path, line, uri)
return File.extname(path) == @extension
end
end
class PathSkipper
def initialize(root_path, relative_path)
@root_path = root_path
@absolute_path = File.expand_path(relative_path, @root_path)
end
def skip?(path, line, uri)
return @absolute_path == File.expand_path(path, @root_path)
end
end
class LineSkipper
def initialize(root_path, relative_path, line_number)
@inner = PathSkipper.new(root_path, relative_path)
@line_number = line_number
end
def skip?(path, line, uri)
return @inner.skip?(path, line, uri) && line == @line_number
end
end
class KnownExceptions
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------
def parse_file(file)
skippers = []
File.readlines(file).each do |line|
# ignore blank lines, and lines starting with '#' or '!'.
line.strip!
next if line.length == 0 || line[0..0] == '#' || line[0] == ?!
if line =~ /^\.[^\/]*$/
skippers << ExtensionSkipper.new(line)
elsif line =~ /^(\S+)\s*$/
skippers << PathSkipper.new(@root_path, $1)
elsif line =~ /^(\S+)\s*(\d+)\s*$/
skippers << LineSkipper.new(@root_path, $1, $2.to_i)
else
raise "BOGUS line in known_exceptions file: '#{line}'"
end
end
skippers
end
# ------------------------------------------------------------------------------------
public
# ------------------------------------------------------------------------------------
def initialize(root_path, file)
@root_path = File.expand_path(root_path)
@skippers = parse_file(file)
end
def skip?(file, line_number = -1, string = "@!#IMPOSSIBLE#!@")
@skippers.each() do |skipper|
if skipper.skip?(file, line_number, string)
return true
end
end
false
end
end

120
utilities/ISF-transition/obsoleteUris/obsoleteUriChecker.rb Normal file
View file

@ -0,0 +1,120 @@
=begin
--------------------------------------------------------------------------------
A utility that scans the code base for the presence of URIs that were made
obsolete by the ISF transition.
Accept a file of obsolete URIs.
Blank lines or lines beginning with '#' are comments.
Each non-comment line contains an obsolete URI.
Accept a file of known exceptions.
Blank lines or lines beginning with '#' are comments.
Each non-comment line is in one of these forms:
.xxx - denotes an extension that is exempt from scanning
[filepath] - denotes a path, relative to the codebase root, of a
file that should not be scanned.
[filepath] [line number] - denotes a particular line in a file for
which no error should be reported.
[filepath] [line number] [uri] - denotes a particular line in a file
on which the given uri will not be reported.
The command line will look like this:
ruby obsoleteUriChecker.rb <directory_root> <obsolete_uri_file> <known_exceptions_file> [complete]
Where:
directory_root - the path to the top if the directory tree we are scanning
obsolete_uri_file - the path to the file that lists the obsolete URIs
known_exceptions_file - the path to the file that lists the events that we should ignore
complete - optional parameter; if present, check for :localname as well as for the full URL.
E.g.:
ruby obsoleteUriChecker.rb ../../.. ../../../productMods/WEB-INF/ontologies/update/diff.tab.txt known_exceptions.txt complete
--------------------------------------------------------------------------------
=end
$: << File.dirname(File.expand_path(__FILE__))
require 'known_exceptions'
require 'obsolete_uris'
require 'report'
require 'event'
require 'directory_walker'
class UsageError < StandardError; end
class ObsoleteUriChecker
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------
#
# Parse the arguments and complain if they don't make sense.
#
def parse_arguments(args)
raise UsageError, "usage is: obsoleteUriChecker.rb <directory_root> <obsolete_uri_file> <known_exceptions_file> [complete]" unless (3..4).include?(args.length)
if args[3]
raise UsageError, "If provided, the 4th argument must be 'complete'" unless args[3].downcase == 'complete'
complete = true
else
complete = false
end
directory_root = args[0]
raise UsageError, "Directory '#{directory_root}' does not exist." unless File.exist?(directory_root)
raise UsageError, "Directory '#{directory_root}' is not a directory." unless File.directory?(directory_root)
obsolete_uri_file = args[1]
raise UsageError, "File '#{obsolete_uri_file}' does not exist." unless File.exist?(obsolete_uri_file)
obsolete_uris = ObsoleteUris.new(obsolete_uri_file)
known_exceptions_file = args[2]
raise UsageError, "File '#{known_exceptions_file}' does not exist." unless File.exist?(known_exceptions_file)
known_exceptions = KnownExceptions.new(directory_root, known_exceptions_file)
return directory_root, obsolete_uris, known_exceptions, complete
end
# ------------------------------------------------------------------------------------
public
# ------------------------------------------------------------------------------------
def initialize(args)
@report = Report.new(args)
@directory_root, @obsolete_uris, @known_exceptions, @complete = parse_arguments(args)
rescue UsageError => e
puts "\n----------------\nUsage error\n----------------\n\n#{e}\n\n----------------\n\n"
exit
rescue ObsoleteUrisError => e
puts "\n----------------\nObsolete Uris file is invalid\n----------------\n\n#{e}\n\n----------------\n\n"
exit
rescue KnownExceptionsError => e
puts "\n----------------\Known Exceptions file is invalid\n----------------\n\n#{e}\n\n----------------\n\n"
exit
end
def scan()
walker = DirectoryWalker.new(@directory_root, @obsolete_uris, @known_exceptions, @report, @complete)
walker.walk
end
def report()
@report.report()
end
end
#
#
# ------------------------------------------------------------------------------------
# Standalone calling.
#
# Do this if this program was called from the command line. That is, if the command
# expands to the path of this file.
# ------------------------------------------------------------------------------------
#
if File.expand_path($0) == File.expand_path(__FILE__)
checker = ObsoleteUriChecker.new(ARGV)
checker.scan()
checker.report()
end

42
utilities/ISF-transition/obsoleteUris/obsolete_uris.rb Normal file
View file

@ -0,0 +1,42 @@
class ObsoleteUrisError < StandardError; end
class ObsoleteUris
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------
def get_localname(uri)
delimiter = uri.rindex(/[\/#]/)
return uri[delimiter+1..-1] if delimiter
raise "BOGUS URI in obsolete_uris file -- no localname: '#{uri}'"
end
# ------------------------------------------------------------------------------------
public
# ------------------------------------------------------------------------------------
def initialize(file)
@uris = []
@localnames = []
File.read(file).split(/[\r\n]+/).each do |line|
# ignore blank lines, and lines starting with '#' or '!'.
line.strip!
next if line.length == 0 || line[0..0] == '#' || line[0] == ?!
if line =~ /^(\S+)/
@uris << $1
@localnames << get_localname($1)
else
raise "BOGUS line in obsolete_uris file: '#{line}'"
end
end
end
def uris()
@uris
end
def localnames()
@localnames
end
end

55
utilities/ISF-transition/obsoleteUris/report.rb Normal file
View file

@ -0,0 +1,55 @@
class Report
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------
def state_arguments()
puts
puts "-----------------------------------------------------------------"
puts " directory to scan = #{@args[0]}"
puts " obsolete_uris_file = #{@args[1]}"
puts " known exceptions file = #{@args[2]}"
puts " complete = #{!@args[3].nil?}"
puts "-----------------------------------------------------------------"
puts
end
def file_summary()
puts " scanned #{@file_count} files"
@extensions_count.sort.each do |pair|
puts " #{pair[0]} #{pair[1]}"
end
end
def list_events()
@events.each do |event|
puts "Event: #{event}"
end
end
# ------------------------------------------------------------------------------------
public
# ------------------------------------------------------------------------------------
def initialize(args)
@args = args;
@file_count = 0
@extensions_count = Hash.new(0)
@events = []
end
def register_file(path)
@file_count += 1
@extensions_count[File.extname(path)] += 1
end
def add_event(event)
@events << event
end
def report()
state_arguments()
file_summary()
list_events()
end
end

10
utilities/LoadTesting/scripts/_captureTomcatLogs
View file

@ -10,18 +10,16 @@ directory, for possible inspection later.
--------------------------------------------------------------------------------
=end
require File.expand_path('subscripts/common', File.dirname(__FILE__))
require 'date'
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
def figure_time_stamp()
return DateTime.now.strftime("%Y-%m-%d_%H-%M-%S")
end
Dir.chdir("/home/jeb228/LoadTesting/versions/#{@version_name}") do |path|
@tomcat_logs_dir = "#{path}/tomcatLogs"
if (! File.directory?(@tomcat_logs_dir))
@tomcat_logs_dir = version_file('tomcatLogs')
if (! File.directory?(@tomcat_logs_dir))
Dir.mkdir(@tomcat_logs_dir)
end
end
Dir.chdir(@tomcat_logs_dir) do |path|
@ -30,6 +28,6 @@ Dir.chdir(@tomcat_logs_dir) do |path|
end
Dir.chdir(@this_logs_dir) do |path|
system('cp ~/LoadTesting/tomcat/logs/* .')
system("cp #{@home}/tomcat/logs/* .")
end

4
utilities/LoadTesting/scripts/_clearTomcatLogs
View file

@ -9,4 +9,6 @@ Remove any Tomcat logs.
--------------------------------------------------------------------------------
=end
puts system("rm ~/LoadTesting/tomcat/logs/*")
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts system("rm #{@home}/tomcat/logs/*")

28
utilities/LoadTesting/scripts/_deploy
View file

@ -13,12 +13,12 @@ template. Then run the build script.
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
require 'erb'
def build_deploy_properties
File.open(@deploy_properties_source) do |source_file|
File.open(@deploy_properties_target, 'w') do |target_file|
def process_template_file(source, target)
File.open(source) do |source_file|
File.open(target, 'w') do |target_file|
raw = source_file.read()
cooked = ERB.new(raw).result
target_file.write(cooked)
@ -26,14 +26,18 @@ def build_deploy_properties
end
end
puts system("rm -r ~/LoadTesting/tomcat/webapps/vivo*")
puts system("rm -r ~/LoadTesting/tomcat/conf/Catalina/localhost/vivo*")
puts system("rm -r #{@home}/tomcat/webapps/vivo*")
puts system("rm -r #{@home}/tomcat/conf/Catalina/localhost/vivo*")
puts system("rm -r #{@home}/tomcat/work/Catalina/localhost/vivo*")
@deploy_properties_source = "/home/jeb228/LoadTesting/distros/#{@distro_name}/deploy.properties.template"
@deploy_properties_target = "/home/jeb228/LoadTesting/distros/#{@distro_name}/vivo/deploy.properties"
build_deploy_properties()
Dir.chdir("/home/jeb228/LoadTesting/distros/#{@distro_name}/vivo") do |path|
system "ant clean deploy"
if (@is_git)
process_template_file(distro_file("build.properties.template"), distro_file("VIVO/build.properties"))
process_template_file(distro_file("runtime.properties.template"), version_file("data/runtime.properties"))
Dir.chdir(distro_file("VIVO")) { |path| system "ant clean deploy" }
else
process_template_file(distro_file("deploy.properties.template"), distro_file("vivo/deploy.properties"))
Dir.chdir(distro_file("vivo")) { |path| system "ant clean deploy" }
end

10
utilities/LoadTesting/scripts/_fakeUploadedFiles
View file

@ -13,14 +13,14 @@ the data model.
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require "#{File.dirname(__FILE__)}/subscripts/upload_file_faker"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
require "subscripts/upload_file_faker"
properties = {}
properties["uploads_directory"] = "/home/jeb228/LoadTesting/versions/#{@version_name}/data/uploads"
properties["file_info_file"] = "/home/jeb228/LoadTesting/modelData/#{@site_name}/imageFileInfo.csv"
properties["template_file"] = "#{File.dirname(__FILE__)}/subscripts/dummy_image_file.jpg"
properties["uploads_directory"] = version_file('data/uploads')
properties["file_info_file"] = "#{@home}/modelData/#{@site_name}/imageFileInfo.csv"
properties["template_file"] = "#{@home}/scripts/subscripts/dummy_image_file.jpg"
if ARGV.length == 1 && ARGV[0] == "doit"
properties["scan_only"] = "false"

4
utilities/LoadTesting/scripts/_lessVivoLog
View file

@ -9,4 +9,6 @@ View the VIVO log in Tomcat.
--------------------------------------------------------------------------------
=end
puts system("less ~/LoadTesting/tomcat/logs/vivo.all.log")
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts system("less #{@home}/tomcat/logs/vivo.all.log")

10
utilities/LoadTesting/scripts/_mergeTestResults
View file

@ -10,14 +10,14 @@ into an HTML file so we can easily compare them.
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require "#{File.dirname(__FILE__)}/subscripts/test_result_merger"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
require 'subscripts/test_result_merger'
properties = {}
source_dir = "/home/jeb228/LoadTesting/testinfo/results/#{@site_name}"
source_dir = "#{@home}/testinfo/results/#{@site_name}"
properties["source_directory"] = source_dir
properties["target_directory"] = "/var/www/html/loadTesting/"
properties["target_directory"] = "#{@home}/webpages/"
properties["site_name"] = "#{@site_name}"
suggestions = []
@ -38,5 +38,3 @@ trm = TestResultMerger.new(properties)
trm.merge
puts "TestResultMerger was successful."

12
utilities/LoadTesting/scripts/_runTest
View file

@ -13,15 +13,15 @@ Use XSL to create an HTML version of the results.
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
def locate_files()
test_full_name = "#{@test_name}#{@test_suffix}"
test_source_dir = "/home/jeb228/LoadTesting/testinfo/tests/#{@test_name}"
test_source_dir = test_file("tests/#{@test_name}")
@test_jmx_file = "#{test_source_dir}/#{test_full_name}.jmx"
raise "Test file doesn't exist: '#{@test_jmx_file}'." unless File.file?(@test_jmx_file)
result_dir = "/home/jeb228/LoadTesting/testinfo/results/#{@site_name}"
result_dir = test_file("results/#{@site_name}")
Dir.mkdir(result_dir) unless File.directory?(result_dir)
@test_jtl_file = "#{result_dir}/#{test_full_name}.jtl"
@ -33,7 +33,7 @@ def locate_files()
@test_html_file = "#{result_dir}/#{test_full_name}.html"
File.delete(@test_html_file) if File.file?(@test_html_file)
data_dir = "/home/jeb228/LoadTesting/modelData/#{@site_name}"
data_dir = "#{@home}/modelData/#{@site_name}"
@person_uris_file = "#{data_dir}/personUris.csv"
raise "Person URIs file doesn't exist: '#{@person_uris_file}'" unless File.file?(@person_uris_file)
@infoResource_uris_file = "#{data_dir}/infoResourceUris.csv"
@ -41,7 +41,7 @@ def locate_files()
@author_uris_file = "#{data_dir}/authorUris.csv"
raise "Author URIs file doesn't exist: '#{@author_uris_file}'" unless File.file?(@author_uris_file)
@xsl_stylesheet_file = "/home/jeb228/LoadTesting/jmeter/jakarta-jmeter-2.4/extras/jmeter-results-report_21.xsl"
@xsl_stylesheet_file = "#{@home}/jmeter/jakarta-jmeter-2.4/extras/jmeter-results-report_21.xsl"
end
def prepare_jmeter_properties()
@ -87,7 +87,7 @@ locate_files()
prepare_jmeter_properties()
test_the_webapp()
Dir.chdir("/home/jeb228/LoadTesting/jmeter/jakarta-jmeter-2.4/bin") do |path|
Dir.chdir("#{@home}/jmeter/jakarta-jmeter-2.4/bin") do |path|
puts "RUNNING TESTS"
system "./jmeter -n -t #{@test_jmx_file} -l #{@test_jtl_file} -j #{@test_log_file} #{@jmeter_properties}"
puts "CONVERTING TO HTML"

10
utilities/LoadTesting/scripts/_setTest
View file

@ -12,12 +12,18 @@ Record that selection, along with the desired number of iterations and threads.
--------------------------------------------------------------------------------
=end
@test_parms_file = "#{File.dirname(__FILE__)}/subscripts/_current_test.rb"
begin
require File.expand_path('subscripts/common', File.dirname(__FILE__))
rescue LoadError => e
puts e
end
@test_parms_file = "#{@home}/scripts/subscripts/_current_test.rb"
# Find out what tests we have available
def build_test_list()
@test_names = []
Dir.foreach("/home/jeb228/LoadTesting/testinfo/tests") do |filename|
Dir.foreach(test_file('tests')) do |filename|
@test_names.push(filename) unless filename[0,1] == "."
end
@test_names.sort!

10
utilities/LoadTesting/scripts/_setVersion
View file

@ -10,12 +10,18 @@ record that choice.
--------------------------------------------------------------------------------
=end
@version_parms_file = "#{File.dirname(__FILE__)}/subscripts/_current_version.rb"
begin
require File.expand_path('subscripts/common', File.dirname(__FILE__))
rescue LoadError => e
puts e
end
@version_parms_file = "#{@home}/scripts/subscripts/_current_version.rb"
# Find out what versions we have available
def build_version_list()
@version_names = []
Dir.foreach("/home/jeb228/LoadTesting/versions") do |filename|
Dir.foreach("#{@home}/versions") do |filename|
@version_names.push(filename) unless (filename[0,1] == "_") || (filename[0,1] == ".")
end
@version_names.sort!

5
utilities/LoadTesting/scripts/_startTomcat
View file

@ -8,5 +8,8 @@ Duh
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
=end
puts system("~/LoadTesting/tomcat/bin/startup.sh")
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts system("#{@home}/tomcat/bin/startup.sh")

15
utilities/LoadTesting/scripts/_status
View file

@ -8,13 +8,14 @@ Show the SVN status of the currently-selected distro, both VIVO and Vitro.
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
Dir.chdir("/home/jeb228/LoadTesting/distros/#{@distro_name}/vitro") do |path|
system "svn status -u"
end
Dir.chdir("/home/jeb228/LoadTesting/distros/#{@distro_name}/vivo") do |path|
system "svn status -u"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
if (@is_git)
Dir.chdir(distro_file('Vitro')) { |path| system "svn status -u" }
Dir.chdir(distro_file('VIVO')) { |path| system "svn status -u" }
else
Dir.chdir(distro_file('vitro')) { |path| system "svn status -u" }
Dir.chdir(distro_file('vivo')) { |path| system "svn status -u" }
end

4
utilities/LoadTesting/scripts/_stopTomcat
View file

@ -9,5 +9,7 @@ Duh
--------------------------------------------------------------------------------
=end
puts system("~/LoadTesting/tomcat/bin/shutdown.sh")
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts system("#{@home}/tomcat/bin/shutdown.sh")

4
utilities/LoadTesting/scripts/_tailTomcatLogs
View file

@ -9,4 +9,6 @@ Start following the tails of all of the logs in Tomcat.
--------------------------------------------------------------------------------
=end
puts system("tail -f ~/LoadTesting/tomcat/logs/*")
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts system("tail -f #{@home}/tomcat/logs/*")

15
utilities/LoadTesting/scripts/_update
View file

@ -9,13 +9,12 @@ Use SVN to get the latest revisions to the currently-selected distro.
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
Dir.chdir("/home/jeb228/LoadTesting/distros/#{@distro_name}/vitro") do |path|
system "svn update"
if (@is_git)
Dir.chdir(distro_file('Vitro')) { |path| system "git pull" }
Dir.chdir(distro_file('VIVO')) { |path| system "git pull" }
else
Dir.chdir(distro_file('vitro')) { |path| system "svn update" }
Dir.chdir(distro_file('vivo')) { |path| system "svn update" }
end
Dir.chdir("/home/jeb228/LoadTesting/distros/#{@distro_name}/vivo") do |path|
system "svn update"
end

2
utilities/LoadTesting/scripts/_whichTest
View file

@ -9,7 +9,7 @@ What is the currently-selected test?
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts "Current test is #{@test_name}, #{@test_threads} threads, #{@test_iterations} iterations"

2
utilities/LoadTesting/scripts/_whichVersion
View file

@ -9,7 +9,7 @@ What is the currently-selected version?
--------------------------------------------------------------------------------
=end
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
require File.expand_path('subscripts/common', File.dirname(__FILE__))
puts "Current version is #{@version_name}"

4
utilities/LoadTesting/scripts/subscripts/_current_test.rb
View file

@ -1,4 +0,0 @@
# what is the current test, and how many times will it run?
@test_name = 'SimpleTests'
@test_threads = '1'
@test_iterations = '40'

2
utilities/LoadTesting/scripts/subscripts/_current_version.rb
View file

@ -1,2 +0,0 @@
# what is the current version under test?
@version_name = 'cornell1.4'

33
utilities/LoadTesting/scripts/subscripts/common.rb Normal file
View file

@ -0,0 +1,33 @@
#
# The path to the LoadTesting directory. Everything is based on this
#
@home = File.expand_path("../..", File.dirname(__FILE__))
#
# 'require' should look in the scripts directory
#
$: << File.expand_path('scripts', @home)
#
# convenience methods to access files
#
def version_file(path)
"#{@home}/versions/#{@version_name}/#{path}"
end
def distro_file(path)
"#{@home}/distros/#{@distro_name}/#{path}"
end
def site_file(path)
"#{@home}/sites/#{@site_name}/#{path}"
end
def test_file(path)
"#{@home}/testinfo/#{path}"
end
#
# All of the scripts need to load these parms. (Except _setVersion and _setTest)
#
require 'subscripts/loadParms'

10
utilities/LoadTesting/scripts/subscripts/loadParms.rb
View file

@ -1,6 +1,6 @@
require "#{File.dirname(__FILE__)}/_current_version"
require "#{File.dirname(__FILE__)}/_current_test"
require "/home/jeb228/LoadTesting/versions/#{@version_name}/version_properties"
require "/home/jeb228/LoadTesting/distros/#{@distro_name}/distro_properties"
require "/home/jeb228/LoadTesting/sites/#{@site_name}/site_properties"
require 'subscripts/_current_version'
require 'subscripts/_current_test'
require version_file('version_properties')
require distro_file('distro_properties')
require site_file('site_properties')