diff --git a/v1/Application.cfc b/v1/Application.cfc index 4d2b205..2b3fbfd 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -51,7 +51,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="Deck API"; - variables.framework.docs.APIVersion="0.113"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.114"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); diff --git a/v1/resources/instance_operation_run.cfc b/v1/resources/instance_operation_run.cfc index dad2054..4152b97 100644 --- a/v1/resources/instance_operation_run.cfc +++ b/v1/resources/instance_operation_run.cfc @@ -188,7 +188,7 @@ - select so.url + select select so.url_prefix, so.url_suffix, o.operation, svc.version from instance_operation o join instance i on (o.instance_uid=i.instance_uid) left outer join svc_operation so on (i.service_id=so.svc_id AND o.operation=so.operation) @@ -203,16 +203,18 @@ + update instance_operation set dt_submit= ,dt_start=null, dt_finish=null, submit_result='0' + ,url= where instance_operation_uid= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + b.rating_uid::text as rating_uid + b.rating + b.descr + b.url + b.icon_url + b.contragent_id + b.sort + b.is_enabled + + to_char(b.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + to_char(b.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated + + from rating b + /*left outer join contragent k on (b.contragent_id=k.contragent_id)*/ + where 1=1 + AND (b.contragent_id = + OR b.contragent_id=-1)/*общая букмарка*/ + order by b.contragent_id desc, b.sort asc + + limit #maxrows# + + + + + + select count(*) as cnt + from rating b + /*left outer join contragent k on (b.contragent_id=k.contragent_id)*/ + where 1=1 + AND (b.contragent_id = ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into rating ( + rating_uid,contragent_id, rating,url,icon_url,descr,sort,is_enabled,dt_created,creator_id + ) values ( + + , + , + , + , + , + , + , + , + , + ); + + + + + + + + + + + + function plain2htm(s) { + return replace(replace(s, chr(13),'',"ALL"),chr(10),'
', "ALL"); + } + //request.plain2htm = plain2htm; + + function htm2plain(s) { + return replaceNoCase(s, '
', '#chr(13)##chr(10)#', "ALL"); + } + //request.htm2plain = htm2plain; + + function cleanHtm(s) { + return replaceList(s, '<,>,"', '<,>,"'); + } + //request.cleanHtm = cleanHtm; +
+ + + + + + + + + + + + \ No newline at end of file