From 6d98124340e00b827f2008a230a05682b492c99c Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Sat, 26 Oct 2013 17:04:18 -0400
Subject: [PATCH] Fix the scan to reduce false positives.

Also, truncate the lines on output if over 100 characters.
---
 utilities/ISF-transition/obsoleteUris/directory_walker.rb | 4 ++--
 utilities/ISF-transition/obsoleteUris/report.rb           | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/utilities/ISF-transition/obsoleteUris/directory_walker.rb b/utilities/ISF-transition/obsoleteUris/directory_walker.rb
index c7c87ea8..5ccaa89c 100644
--- a/utilities/ISF-transition/obsoleteUris/directory_walker.rb
+++ b/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
diff --git a/utilities/ISF-transition/obsoleteUris/report.rb b/utilities/ISF-transition/obsoleteUris/report.rb
index aa9dce78..0bdef5eb 100644
--- a/utilities/ISF-transition/obsoleteUris/report.rb
+++ b/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 "--------------------"