image_annotation/commit
Revert "ADDED: support to get annotation fields dynamically from the existing annotations, so we can show the basics without needing to know the full UI or task definition"
author | Chris Dijkshoorn |
---|---|
Fri Mar 13 11:48:51 2015 +0000 | |
committer | Chris Dijkshoorn |
Fri Mar 13 11:48:51 2015 +0000 | |
commit | 88aa4651100a2fad9895506c85c9baf50d9d7871 |
tree | 705e4789497def89ba5209ab38c8a8fa620da3eb |
parent | 58cd8ae2877b85761b3679eb373a3a9f61104e23 |
Diff style: patch stat
diff --git a/applications/annotation.pl b/applications/annotation.pl index b94805b..5147f56 100644 --- a/applications/annotation.pl +++ b/applications/annotation.pl @@ -32,7 +32,6 @@ :- use_module(user(preferences)). % other cpacks: :- use_module(library(yui3_beta)). -:- use_module(library(oa_annotation)). :- use_module(api(annotation)). % needed for http api handlers :- use_module(api(media_caching)). % needed for http api handlers @@ -310,8 +309,7 @@ annotation_page_target(Target, Options) --> html_resource(URI, Options) --> { \+ no_object_image(URI), - setting(default_metadata, D), - option(metadata_fields(Fields), Options, D),! + option(metadata_fields(Fields), Options, []),! }, html(div(class('resource'), [ \html_metadata_fields(URI, Fields, Options)])). @@ -405,11 +403,6 @@ field_id(FieldURI, TargetURI, Id) :- % % Write html for annotation fields. -html_annotation_fields(dynamic, Options) --> - { get_dynamic_fields(Fields, Options) - }, - html_annotation_fields(Fields, Options). - html_annotation_fields([URI|T], Options) --> { option(target(Target), Options), \+ no_object_image(Target) ,! }, @@ -480,7 +473,7 @@ js_module('annotation', json([fullpath(Path), http_absolute_location(js('annotation.js'), Path, []). ui_labels(Field, Options, Labels) :- - option(ui(UI), Options, none), + option(ui(UI), Options), findall(P, rdf_has(UI, ann_ui:uiLabel, _, P), UILP), findall(P, rdf_has(Field, ann_ui:uiLabel, _, P), FILP), append(UILP, FILP, LP), @@ -496,7 +489,6 @@ get_label(UI, Field, LabelProp, LabelOption) :- rdf_global_id(_NS:LabelName, LabelProp), LabelOption =.. [LabelName, LabelText]. -fragments_enabled(_Options) :- true. fragments_enabled(Options) :- setting(enableFragments, Default), option(ui(UI), Options), @@ -547,13 +539,6 @@ js_annotation_fields([Target|Tail], Fields, Options) --> }, js_annotation_fields(Fields, TargetOptions), js_annotation_fields(Tail, Fields, Options). - - -js_annotation_fields(dynamic, Options) --> - { get_dynamic_fields(Fields, Options) - }, - js_annotation_fields(Fields, Options). - js_annotation_fields([Field], Options) --> js_annotation_field(Field, Options). js_annotation_fields([Field, NextField | FieldT], Options) --> @@ -563,7 +548,7 @@ js_annotation_fields([Field, NextField | FieldT], Options) --> js_annotation_field(FieldURI, Options) --> { option(target(Target), Options), - option(ui(UI), Options, none), + option(ui(UI), Options), option(user(User), Options, DefaultUser), option(next(NextURI), Options, null), option(image_id(ImageId), Options, null), @@ -685,9 +670,3 @@ user_url(User) :- -> user_property(U, url(User)) ; rdf_global_id(user:anonymous, User) ). - -get_dynamic_fields(Fields, Options) :- - option(target(T), Options), - option(user(A), Options), - findall(F, rdf_get_annotation_by_tfa(T,F,A, _Graph, _Annotation), Fields). -