amalgame/commit

IMPROVED: make amalgame:label the default label property

diff --git a/lib/ag_modules/compound_label_generator.pl b/lib/ag_modules/compound_label_generator.pl
index f6dc963..b87e11d 100644
--- a/lib/ag_modules/compound_label_generator.pl
+++ b/lib/ag_modules/compound_label_generator.pl
@@ -14,11 +14,11 @@ amalgame_module(amalgame:'CompoundMatcher').
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(source_language, oneof(['any'|L]), 'any', 'Language of source label') :-
 	amalgame_vocabulary_languages(L).
diff --git a/lib/ag_modules/compound_label_match.pl b/lib/ag_modules/compound_label_match.pl
index 8fd6d6f..692a2e4 100644
--- a/lib/ag_modules/compound_label_match.pl
+++ b/lib/ag_modules/compound_label_match.pl
@@ -19,7 +19,7 @@
 %	  matching T.
 compound_label_match(align(Source, Target, Prov0),
 		  align(Source, Target, [Prov|Prov0]), Options) :-
-	rdf_equal(rdfs:label, RdfsLabel),
+	rdf_equal(amalgame:label, RdfsLabel),
 	option(sourcelabel(MatchPropS), Options, RdfsLabel),
 	option(targetlabel(MatchPropT), Options, RdfsLabel),
 	option(matchacross_lang(MatchAcross), Options, true),
