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-23 17:55:11 -04:00
commit 268ea5e73c
11 changed files with 87 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

0
example.runtime.properties → config/example.runtime.properties
View file

6
rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl
View file

@ -10705,7 +10705,7 @@
<geo:nameOfficialEN
rdf:datatype=
"http://www.w3.org/2001/XMLSchema#string"
>northern America</geo:nameOfficialEN>
>North America</geo:nameOfficialEN>
<geo:hasMember>
<geo:self_governing rdf:about="http://aims.fao.org/aos/geopolitical.owl#Canada">
<geo:nameShortZH
@ -11028,7 +11028,7 @@
<geo:nameListEN
rdf:datatype=
"http://www.w3.org/2001/XMLSchema#string"
>northern America</geo:nameListEN>
>North America</geo:nameListEN>
<geo:codeFAOSTAT
rdf:datatype=
"http://www.w3.org/2001/XMLSchema#string"
@ -11048,7 +11048,7 @@
<geo:nameShortEN
rdf:datatype=
"http://www.w3.org/2001/XMLSchema#string"
>northern America</geo:nameShortEN>
>North America</geo:nameShortEN>
</geo:geographical_region>
</geo:isInGroup>
<geo:isInGroup rdf:resource="http://aims.fao.org/aos/geopolitical.owl#FAO_2006"/>

2
rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf
View file

@ -1221,7 +1221,7 @@
</rdf:Description>
<rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#northern_America">
<rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
>northern America</rdfs:label>
>North America</rdfs:label>
</rdf:Description>
<rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#Slovakia">
<rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string"

4
rdf/display/everytime/homePageDataGetters.n3
View file

