Merge pull request #915 from metanorma/fix/dupe-term-reporting

improved reporting of duplicate terms: https://github.com/metanorma/m…

lib/metanorma/standoc/validate_term.rb

@@ -62,22 +62,24 @@ def concept_validate_msg(_doc, tag, refterm, xref)
       end
 
       def preferred_validate(doc)
-        out = []
         ret = doc.xpath("//term").each_with_object({}) do |t, m|
           prefix = t.at("./domain")&.text
           t.xpath("./preferred//name").each do |n|
             ret = n.text
             prefix and ret = "<#{prefix}> #{ret}"
-            (m[ret] and out << ret) or m[ret] = t
+            m[ret] ||= []
+            m[ret] << t
           end
         end
-        preferred_validate_report(out, ret)
+        preferred_validate_report(ret)
       end
 
-      def preferred_validate_report(terms, locations)
-        terms.each do |e|
-          err = "Term #{e} occurs twice as preferred designation"
-          @log.add("Terms", locations[e], err, severity: 1)
+      def preferred_validate_report(terms)
+        terms.each do |k, v|
+          v.size > 1 or next
+          loc = v.map { |x| x["id"] }.join(", ")
+          err = "Term #{k} occurs twice as preferred designation: #{loc}"
+          @log.add("Terms", v.first, err, severity: 1)
         end
       end
     end

spec/metanorma/validate_spec.rb

@@ -1503,8 +1503,10 @@
 
         == Terms and Definitions
 
+        [[a]]
         === Term1
 
+        [[b]]
         === Term1
       INPUT
       expect do
@@ -1513,7 +1515,7 @@
     rescue SystemExit
     end
     expect(File.read("test.err.html"))
-      .to include "Term Term1 occurs twice as preferred designation"
+      .to include "Term Term1 occurs twice as preferred designation: a, b"
 
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.err.html"
@@ -1526,8 +1528,10 @@
 
         == Terms and Definitions
 
+        [[a]]
         === Term1
 
+        [[b]]
         === Term2
 
         preferred:[Term1]
@@ -1538,7 +1542,7 @@
     rescue SystemExit
     end
     expect(File.read("test.err.html"))
-      .to include "Term Term1 occurs twice as preferred designation"
+      .to include "Term Term1 occurs twice as preferred designation: a, b"
   end
 
   it "warns if image is too big for Data URI encoding" do