yaz/commit

UPDATE

authorMichiel Hildebrand
Sun Nov 6 17:39:23 2011 +0100
committerMichiel Hildebrand
Sun Nov 6 17:39:23 2011 +0100
commitb06a4d60e51a9b729ed97b53a9b3c64e73e9f748
tree92bc682d72dcac12b6349aa5338e5024c3af7dc7
parentd4a02bc81d45766098f423558ada1d824076dfa5
Diff style: patch stat
diff --git a/api/edm_export.pl b/api/edm_export.pl
index 44dd40f..fb41ceb 100644
--- a/api/edm_export.pl
+++ b/api/edm_export.pl
@@ -51,7 +51,7 @@ http_yaz_sip_update(Request) :-
 	    sort_by_arg(Annotations0, 2, Annotations)
 	),
 	%Id = '11111',
-	length(Annotations, Count),
+	%length(Annotations, Count),
 	%convert_annotations(Annotations, _XMLString),
 	%submit_mpeg(Id, XMLString),
 	% end TagGarden process
@@ -59,14 +59,19 @@ http_yaz_sip_update(Request) :-
 	->  end_user_process(Process)
 	;   true
 	),
+	http_location_by_id(http_yaz_home, Home),
+	throw(http_reply(moved_temporary(Home))).
+/*
 	reply_html_page(yaz,
 			[ title(['YAZ - SIP update: ', Video])
 			],
 			[ h2('SIP update'),
-			  p(Video),
-			  p([Count, ' annotations are added to the collection'])
+			  %p(Video),
+			  p([Count, ' annotations are added to the collection']),
+			  p([' Go back to ',
+			     a(href(location_by_id(http_yaz_home)), 'your videos')])
 			]).
-
+*/
 
 %%	http_api_annotations(+Request)
 %
diff --git a/applications/yaz_garden.pl b/applications/yaz_garden.pl
index 982f608..2a22514 100644
--- a/applications/yaz_garden.pl
+++ b/applications/yaz_garden.pl
@@ -29,7 +29,7 @@
 
 :- http_handler(yaz(garden), http_yaz_garden, []).
 :- http_handler(yaz(gardenaccept), http_yaz_garden_accept, []).
-:- http_handler(yaz(gardenremove), http_yaz_garden_remove, []).
+:- http_handler(yaz(gardenreset), http_yaz_garden_reset, []).
 :- http_handler(yaz(data/reconcileentries), http_data_reconcile_entries, []).
 
 
@@ -85,7 +85,9 @@ http_yaz_garden_accept(Request) :-
 				      ], Process)
 	),
 	start_user_process(Process),
-	http_link_to_id(http_yaz_garden, [video(Video)], HREF),
+	http_link_to_id(http_yaz_shot, [video(Video)], Garden),
+	throw(http_reply(moved_temporary(Garden))).
+/*
 	reply_html_page(yaz,
 			[ title(['YAZ accept - ', Video])
 			],
@@ -95,18 +97,14 @@ http_yaz_garden_accept(Request) :-
 			       a(href(location_by_id(http_yaz_home)), 'your videos')
 			      ])
 			]).
-
+*/
 
 %%	http_yaz_garden_remove(+Request)
 %
 %	Emit an HTML page to link tags to concepts.
 
-http_yaz_garden_remove(Request) :-
-	http_parameters(Request,
-			[ video(Video,
-				[description('Current video')])
-			]),
-	rdf_transaction(forall(visible_garden_process(Video, Process),
+http_yaz_garden_reset(_Request) :-
+	rdf_transaction(forall(visible_garden_process(Process),
 			       rdf_assert(Process, rdf:type, pprime:'Hidden', Process))),
 	reply_html_page(yaz,
 			[ title(['YAZ accept - ', Video])
@@ -117,8 +115,7 @@ http_yaz_garden_remove(Request) :-
 			      ])
 			]).
 
-visible_garden_process(Video, Process) :-
-	rdf(Process, opmv:used, Video),
+visible_garden_process(Process) :-
 	rdf(Process, rdf:type, pprime:'TagGarden'),
 	\+ rdf(Process, rdf:type, pprime:'Hidden').
 
diff --git a/applications/yaz_player.pl b/applications/yaz_player.pl
index f0d19bc..f04e723 100644
--- a/applications/yaz_player.pl
+++ b/applications/yaz_player.pl
@@ -122,10 +122,10 @@ role_option(associated, associated).
 
 html_page(Video, Annotations, StartTime, Options) :-
 	option(query(Query), Options, ''),
-	option(type(Type), Options, 'filter by type'),
-	findall(option(V, typefilter, N), type_option(V, N), TypeOptions),
-	option(role(Role), Options, 'filter by role'),
-	findall(option(V, rolefilter, N), role_option(V, N), RoleOptions),
+	%option(type(Type), Options, 'filter by type'),
+	%findall(option(V, typefilter, N), type_option(V, N), TypeOptions),
+	%option(role(Role), Options, 'filter by role'),
+	%findall(option(V, rolefilter, N), role_option(V, N), RoleOptions),
 	reply_html_page(yaz,
 			[ title(['YAZ - ', Video])
 			],
@@ -145,10 +145,10 @@ html_page(Video, Annotations, StartTime, Options) :-
 				%\html_facets(Video, Processes, Users, Options)
 			      ]),
 			  div(id(tags),
-			      [ div(select([id(tagtype), name(type), value(Type)],
+			      [ /*div(select([id(tagtype), name(type), value(Type)],
 				       \html_select_options(TypeOptions))),
 				div(select([id(tagrole), name(role), value(Role)],
-				       \html_select_options(RoleOptions))),
+				       \html_select_options(RoleOptions))),*/
 				div(input([id(tagsearch), autocomplete(false), value(Query)])),
 				div(id(tagplayer), [])
 			      ]),
@@ -174,7 +174,7 @@ html_video_status(Video) -->
 	{ active_video(User, Video, _Process, StartTime),
 	  logged_on(User0, false),
 	  user_property(User0, url(User)),
-	  http_link_to_id(http_yaz_garden, [video(Video)], HREF)
+	  http_link_to_id(http_yaz_shot, [video(Video)], HREF)
 	},
 	!,
 	html(div(class(status),
diff --git a/web/css/player.css b/web/css/player.css
index 4f6375c..f1fbe47 100644
--- a/web/css/player.css
+++ b/web/css/player.css
@@ -43,7 +43,7 @@
 }
 #tags input {
 	width: 100%;
-	border-width: 0 0 1px 0;
+	border-width: 1px 1px 0 1px;
 	border-style: solid;
 	border-color: #CCC;
 	padding: 4px 0;