yaz/commit

show MPEG-7

authorMichiel Hildebrand
Tue Nov 15 20:55:39 2011 +0100
committerMichiel Hildebrand
Tue Nov 15 20:55:39 2011 +0100
commit20623488be11bb52245b642a41c3a283332bc7ae
tree2f34cf20bfa90d90b5410c8fb08ecf7253e0680d
parent365895bce0f98e654221e0fcba6e1a5bdefe58b1
Diff style: patch stat
diff --git a/api/edm_export.pl b/api/edm_export.pl
index e152e8e..f1d925f 100644
--- a/api/edm_export.pl
+++ b/api/edm_export.pl
@@ -81,7 +81,7 @@ http_yaz_sip_update(Request) :-
 	debug(edm_convert, 'convert ~w', DocURL),
 	atom_concat(DocURL, '/startConversion', ConvertURL),
 	http_get(ConvertURL, _, []),
-	%get_result(DocURL, MPEG),
+	get_result(DocURL, MPEG),
 	reply_html_page(yaz,
 			[ title(['YAZ - SIP update: ', Id])
 			],
@@ -101,11 +101,11 @@ http_yaz_sip_update(Request) :-
 					   style('padding:0 20px')
 					  ],
 					  [ input([type(hidden), name(id), value(Id)], []),
+					    textarea([id(mpeg),name(file),style('width:100%;height:400px')], MPEG),
 					    a(href(DocURL), 'check conversion'),
-					    '::',
+					    ' :: ',
 					    a(href(DocURL+'/result'), 'fetch conversion'),
 					    p(input([type(file), name(file)])),
-					    %textarea([id(mpeg),name(file),style('width:100%;height:400px')], MPEG),
 					    p(input([type(submit), value('Submit')]))
 					  ])
 				    ])
@@ -226,7 +226,7 @@ annotations_to_edm([A|As], Video, Source, Proxy, Triples) :-
 	prefix_url(Fragment, 'proxy/', FragmentProxy),
 	%rdf_bnode(FragmentProxy),
 	prefix_url(Fragment, 'aggregation/', Aggregation),
-	Duration is End-Start,
+	Duration is EndTime-StartTime,
 	rdf_global_term([ rdf(Proxy, ma:hasFragment, FragmentProxy),
 			  rdf(Aggregation, rdf:type, ore:'Aggregation'),
 			  rdf(Aggregation, ens:hasView, FragmentSource),