From 70a45f8de755a3d92b79290bc9e358ca4a37d69a Mon Sep 17 00:00:00 2001
From: Schrolli <bastian@dieschrollis.de>
Date: Mon, 18 May 2015 15:23:47 +0200
Subject: [PATCH] argument list to dict

---
 plugin_test/boswatch.log                 | 89 ++----------------------
 plugin_test/plugin_test.py               |  2 +-
 plugin_test/plugins/interface.txt        | 18 ++---
 plugin_test/plugins/template/__init__.py |  2 +-
 4 files changed, 16 insertions(+), 95 deletions(-)

diff --git a/plugin_test/boswatch.log b/plugin_test/boswatch.log
index 300ec2f..26ae022 100644
--- a/plugin_test/boswatch.log
+++ b/plugin_test/boswatch.log
@@ -1,99 +1,20 @@
-18.05.2015 12:27:39 - INFO: Alarm!
-18.05.2015 12:27:39 - DEBUG: Loading plugin template
-18.05.2015 12:27:39 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:39 - DEBUG: try 5/0
-18.05.2015 12:27:39 - ERROR: Error in Template Plugin
 Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
+  File "./plugins\template\__init__.py", line 8, in run
     test = 5/0
 ZeroDivisionError: division by zero
-18.05.2015 12:27:40 - INFO: Alarm!
-18.05.2015 12:27:40 - DEBUG: Loading plugin template
-18.05.2015 12:27:40 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:40 - DEBUG: try 5/0
-18.05.2015 12:27:40 - ERROR: Error in Template Plugin
 Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
+  File "./plugins\template\__init__.py", line 8, in run
     test = 5/0
 ZeroDivisionError: division by zero
-18.05.2015 12:27:41 - INFO: Alarm!
-18.05.2015 12:27:41 - DEBUG: Loading plugin template
-18.05.2015 12:27:41 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:41 - DEBUG: try 5/0
-18.05.2015 12:27:41 - ERROR: Error in Template Plugin
 Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
+  File "./plugins\template\__init__.py", line 8, in run
     test = 5/0
 ZeroDivisionError: division by zero
-18.05.2015 12:27:42 - INFO: Alarm!
-18.05.2015 12:27:42 - DEBUG: Loading plugin template
-18.05.2015 12:27:42 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:42 - DEBUG: try 5/0
-18.05.2015 12:27:42 - ERROR: Error in Template Plugin
 Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
+  File "./plugins\template\__init__.py", line 8, in run
     test = 5/0
 ZeroDivisionError: division by zero
-18.05.2015 12:27:43 - INFO: Alarm!
-18.05.2015 12:27:43 - DEBUG: Loading plugin template
-18.05.2015 12:27:43 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:43 - DEBUG: try 5/0
-18.05.2015 12:27:43 - ERROR: Error in Template Plugin
 Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
-    test = 5/0
-ZeroDivisionError: division by zero
-18.05.2015 12:27:44 - INFO: Alarm!
-18.05.2015 12:27:44 - DEBUG: Loading plugin template
-18.05.2015 12:27:44 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:44 - DEBUG: try 5/0
-18.05.2015 12:27:44 - ERROR: Error in Template Plugin
-Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
-    test = 5/0
-ZeroDivisionError: division by zero
-18.05.2015 12:27:45 - INFO: Alarm!
-18.05.2015 12:27:45 - DEBUG: Loading plugin template
-18.05.2015 12:27:45 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:45 - DEBUG: try 5/0
-18.05.2015 12:27:45 - ERROR: Error in Template Plugin
-Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
-    test = 5/0
-ZeroDivisionError: division by zero
-18.05.2015 12:27:46 - INFO: Alarm!
-18.05.2015 12:27:46 - DEBUG: Loading plugin template
-18.05.2015 12:27:46 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:46 - DEBUG: try 5/0
-18.05.2015 12:27:46 - ERROR: Error in Template Plugin
-Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
-    test = 5/0
-ZeroDivisionError: division by zero
-18.05.2015 12:27:47 - INFO: Alarm!
-18.05.2015 12:27:47 - DEBUG: Loading plugin template
-18.05.2015 12:27:47 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:47 - DEBUG: try 5/0
-18.05.2015 12:27:47 - ERROR: Error in Template Plugin
-Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
-    test = 5/0
-ZeroDivisionError: division by zero
-18.05.2015 12:27:48 - INFO: Alarm!
-18.05.2015 12:27:48 - DEBUG: Loading plugin template
-18.05.2015 12:27:48 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:48 - DEBUG: try 5/0
-18.05.2015 12:27:48 - ERROR: Error in Template Plugin
-Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
-    test = 5/0
-ZeroDivisionError: division by zero
-18.05.2015 12:27:49 - INFO: Alarm!
-18.05.2015 12:27:49 - DEBUG: Loading plugin template
-18.05.2015 12:27:49 - DEBUG: Throw Template Plugin
-18.05.2015 12:27:49 - DEBUG: try 5/0
-18.05.2015 12:27:49 - ERROR: Error in Template Plugin
-Traceback (most recent call last):
-  File "./plugins\template\__init__.py", line 7, in run
+  File "./plugins\template\__init__.py", line 8, in run
     test = 5/0
 ZeroDivisionError: division by zero
diff --git a/plugin_test/plugin_test.py b/plugin_test/plugin_test.py
index 9f2ade4..b736181 100644
--- a/plugin_test/plugin_test.py
+++ b/plugin_test/plugin_test.py
@@ -35,7 +35,7 @@ logger.addHandler(ch)
 #critical - critical error, program exit
 
 
-data = ["12345"]
+data = { "zvei":"12345"}
 
 while True:
     time.sleep(1)
diff --git a/plugin_test/plugins/interface.txt b/plugin_test/plugins/interface.txt
index be2f518..cad7b75 100644
--- a/plugin_test/plugins/interface.txt
+++ b/plugin_test/plugins/interface.txt
@@ -2,18 +2,18 @@
 
 Typ		=	FMS, ZVEI oder POC
 Frequenz	=	Frequenz in Hz
-daten[] als Python List
+daten[] als Python Dictionary
 
 ZVEI:
-- ZVEI code
+- zvei
 
 FMS:
-- FMS Kennung
-- Status
-- Richtung
-- TKI
+- fms
+- status
+- direction
+- tki
 
 POCSAG:
-- RIC
-- Sub RIC
-- Text
+- ric
+- sub_ric
+- text
diff --git a/plugin_test/plugins/template/__init__.py b/plugin_test/plugins/template/__init__.py
index 994ebcf..36938b1 100644
--- a/plugin_test/plugins/template/__init__.py
+++ b/plugin_test/plugins/template/__init__.py
@@ -3,7 +3,7 @@ import logging
 def run(typ,freq,data):
     logging.debug("Throw Template Plugin")
     try:
-        logging.info("ZVEI: %s wurde auf %s empfangen!", data[0],freq)
+        logging.info("ZVEI: %s wurde auf %s empfangen!", data["zvei"],freq)
         logging.debug("try 5/0")
         test = 5/0
     except: