From d6be188a3d57aa511be8456d9fd3dde2c3c137f6 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 8 Nov 2015 17:42:26 +0100 Subject: Rename files --- src/dial.erl | 14 ------------ src/error.erl | 5 ----- src/escape.erl | 63 ---------------------------------------------------- src/event.erl | 8 ------- src/monitor.erl | 15 ------------- src/pbx_conn.erl | 16 ++++++------- src/pbx_dial.erl | 14 ++++++++++++ src/pbx_error.erl | 5 +++++ src/pbx_escape.erl | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pbx_event.erl | 8 +++++++ src/pbx_monitor.erl | 15 +++++++++++++ src/pbx_rose.erl | 16 ++++++------- src/pbx_snapshot.erl | 15 +++++++++++++ src/pbx_status.erl | 17 ++++++++++++++ src/snapshot.erl | 15 ------------- src/status.erl | 17 -------------- 16 files changed, 153 insertions(+), 153 deletions(-) delete mode 100644 src/dial.erl delete mode 100644 src/error.erl delete mode 100644 src/escape.erl delete mode 100644 src/event.erl delete mode 100644 src/monitor.erl create mode 100644 src/pbx_dial.erl create mode 100644 src/pbx_error.erl create mode 100644 src/pbx_escape.erl create mode 100644 src/pbx_event.erl create mode 100644 src/pbx_monitor.erl create mode 100644 src/pbx_snapshot.erl create mode 100644 src/pbx_status.erl delete mode 100644 src/snapshot.erl delete mode 100644 src/status.erl diff --git a/src/dial.erl b/src/dial.erl deleted file mode 100644 index 4fd981e..0000000 --- a/src/dial.erl +++ /dev/null @@ -1,14 +0,0 @@ --module(dial). - --export([decode/1, encode/2]). - --include("CSTA-make-call.hrl"). --include("CSTA-device-identifiers.hrl"). - -decode(Data) -> - 'CSTA-make-call':decode('MakeCallResult', Data). - -encode(From, To) -> - 'CSTA-make-call':encode('MakeCallArgument', #'MakeCallArgument'{ - callingDevice = #'DeviceID'{ deviceIdentifier = From }, - calledDirectoryNumber = #'DeviceID'{ deviceIdentifier = To }}). diff --git a/src/error.erl b/src/error.erl deleted file mode 100644 index 7be31a2..0000000 --- a/src/error.erl +++ /dev/null @@ -1,5 +0,0 @@ --module(error). --export([decode/1]). - -decode(Data) -> - 'CSTA-error-definition':decode('ErrorValue', Data). diff --git a/src/escape.erl b/src/escape.erl deleted file mode 100644 index 72755c9..0000000 --- a/src/escape.erl +++ /dev/null @@ -1,63 +0,0 @@ --module(escape). - --export([decode/1, lines/1]). --export([privateData/1, deviceData/1, deviceBasic/1, - pbxType/0, pbxType/1]). - --include("CSTA-escape-service.hrl"). --include("CSTA-device-identifiers.hrl"). --include("KME-specific-types.hrl"). - -decode(Data) -> - 'CSTA-escape-service':decode('EscapeArgument', Data). - -lines(Device) -> - 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ - privateData = {private, {kmeSystemData, {getSystemData, {request, - {deviceList, {category, {standardDevice, Device}}}}}}}}). - -privateData({ok, #'EscapeArgument'{privateData = Data}}) -> - private(Data). - -private({private, {kmeSystemData, Data}}) -> - List = linked(Data), - %Dev = lists:map(fun device/1, List), - io:format("kmeSystemData ~p~n", [List]). - -linked({systemDataLinkedReply, #'KmeSystemDataLinkedReply'{lastSegment = false, sysData = Data}}) -> - stateEntry(Data); -linked({systemDataLinkedReply, #'KmeSystemDataLinkedReply'{lastSegment = true, sysData = Data}}) -> - stateEntry(Data). - -stateEntry(#'KmeGetSystemDataRsp'{deviceList = List}) when List =/= asn1_NOVALUE -> - lists:filter(fun stateEntryFilter/1, List); -stateEntry(#'KmeGetSystemDataRsp'{pbxType = Type}) when Type =/= asn1_NOVALUE -> - pbxType(Type). - -stateEntryFilter(#'KmeDeviceStateEntry'{status = ins}) -> true; -stateEntryFilter(#'KmeDeviceStateEntry'{status = ous}) -> false. - -device(#'KmeDeviceStateEntry'{device = #'DeviceID'{deviceIdentifier = Device}}) -> Device. - -deviceData(Device) -> - 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ - privateData = {private, {kmeSystemData, {getSystemData, {request, - {deviceData, #'KmeGetSystemDataReq_deviceData'{ - device = #'DeviceID'{deviceIdentifier = Device}, - sysData = {fcoKey, []}}}}}}}}). - -deviceBasic(Device) -> - 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ - privateData = {private, {kmeSystemData, {systemDataChanged, - {deviceBasicInfo, #'DeviceID'{deviceIdentifier = Device}}}}}}). - -pbxType() -> - 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ - privateData = {private, {kmeSystemData, {getSystemData, {request, - {systemData, pbxType}}}}}}). - -pbxType(Type) -> - proplists:get_value(Type, [{0, tda100}, {1, tda200}, {2, tda30}, - {3, tda50}, {5, tda15}, {6, tda600}, - {7, tde100}, {8, tde200}, {9, tde600}, - {10, ncp500}, {11, ncp1000}, {12, ncp3000}]). diff --git a/src/event.erl b/src/event.erl deleted file mode 100644 index 8b275b2..0000000 --- a/src/event.erl +++ /dev/null @@ -1,8 +0,0 @@ --module(event). - --export([decode/1]). - --include("CSTA-event-report-definitions.hrl"). - -decode(Data) -> - 'CSTA-event-report-definitions':decode('CSTAEventReportArgument', Data). diff --git a/src/monitor.erl b/src/monitor.erl deleted file mode 100644 index 5e0da47..0000000 --- a/src/monitor.erl +++ /dev/null @@ -1,15 +0,0 @@ --module(monitor). - --export([decode/1, encode/1]). - --include("CSTA-monitor-start.hrl"). --include("CSTA-device-identifiers.hrl"). - -decode(Data) -> - 'CSTA-monitor-start':decode('MonitorStartResult', Data). - -encode(Device) -> - 'CSTA-monitor-start':encode('MonitorStartArgument', - #'MonitorStartArgument'{ - monitorObject = {deviceObject, #'DeviceID'{ - deviceIdentifier = Device }}}). diff --git a/src/pbx_conn.erl b/src/pbx_conn.erl index 4c570d6..d0ec694 100644 --- a/src/pbx_conn.erl +++ b/src/pbx_conn.erl @@ -51,34 +51,34 @@ code_change(_OldVsn, State, _Extra) -> ext() -> gen_server:cast(?SERVER, pbx_rose:invoke(?ESCAPE, - escape:lines(station))). + pbx_escape:lines(station))). co() -> gen_server:cast(?SERVER, pbx_rose:invoke(?ESCAPE, - escape:lines(networkInterface))). + pbx_escape:lines(networkInterface))). send(Reply) -> gen_server:cast(?SERVER, Reply). snapshot(Device) -> gen_server:cast(?SERVER, pbx_rose:invoke(?SNAPSHOT, - snapshot:encode({dialingNumber, Device}))). + pbx_snapshot:encode({dialingNumber, Device}))). button(Device) -> gen_server:cast(?SERVER, pbx_rose:invoke(?BUTTON, - button:encode({dialingNumber, Device}))). + pbx_button:encode({dialingNumber, Device}))). monitor(Device) -> gen_server:cast(?SERVER, pbx_rose:invoke(?MONITOR, - monitor:encode({dialingNumber, Device}))). + pbx_monitor:encode({dialingNumber, Device}))). dial(From, To) -> gen_server:cast(?SERVER, pbx_rose:invoke(?MAKECALL, - dial:encode({dialingNumber, From}, {dialingNumber, To}))). + pbx_dial:encode({dialingNumber, From}, {dialingNumber, To}))). fco(Device) -> gen_server:cast(?SERVER, pbx_rose:invoke(?ESCAPE, - escape:deviceData({dialingNumber, Device}))). + pbx_escape:deviceData({dialingNumber, Device}))). type() -> - gen_server:cast(?SERVER, pbx_rose:invoke(?ESCAPE, escape:pbxType())). + gen_server:cast(?SERVER, pbx_rose:invoke(?ESCAPE, pbx_escape:pbxType())). diff --git a/src/pbx_dial.erl b/src/pbx_dial.erl new file mode 100644 index 0000000..15eb768 --- /dev/null +++ b/src/pbx_dial.erl @@ -0,0 +1,14 @@ +-module(pbx_dial). + +-export([decode/1, encode/2]). + +-include("CSTA-make-call.hrl"). +-include("CSTA-device-identifiers.hrl"). + +decode(Data) -> + 'CSTA-make-call':decode('MakeCallResult', Data). + +encode(From, To) -> + 'CSTA-make-call':encode('MakeCallArgument', #'MakeCallArgument'{ + callingDevice = #'DeviceID'{ deviceIdentifier = From }, + calledDirectoryNumber = #'DeviceID'{ deviceIdentifier = To }}). diff --git a/src/pbx_error.erl b/src/pbx_error.erl new file mode 100644 index 0000000..ee714cf --- /dev/null +++ b/src/pbx_error.erl @@ -0,0 +1,5 @@ +-module(pbx_error). +-export([decode/1]). + +decode(Data) -> + 'CSTA-error-definition':decode('ErrorValue', Data). diff --git a/src/pbx_escape.erl b/src/pbx_escape.erl new file mode 100644 index 0000000..bc447d4 --- /dev/null +++ b/src/pbx_escape.erl @@ -0,0 +1,63 @@ +-module(pbx_escape). + +-export([decode/1, lines/1]). +-export([privateData/1, deviceData/1, deviceBasic/1, + pbxType/0, pbxType/1]). + +-include("CSTA-escape-service.hrl"). +-include("CSTA-device-identifiers.hrl"). +-include("KME-specific-types.hrl"). + +decode(Data) -> + 'CSTA-escape-service':decode('EscapeArgument', Data). + +lines(Device) -> + 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ + privateData = {private, {kmeSystemData, {getSystemData, {request, + {deviceList, {category, {standardDevice, Device}}}}}}}}). + +privateData({ok, #'EscapeArgument'{privateData = Data}}) -> + private(Data). + +private({private, {kmeSystemData, Data}}) -> + List = linked(Data), + %Dev = lists:map(fun device/1, List), + io:format("kmeSystemData ~p~n", [List]). + +linked({systemDataLinkedReply, #'KmeSystemDataLinkedReply'{lastSegment = false, sysData = Data}}) -> + stateEntry(Data); +linked({systemDataLinkedReply, #'KmeSystemDataLinkedReply'{lastSegment = true, sysData = Data}}) -> + stateEntry(Data). + +stateEntry(#'KmeGetSystemDataRsp'{deviceList = List}) when List =/= asn1_NOVALUE -> + lists:filter(fun stateEntryFilter/1, List); +stateEntry(#'KmeGetSystemDataRsp'{pbxType = Type}) when Type =/= asn1_NOVALUE -> + pbxType(Type). + +stateEntryFilter(#'KmeDeviceStateEntry'{status = ins}) -> true; +stateEntryFilter(#'KmeDeviceStateEntry'{status = ous}) -> false. + +device(#'KmeDeviceStateEntry'{device = #'DeviceID'{deviceIdentifier = Device}}) -> Device. + +deviceData(Device) -> + 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ + privateData = {private, {kmeSystemData, {getSystemData, {request, + {deviceData, #'KmeGetSystemDataReq_deviceData'{ + device = #'DeviceID'{deviceIdentifier = Device}, + sysData = {fcoKey, []}}}}}}}}). + +deviceBasic(Device) -> + 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ + privateData = {private, {kmeSystemData, {systemDataChanged, + {deviceBasicInfo, #'DeviceID'{deviceIdentifier = Device}}}}}}). + +pbxType() -> + 'CSTA-escape-service':encode('EscapeArgument', #'EscapeArgument'{ + privateData = {private, {kmeSystemData, {getSystemData, {request, + {systemData, pbxType}}}}}}). + +pbxType(Type) -> + proplists:get_value(Type, [{0, tda100}, {1, tda200}, {2, tda30}, + {3, tda50}, {5, tda15}, {6, tda600}, + {7, tde100}, {8, tde200}, {9, tde600}, + {10, ncp500}, {11, ncp1000}, {12, ncp3000}]). diff --git a/src/pbx_event.erl b/src/pbx_event.erl new file mode 100644 index 0000000..cb29afd --- /dev/null +++ b/src/pbx_event.erl @@ -0,0 +1,8 @@ +-module(pbx_event). + +-export([decode/1]). + +-include("CSTA-event-report-definitions.hrl"). + +decode(Data) -> + 'CSTA-event-report-definitions':decode('CSTAEventReportArgument', Data). diff --git a/src/pbx_monitor.erl b/src/pbx_monitor.erl new file mode 100644 index 0000000..0554caa --- /dev/null +++ b/src/pbx_monitor.erl @@ -0,0 +1,15 @@ +-module(pbx_monitor). + +-export([decode/1, encode/1]). + +-include("CSTA-monitor-start.hrl"). +-include("CSTA-device-identifiers.hrl"). + +decode(Data) -> + 'CSTA-monitor-start':decode('MonitorStartResult', Data). + +encode(Device) -> + 'CSTA-monitor-start':encode('MonitorStartArgument', + #'MonitorStartArgument'{ + monitorObject = {deviceObject, #'DeviceID'{ + deviceIdentifier = Device }}}). diff --git a/src/pbx_rose.erl b/src/pbx_rose.erl index 3e6f730..298a4a9 100644 --- a/src/pbx_rose.erl +++ b/src/pbx_rose.erl @@ -26,18 +26,18 @@ dispatch({invoke, #'Invoke'{invokeId = Id, opcode = Op, argument = Data}}) -> ?BUTTON -> ok; ?EVENT -> - {ok, Event} = event:decode(Data), + {ok, Event} = pbx_event:decode(Data), io:format("Event: ~p~n", [Event]), ok; ?ESCAPE -> - escape:privateData(escape:decode(Data)); + pbx_escape:privateData(pbx_escape:decode(Data)); ?MONITOR -> ok; ?SNAPSHOT -> ok; ?STATUS -> - %io:format("Status: ~p~n", [status:value(Data)]), - tapi:send(return(Id, Op, status:encode())); + %io:format("Status: ~p~n", [pbx_status:value(Data)]), + tapi:send(return(Id, Op, pbx_status:encode())); _ -> error end; @@ -63,16 +63,16 @@ dispatch({reject, #'Reject'{invokeId = Id, problem = Problem}}) -> dispatch(#'ReturnResult_result'{opcode = Op, result = Data}) -> case Op of ?MAKECALL -> - {ok, Result} = dial:decode(Data), + {ok, Result} = pbx_dial:decode(Data), io:format("Make call: ~p~n", [Result]); ?BUTTON -> - {ok, List} = button:decode(Data), + {ok, List} = pbx_button:decode(Data), io:format("List: ~p~n", [List]); ?MONITOR -> - {ok, Status} = monitor:decode(Data), + {ok, Status} = pbx_monitor:decode(Data), io:format("Result: ~p~n", [Status]); ?SNAPSHOT -> - {ok, Status} = snapshot:decode(Data), + {ok, Status} = pbx_snapshot:decode(Data), io:format("Result: ~p~n", [Status]); _ -> io:format("Result: ~p~n", [Data]) diff --git a/src/pbx_snapshot.erl b/src/pbx_snapshot.erl new file mode 100644 index 0000000..1d4a278 --- /dev/null +++ b/src/pbx_snapshot.erl @@ -0,0 +1,15 @@ +-module(pbx_snapshot). + +-export([decode/1, encode/1]). + +-include("CSTA-snapshot-device.hrl"). +-include("CSTA-device-identifiers.hrl"). + +decode(Data) -> + 'CSTA-snapshot-device':decode('SnapshotDeviceResult', Data). + +encode(Device) -> + 'CSTA-snapshot-device':encode('SnapshotDeviceArgument', + #'SnapshotDeviceArgument'{ + snapshotObject = #'DeviceID'{ + deviceIdentifier = Device }}). diff --git a/src/pbx_status.erl b/src/pbx_status.erl new file mode 100644 index 0000000..af7b8c5 --- /dev/null +++ b/src/pbx_status.erl @@ -0,0 +1,17 @@ +-module(pbx_status). + +-export([decode/1, encode/0, value/1]). + +-include("CSTA-system-status.hrl"). + +decode(Data) -> + 'CSTA-system-status':decode('SystemStatusArg', Data). + +encode() -> + 'CSTA-system-status':encode('SystemStatusRes', {noData, []}). + +value({ok, #'SystemStatusArg'{systemStatus = Status}}) -> + Status; + +value(Data) -> + value(decode(Data)). diff --git a/src/snapshot.erl b/src/snapshot.erl deleted file mode 100644 index 6eb5464..0000000 --- a/src/snapshot.erl +++ /dev/null @@ -1,15 +0,0 @@ --module(snapshot). - --export([decode/1, encode/1]). - --include("CSTA-snapshot-device.hrl"). --include("CSTA-device-identifiers.hrl"). - -decode(Data) -> - 'CSTA-snapshot-device':decode('SnapshotDeviceResult', Data). - -encode(Device) -> - 'CSTA-snapshot-device':encode('SnapshotDeviceArgument', - #'SnapshotDeviceArgument'{ - snapshotObject = #'DeviceID'{ - deviceIdentifier = Device }}). diff --git a/src/status.erl b/src/status.erl deleted file mode 100644 index 3c419a3..0000000 --- a/src/status.erl +++ /dev/null @@ -1,17 +0,0 @@ --module(status). - --export([decode/1, encode/0, value/1]). - --include("CSTA-system-status.hrl"). - -decode(Data) -> - 'CSTA-system-status':decode('SystemStatusArg', Data). - -encode() -> - 'CSTA-system-status':encode('SystemStatusRes', {noData, []}). - -value({ok, #'SystemStatusArg'{systemStatus = Status}}) -> - Status; - -value(Data) -> - value(decode(Data)). -- cgit v1.2.3