Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

utilities/ISF-transition/obsoleteUris/directory_walker.rb

@@ -34,13 +34,13 @@ class DirectoryWalker
   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)) 
+      @report.add_event(Event.new(path, line_number, line, uri)) if line =~ Regexp.new("\\b#{Regexp.quote(uri)}\\b") 
     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)) 
+        @report.add_event(Event.new(path, line_number, line, term)) if line =~ Regexp.new("#{Regexp.quote(term)}\\b") 
       end
     end
   end

utilities/ISF-transition/obsoleteUris/report.rb

@@ -33,7 +33,13 @@ class Report
     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}"
+        trimmed = 
+          if e.line.size <= 100
+            e.line 
+          else
+            e.line[0..97] << "..."
+          end
+        puts "   #{e.line_number} #{trimmed}"
         puts "       #{e.is_localname ? "Localname" : "URI"} #{e.string}"
       end
       puts "--------------------"

utilities/acceptance-tests/suites/ShortViews/shortview_config.n3

@@ -67,12 +67,14 @@ mydomain:facultyPreferredTitleDG
 	a datagetters:SparqlQueryDataGetter ;
 	display:saveToVar "extra" ;
 	display:query """
-PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX vivo: <http://vivoweb.org/ontology/core#>
-SELECT ?pt 
+PREFIX obo: <http://purl.obolibrary.org/obo/>
+PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
+SELECT DISTINCT ?pt
 WHERE {
-?individualUri <http://vivoweb.org/ontology/core#preferredTitle> ?pt
-} 
+?individualUri obo:ARG_2000028 ?vIndividual .
+?vIndividual vcard:hasTitle ?vTitle .
+?vTitle vcard:title ?pt .
+}
 LIMIT 1
 	""" .