diff --git a/example.runtime.properties b/config/example.runtime.properties similarity index 100% rename from example.runtime.properties rename to config/example.runtime.properties diff --git a/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl b/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl index 8b62b6f2..039ec2c9 100644 --- a/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl +++ b/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl @@ -10705,7 +10705,7 @@ northern America + >North America northern America + >North America northern America + >North America diff --git a/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf b/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf index 32f7faf2..afae26b8 100644 --- a/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf +++ b/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf @@ -1221,7 +1221,7 @@ northern America + >North America PREFIX vivoc: - 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 } """ . diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf b/test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf index b9f3dc3c..e2d95cdf 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf +++ b/test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf @@ -41730,7 +41730,7 @@ has super-classes - northern America + North America أمريكا الشمالية América Septentrional; Norteamérica America del Nord @@ -41748,19 +41748,19 @@ has super-classes أمريكا الشمالية Северная Америка Amérique septentrionale - northern America + North America 021 America del Nord 5219 - northern America + North America 5203 Amérique septentrionale 北美洲 أمريكا الشمالية - northern America + North America diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 index 5e65951f..46c44009 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 +++ b/test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 @@ -2258,7 +2258,7 @@ geo:South_America geo:northern_America - "northern America"^^ . + "North America"^^ . diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index 5e3f0dd7..02326f89 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -1696,7 +1696,7 @@ input[type="submit"] { cursor: pointer; } .checkboxSpacer { - margin-left:150px; + margin-left:80px; } p.address-line { margin-bottom: 0.3em; diff --git a/utilities/ISF-transition/obsoleteUris/event.rb b/utilities/ISF-transition/obsoleteUris/event.rb index 5222a123..00f1a598 100644 --- a/utilities/ISF-transition/obsoleteUris/event.rb +++ b/utilities/ISF-transition/obsoleteUris/event.rb @@ -1,4 +1,10 @@ class Event + attr_reader :path + attr_reader :line_number + attr_reader :line + attr_reader :string + attr_reader :is_localname + # ------------------------------------------------------------------------------------ private # ------------------------------------------------------------------------------------ diff --git a/utilities/ISF-transition/obsoleteUris/known_exceptions.rb b/utilities/ISF-transition/obsoleteUris/known_exceptions.rb index b948752c..871782ee 100644 --- a/utilities/ISF-transition/obsoleteUris/known_exceptions.rb +++ b/utilities/ISF-transition/obsoleteUris/known_exceptions.rb @@ -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 diff --git a/utilities/ISF-transition/obsoleteUris/report.rb b/utilities/ISF-transition/obsoleteUris/report.rb index 3794dafe..aa9dce78 100644 --- a/utilities/ISF-transition/obsoleteUris/report.rb +++ b/utilities/ISF-transition/obsoleteUris/report.rb @@ -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 diff --git a/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt b/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt new file mode 100644 index 00000000..3409da4c --- /dev/null +++ b/utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt @@ -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