diff --git a/lib/ag_modules/compound_label_selecter.pl b/lib/ag_modules/compound_label_selecter.pl
index 4ce4430..c9dc8b1 100644
--- a/lib/ag_modules/compound_label_selecter.pl
+++ b/lib/ag_modules/compound_label_selecter.pl
@@ -18,11 +18,11 @@ parameter(type,
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(source_language, oneof(['any'|L]), 'any',
 	  'Language of source label') :-
diff --git a/lib/ag_modules/exact_label_generator.pl b/lib/ag_modules/exact_label_generator.pl
index 9f28700..4e38884 100644
--- a/lib/ag_modules/exact_label_generator.pl
+++ b/lib/ag_modules/exact_label_generator.pl
@@ -15,11 +15,11 @@ amalgame_module(amalgame:'ExactLabelMatcher').
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(source_language, oneof(['any'|L]), 'any',
 	  'Language of source label') :-
diff --git a/lib/ag_modules/exact_label_match.pl b/lib/ag_modules/exact_label_match.pl
index 7de0888..f554939 100644
--- a/lib/ag_modules/exact_label_match.pl
+++ b/lib/ag_modules/exact_label_match.pl
@@ -17,7 +17,7 @@
 %	matching T.
 exact_label_match(align(Source, Target, Prov0),
 		  align(Source, Target, [Prov|Prov0]), Options) :-
-	rdf_equal(rdfs:label, RdfsLabel),
+	rdf_equal(amalgame:label, RdfsLabel),
 	option(sourcelabel(MatchPropS), Options, RdfsLabel),
 	option(targetlabel(MatchPropT), Options, RdfsLabel),
 	option(matchacross_lang(MatchAcross), Options, true),
diff --git a/lib/ag_modules/exact_label_selecter.pl b/lib/ag_modules/exact_label_selecter.pl
index aec4c51..85a42af 100644
--- a/lib/ag_modules/exact_label_selecter.pl
+++ b/lib/ag_modules/exact_label_selecter.pl
@@ -17,11 +17,11 @@ parameter(type,
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(source_language, oneof(['any'|L]), 'any',
 	  'Language of source label') :-
diff --git a/lib/ag_modules/isub_generator.pl b/lib/ag_modules/isub_generator.pl
index c219d80..da37e00 100644
--- a/lib/ag_modules/isub_generator.pl
+++ b/lib/ag_modules/isub_generator.pl
@@ -15,11 +15,11 @@ amalgame_module(amalgame:'IsubMatcher').
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(threshold, float, 0.7,
 	  'threshold edit distance').
diff --git a/lib/ag_modules/isub_selecter.pl b/lib/ag_modules/isub_selecter.pl
index e841063..626072a 100644
--- a/lib/ag_modules/isub_selecter.pl
+++ b/lib/ag_modules/isub_selecter.pl
@@ -19,11 +19,11 @@ parameter(type,
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(threshold, float, 0.7,
 	  'threshold edit distance').
diff --git a/lib/ag_modules/numeric_difference_generator.pl b/lib/ag_modules/numeric_difference_generator.pl
index 316e541..a8358a5 100644
--- a/lib/ag_modules/numeric_difference_generator.pl
+++ b/lib/ag_modules/numeric_difference_generator.pl
@@ -16,11 +16,11 @@ amalgame_module(amalgame:'NumericDifferenceMatcher').
 
 parameter(sourcelabel, oneof(LiteralProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	rdf_literal_predicates(LiteralProps).
 parameter(targetlabel, oneof(LiteralProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	rdf_literal_predicates(LiteralProps).
 
 parameter(threshold, float, 0.05,
diff --git a/lib/ag_modules/numeric_difference_selecter.pl b/lib/ag_modules/numeric_difference_selecter.pl
index d056205..625a681 100644
--- a/lib/ag_modules/numeric_difference_selecter.pl
+++ b/lib/ag_modules/numeric_difference_selecter.pl
@@ -20,12 +20,12 @@ parameter(threshold, float, 0.05,
 
 parameter(sourcelabel, oneof(LiteralProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	rdf_literal_predicates(LiteralProps).
 
 parameter(targetlabel, oneof(LiteralProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	rdf_literal_predicates(LiteralProps).
 
 amalgame_module(amalgame:'NumericDifferenceSelecter').
diff --git a/lib/ag_modules/snowball_label_generator.pl b/lib/ag_modules/snowball_label_generator.pl
index eb2b5bd..dfe9f34 100644
--- a/lib/ag_modules/snowball_label_generator.pl
+++ b/lib/ag_modules/snowball_label_generator.pl
@@ -16,11 +16,11 @@ amalgame_module(amalgame:'SnowballMatcher').
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(source_language, oneof(['any'|L]), 'any', 'Language of source label') :-
 	amalgame_vocabulary_languages(L).
diff --git a/lib/ag_modules/snowball_label_match.pl b/lib/ag_modules/snowball_label_match.pl
index dc9a503..d532369 100644
--- a/lib/ag_modules/snowball_label_match.pl
+++ b/lib/ag_modules/snowball_label_match.pl
@@ -11,7 +11,7 @@
 
 snowball_label_match(align(Source, Target, Prov0),
 		     align(Source, Target, [Prov|Prov0]), Options) :-
-	rdf_equal(rdfs:label,DefaultP),
+	rdf_equal(amalgame:label,DefaultP),
 	option(snowball_language(Snowball_Language), Options, english),
 	option(prefix(PrefixLength), Options, 4),
 	option(sourcelabel(MatchProp1), Options, DefaultP),
diff --git a/lib/ag_modules/snowball_label_selecter.pl b/lib/ag_modules/snowball_label_selecter.pl
index 31cd261..670b7bb 100644
--- a/lib/ag_modules/snowball_label_selecter.pl
+++ b/lib/ag_modules/snowball_label_selecter.pl
@@ -20,11 +20,11 @@ parameter(type,
 
 parameter(sourcelabel, oneof(LabelProps), Default,
 	  '(Super)Property to get label of the source by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(targetlabel, oneof(LabelProps), Default,
 	  '(Super)Property to get the label of the target by') :-
-	rdf_equal(Default, rdfs:label),
+	rdf_equal(Default, amalgame:label),
 	label_list(LabelProps).
 parameter(source_language, oneof(['any'|L]), 'any', 'Language of source label') :-
 	amalgame_vocabulary_languages(L).
diff --git a/lib/ag_modules/string_match_util.pl b/lib/ag_modules/string_match_util.pl
index 707f421..c7024ac 100644
--- a/lib/ag_modules/string_match_util.pl
+++ b/lib/ag_modules/string_match_util.pl
@@ -14,6 +14,7 @@
 label_list(LabelProps) :-
 	findall(LP,
 		(   label_property(LP)
+		;   rdf_equal(LP, amalgame:label)
 		;   rdfs_subproperty_of(LP, skos:note)
 		;   rdfs_subproperty_of(LP, skos:notation)
 		;   rdfs_subproperty_of(LP, rdfs:label)