@ -42,10 +42,10 @@ display:researcherCountDataGetter
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX vivoc: <http://vivo.library.cornell.edu/ns/0.1#>
SELECT DISTINCT (COUNT(?person) AS ?count)
SELECT DISTINCT (COUNT(DISTINCT ?person) AS ?count)
WHERE {
?person rdf:type foaf:Person .
FILTER (EXISTS {?person core:geographicFocus ?focus})
?person core:geographicFocus ?focus
}
""" .

8
test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf
View file

@ -41730,7 +41730,7 @@ has super-classes</j.4:descriptionAnnot>
<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Restriction"/>
</rdf:Description>
<rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#northern_America">
<rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">northern America</rdfs:label>
<rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">North America</rdfs:label>
<j.0:nameShortAR rdf:datatype="http://www.w3.org/2001/XMLSchema#string">أمريكا الشمالية</j.0:nameShortAR>
<j.0:nameOfficialES rdf:datatype="http://www.w3.org/2001/XMLSchema#string">América Septentrional; Norteamérica</j.0:nameOfficialES>
<j.0:nameShortIT rdf:datatype="http://www.w3.org/2001/XMLSchema#string">America del Nord</j.0:nameShortIT>
@ -41748,19 +41748,19 @@ has super-classes</j.4:descriptionAnnot>
<j.0:nameListAR rdf:datatype="http://www.w3.org/2001/XMLSchema#string">أمريكا الشمالية</j.0:nameListAR>
<j.0:nameShortRU rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Северная Америка</j.0:nameShortRU>
<j.0:nameListFR rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Amérique septentrionale</j.0:nameListFR>
<j.0:nameOfficialEN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">northern America</j.0:nameOfficialEN>
<j.0:nameOfficialEN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">North America</j.0:nameOfficialEN>
<j.0:hasMember rdf:resource="http://aims.fao.org/aos/geopolitical.owl#Canada"/>
<j.0:codeUN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">021</j.0:codeUN>
<j.0:nameOfficialIT rdf:datatype="http://www.w3.org/2001/XMLSchema#string">America del Nord</j.0:nameOfficialIT>
<j.0:hasMember rdf:resource="http://aims.fao.org/aos/geopolitical.owl#United_States_of_America"/>
<j.0:codeAGROVOC rdf:datatype="http://www.w3.org/2001/XMLSchema#string">5219</j.0:codeAGROVOC>
<rdf:type rdf:resource="http://aims.fao.org/aos/geopolitical.owl#geographical_region"/>
<j.0:nameListEN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">northern America</j.0:nameListEN>
<j.0:nameListEN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">North America</j.0:nameListEN>
<j.0:codeFAOSTAT rdf:datatype="http://www.w3.org/2001/XMLSchema#string">5203</j.0:codeFAOSTAT>
<j.0:nameOfficialFR rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Amérique septentrionale</j.0:nameOfficialFR>
<j.0:nameOfficialZH rdf:datatype="http://www.w3.org/2001/XMLSchema#string">北美洲</j.0:nameOfficialZH>
<j.0:nameOfficialAR rdf:datatype="http://www.w3.org/2001/XMLSchema#string">أمريكا الشمالية</j.0:nameOfficialAR>
<j.0:nameShortEN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">northern America</j.0:nameShortEN>
<j.0:nameShortEN rdf:datatype="http://www.w3.org/2001/XMLSchema#string">North America</j.0:nameShortEN>
<rdf:type rdf:resource="http://vivoweb.org/ontology/core#Continent"/>
<rdf:type rdf:resource="http://vivoweb.org/ontology/core#GeographicLocation"/>
<rdf:type rdf:resource="http://vivoweb.org/ontology/core#GeographicRegion"/>

2
test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3
View file

@ -2258,7 +2258,7 @@ geo:South_America
geo:northern_America
<http://www.w3.org/2000/01/rdf-schema#label>
"northern America"^^<http://www.w3.org/2001/XMLSchema#string> .
"North America"^^<http://www.w3.org/2001/XMLSchema#string> .
<http://vivo.colorado.edu/spinId_0312127>
<http://www.w3.org/2000/01/rdf-schema#label>

2
themes/wilma/css/wilma.css
View file

@ -1696,7 +1696,7 @@ input[type="submit"] {
cursor: pointer;
}
.checkboxSpacer {
margin-left:150px;
margin-left:80px;
}
p.address-line {
margin-bottom: 0.3em;

6
utilities/ISF-transition/obsoleteUris/event.rb
View file

@ -1,4 +1,10 @@
class Event
attr_reader :path
attr_reader :line_number
attr_reader :line
attr_reader :string
attr_reader :is_localname
# ------------------------------------------------------------------------------------
private
# ------------------------------------------------------------------------------------

6
utilities/ISF-transition/obsoleteUris/known_exceptions.rb
View file

@ -68,6 +68,12 @@ class KnownExceptions
def skip?(file, line_number = -1, string = "@!#IMPOSSIBLE#!@")
@skippers.each() do |skipper|
if line_number == -1
next if skipper.is_a?(LineSkipper)
else
next if skipper.is_a?(ExtensionSkipper) || skipper.is_a?(PathSkipper)
end
if skipper.skip?(file, line_number, string)
return true
end

24
utilities/ISF-transition/obsoleteUris/report.rb
View file

@ -19,8 +19,27 @@ class Report
@extensions_count.sort.each do |pair|
puts " #{pair[0]} #{pair[1]}"
end
puts "-----------------------------------------------------------------"
puts
end
def collate_and_list_events()
hash = Hash.new{|h, k| []}
@events.each do |event|
hash[event.path] = hash[event.path] << event
end
# puts "FLAT: #{hash.to_a.flatten}"
hash.sort.each do |path, events|
puts "#{path}"
events.sort{|a, b| a.line_number <=> b.line_number }.each do |e|
puts " #{e.line_number} #{e.line}"
puts " #{e.is_localname ? "Localname" : "URI"} #{e.string}"
end
puts "--------------------"
end
end
def list_events()
@events.each do |event|
puts "Event: #{event}"
@ -50,6 +69,7 @@ class Report
def report()
state_arguments()
file_summary()
list_events()
# list_events()
collate_and_list_events()
end
end

41
utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt Normal file
View file

@ -0,0 +1,41 @@
.GIF
.as
.class
.fla
.gif
.gz
.ico
.jar
.jpg
.psd
.png
.swf
.war
.zip
#
# first_pass: no excluded files. everything was duplicated in the .bin directory, and
# probably in the .build directory also. Ran against the repository, so VIVO
# only.
#
# 7498 89730 2277668 first_pass.output
#
test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf
productMods/WEB-INF/ontologies/update/oldVersion/vivo-event-1.5.owl
productMods/WEB-INF/ontologies/update/oldAnnotations/vivo-core-1.5-annotations.rdf
productMods/WEB-INF/ontologies/update/diff.tab.txt
#
# second_pass: excluded these nasty files. Ran against a clean distro, with VIVO and
# Vitro, but no .bin or .build
#
# 1798 5159 170092 second_pass.output
#
productMods/WEB-INF/ontologies/update/oldVersion/vivo-foaf-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-core-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-bibo-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/scires-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcterms-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcelements-1.5.owl