yaz/commit

fix borken dependencies on tag_edit

authorMichiel Hildebrand
Fri Jan 27 11:07:59 2012 +0100
committerMichiel Hildebrand
Fri Jan 27 11:07:59 2012 +0100
commit0a4605fa1957925231f5ef70b6abec433f58bbc1
treefc4cbeb92e3b74b91afbcf6ccd06ffefc4627482
parent735fd3923da36444583df4f2006e6eb669ebf914
Diff style: patch stat
diff --git a/applications/yaz_player.pl b/applications/yaz_player.pl
index c8af2bd..faada30 100644
--- a/applications/yaz_player.pl
+++ b/applications/yaz_player.pl
@@ -21,7 +21,7 @@
 :- use_module(library(yui3)).
 :- use_module(library(video_annotation)).
 
-:- use_module(applications(yaz_tag)).
+:- use_module(applications(yaz_tag_edit)).
 :- use_module(components(label)).
 :- use_module(components(yaz_page)).
 :- use_module(components(yaz_video_item)).
diff --git a/applications/yaz_shot_annotation.pl b/applications/yaz_shot_annotation.pl
index 47b0bd8..1759283 100644
--- a/applications/yaz_shot_annotation.pl
+++ b/applications/yaz_shot_annotation.pl
@@ -23,7 +23,7 @@
 :- use_module(library(yui3)).
 :- use_module(library(video_annotation)).
 
-:- use_module(applications(yaz_tag)).
+:- use_module(applications(yaz_tag_edit)).
 :- use_module(components(label)).
 :- use_module(components(yaz_page)).
 :- use_module(components(yaz_video_item)).
diff --git a/applications/yaz_tag.pl b/applications/yaz_tag.pl
index 5b68024..7aeee9c 100644
--- a/applications/yaz_tag.pl
+++ b/applications/yaz_tag.pl
@@ -45,7 +45,7 @@ http_yaz_tag(Request) :-
 			]),
 	confirmed_annotations(Concept, Annotations),
 	sort(TagList0, TagList),
-	related_tags(TagList, RelatedTags),
+	related_tags([Concept], RelatedTags),
 	tag_entries(TagList, TagEntries),
 	html_tag_page(Concept, TagList, RelatedTags, Annotations, TagEntries).
 
@@ -175,7 +175,7 @@ is_tag_label(S,_P,_Lit) :-
 
 html_tag_page(Concept, TagList, RelatedTags, Annotations, TagEntries) :-
 	maplist(tag_term, TagList, TagTerms),
-	http_link_to_id(http_yaz_tag, TagTerms, Link),
+	http_link_to_id(http_yaz_tag, [concept(Concept)|TagTerms], Link),
 	reply_html_page([title(['YAZ -- ',Concept])],
 			[\html_requires(css('yaz.css')),
 			 \html_requires(css('tag_garden.css')),
@@ -187,7 +187,7 @@ html_tag_page(Concept, TagList, RelatedTags, Annotations, TagEntries) :-
 				       [ h3(class(hd), 'User tags'),
 					 div(id(active),
 					     ul(class(taglist),
-						\html_tags(TagList, TagTerms))
+						\html_tags(TagList, Concept, TagTerms))
 					    ),
 					 div(id(related),
 					     [ ul(class(taglist),
@@ -238,16 +238,16 @@ html_concept_search -->
 
 
 
-html_tags([], _) --> !.
-html_tags([Tag|T], TagTerms) -->
+html_tags([], _,_) --> !.
+html_tags([Tag|T], Concept, TagTerms) -->
 	{  select(tag(Tag), TagTerms, Rest),
-	   http_link_to_id(http_yaz_tag, Rest, Link)
+	   http_link_to_id(http_yaz_tag, [concept(Concept)|Rest], Link)
 	},
 	html(li(class(current),
 		[a([class(tag)], Tag),
 		 a([class(remove), href(Link)], 'x')
 		])),
-	html_tags(T, TagTerms).
+	html_tags(T, Concept, TagTerms).
 
 
 html_related_tags([], _) --> !.