Restructuring and special-casing in dc:type

Remove possibility of outputting empty typeOfResource element. Test one
case with matching substring rather than exact match.