vumix/commit

work around changes in annotation_api

authorJacco van Ossenbruggen
Fri Jun 15 10:17:43 2012 +0200
committerJacco van Ossenbruggen
Fri Jun 15 10:17:43 2012 +0200
commitea873eac91c0f6d65e02f063bf9bfe9e00ff91de
tree5885898e4b5fee947a22090790b7f111c1962e3b
parent970607f9bdb79b36009029eddd8153a284b7b2e9
Diff style: patch stat
diff --git a/applications/p1.pl b/applications/p1.pl
index 46e7adc..b67d59b 100644
--- a/applications/p1.pl
+++ b/applications/p1.pl
@@ -266,7 +266,7 @@ js_video_frames(Target) -->
 js_title_edit(Target) -->
 	{ http_location_by_id(http_update_annotation, Update),
 	  rdf_equal(dcterms:title, Field),
-	  (   annotation_in_field(Target, Field, Annotation, _Body, Text)
+	  (   annotation_api:annotation_in_field(Target, Field, Annotation, _Body, Text, _Comment, _User)
 	  ->  true
 	  ;   Annotation = @null,
 	      Text = @null
@@ -311,7 +311,7 @@ js_annotation_field(FieldURI, Target) -->
 	  rdf_global_id(_:Id, FieldURI),
 	  setting(min_query_length, MinQueryLength),
 	  rdf(FieldURI, an:source, literal(Source)),
-	  json_annotation_list(Target, FieldURI, Tags)
+	  annotation_api:json_annotation_list(Target, FieldURI, Tags)
 	},
 	yui3_plug(one(id(Id)),
 		  'Y.Plugin.Annotation',
diff --git a/applications/vumix.pl b/applications/vumix.pl
index 773abac..3aa4b0d 100644
--- a/applications/vumix.pl
+++ b/applications/vumix.pl
@@ -289,7 +289,8 @@ js_video_frames(Target) -->
 js_title_edit(Target) -->
 	{ http_location_by_id(http_update_annotation, Update),
 	  rdf_equal(dcterms:title, Field),
-	  (   annotation_in_field(Target, Field, Annotation, _Body, Text)
+	  (   % fixme: should use http api instead
+	      annotation_api:annotation_in_field(Target, Field, Annotation, _Body, Text, _Comment, _User)
 	  ->  true
 	  ;   Annotation = @null,
 	      Text = @null
@@ -335,7 +336,8 @@ js_annotation_field(FieldURI, Target) -->
 	  rdf_global_id(_:Id, FieldURI),
 	  setting(min_query_length, MinQueryLength),
 	  rdf(FieldURI, an:source, literal(Source)),
-	  json_annotation_list(Target, FieldURI, Tags)
+	  % fixme: use http api instead
+	  annotation_api:json_annotation_list(Target, FieldURI, Tags)
 	},
 	yui3_plug(one(id(Id)),
 		  'Y.Plugin.Annotation',
diff --git a/applications/vumix_p0.pl b/applications/vumix_p0.pl
index 0d5a7e7..5b2d5c0 100644
--- a/applications/vumix_p0.pl
+++ b/applications/vumix_p0.pl
@@ -96,7 +96,14 @@ save_annotations([Field-Values|Ts], Target, User, Graph) :-
 rdf_field_annotations([], _, _, _, _).
 rdf_field_annotations([Value|Vs], Field, Graph, User, Target) :-
 	rdf_label(Value, Label),
-	rdf_add_annotation(Graph, User, Target, Field, Value, Label, _),
+	annotation_api:rdf_add_annotation(
+			   [graph(Graph),
+			    user(User),
+			    target(Target),
+			    field(Field),
+			    body(Value),
+			    label(Label)
+			   ], _,_),
 	rdf_field_annotations(Vs, Field, Graph, User, Target).
 
 
@@ -417,7 +424,7 @@ js_video_frames(Target) -->
 js_title_edit(Target) -->
 	{ http_location_by_id(http_update_annotation, Update),
 	  rdf_equal(dcterms:title, Field),
-	  (   annotation_in_field(Target, Field, Annotation, _Body, Text)
+	  (   annotation_api:annotation_in_field(Target, Field, Annotation, _Body, Text, _C, _U)
 	  ->  true
 	  ;   Annotation = @null,
 	      Text = @null
@@ -463,7 +470,7 @@ js_annotation_field(FieldURI, Target) -->
 	  rdf_global_id(_:Id, FieldURI),
 	  setting(min_query_length, MinQueryLength),
 	  rdf(FieldURI, an:source, literal(Source)),
-	  json_annotation_list(Target, FieldURI, Tags)
+	  annotation_api:json_annotation_list(Target, FieldURI, Tags)
 	},
 	yui3_plug(one(id(Id)),
 		  'Y.Plugin.Annotation',