1.3rc1

hobbyquaker · hobbyquaker · commit 33d67ea9ae63 · 2012-11-02T13:53:29.000+01:00
diff --git a/hq-xmlapi-1.3rc1.img b/hq-xmlapi-1.3rc1.img
diff --git a/hq-xmlapi.img b/hq-xmlapi.img
diff --git a/xmlapi/devicelist.cgi b/xmlapi/devicelist.cgi
@@ -1,10 +1,9 @@
 #!/bin/tclsh
 load tclrega.so
-puts  {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
-}
-puts -nonewline {<?xml version="1.0" encoding="ISO-8859-1" ?>}
-puts -nonewline {<deviceList>}
+
+<?xml version="1.0" encoding="ISO-8859-1" ?><deviceList>}
   
 
   array set res [rega_script {
diff --git a/xmlapi/favoritelist.cgi b/xmlapi/favoritelist.cgi
@@ -1,18 +1,9 @@
 #!/bin/tclsh
-
 load tclrega.so
-source once.tcl
-sourceOnce cgi.tcl
-
-
-cgi_eval {
+puts -nonewline {Content-Type: text/xml
+Access-Control-Allow-Origin: *
 
-#  cgi_input
-
-  cgi_content_type "text/xml"
-  cgi_http_head
-  puts -nonewline {<?xml version="1.0" encoding="ISO-8859-1" ?>}
-  puts -nonewline {<favoriteList>}
+<?xml version="1.0" encoding="ISO-8859-1" ?><favoriteList>}
 
 array set res [rega_script {
 
@@ -56,6 +47,6 @@ array set res [rega_script {
     }
 
 }]
-  puts -nonewline $res(STDOUT)
-  puts -nonewline {</favoriteList>}
-}
+puts -nonewline $res(STDOUT)
+puts -nonewline {</favoriteList>}
+
diff --git a/xmlapi/functionlist.cgi b/xmlapi/functionlist.cgi
@@ -1,18 +1,9 @@
 #!/bin/tclsh
-
 load tclrega.so
-source once.tcl
-sourceOnce cgi.tcl
-
-
-cgi_eval {
+puts -nonewline {Content-Type: text/xml
+Access-Control-Allow-Origin: *
 
-  cgi_input                    
-  cgi_content_type "text/xml"     
-  cgi_http_head
-
-  puts -nonewline {<?xml version="1.0" encoding="ISO-8859-1" ?>}
-  puts -nonewline {<functionList>}
+<?xml version="1.0" encoding="ISO-8859-1" ?><functionList>}
 
 array set res [rega_script {
   !*****************************************************************************
@@ -42,4 +33,4 @@ array set res [rega_script {
 }]
 puts -nonewline $res(STDOUT)
 puts -nonewline {</functionList>}
-}
+
diff --git a/xmlapi/index.html b/xmlapi/index.html
@@ -7,6 +7,6 @@
 <meta http-equiv="refresh" content="0; URL=./info.html">
 </head>
 <body>
-<h2>XML-API Version 1.2</h2>
+<h2>XML-API Version 1.3rc1</h2>
 </body>
 </html>
diff --git a/xmlapi/info.html b/xmlapi/info.html
@@ -1,28 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/loose.dtd">
+<!DOCTYPE html>
 <html>
 <head>
 <title>XML-API</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 </head>
 <body>
-<h2>XML-API Version 1.2</h2>
+<h2>XML-API Version 1.3rc1</h2>
 <table>
 	<tr><td><a href="./version.cgi">version.cgi</a></td><td>Version der XML-API</td></tr>
-	<tr><td><a href="./devicelist.cgi">devicelist.cgi</a></td><td>Liste aller Ger�te mit Kan�len. Enth�lt u.a. die Namen, Seriennummern, Ger�tetypen und ID's</td></tr>
-	<tr><td><a href="./functionlist.cgi">functionlist.cgi</a></td><td>Liste aller Gewerke mit Kan�len</td></tr>
+	<tr><td><a href="./devicelist.cgi">devicelist.cgi</a></td><td>Liste aller Ger�te mit Kan�len. Enth�lt u.a. die Namen, Seriennummern, Ger�tetypen und ID's</td></tr>
+	<tr><td><a href="./functionlist.cgi">functionlist.cgi</a></td><td>Liste aller Gewerke mit Kan�len</td></tr>
 	<tr><td><a href="./favoritelist.cgi">favoritelist.cgi</a></td><td>Liste aller Favoriten und Usern</td></tr>
 	<tr><td><a href="./sysvarlist.cgi">sysvarlist.cgi</a></td><td>Liste alle Systemvariablen mit Werten<br>
 		<b>Parameter:</b> sysvarlist.cgi?text=true - gibt auch Wertelisten und den Text des aktuellen Werts in den Attributen value_list und value_text aus.</td></tr>
-	<tr><td><a href="./sysvar.cgi">sysvar.cgi</a></td><td>Eine einzelne Systemvariablen mit Werten. Parameter: ise_id und text, default text=true<br>
-	<tr><td><a href="./state.cgi">state.cgi</a></td><td>Gibt ein einzelnes Ger�te mit Kan�len und aktuellen Werten zur�ck (z.Bsp.: state.cgi?device_id=12796 | state.cgi?channel_id=12796 | state.cgi?datapoint_id=12839 (gibt nur Value() zur�ck) )</td></tr>
-	<tr><td><a href="./statelist.cgi">statelist.cgi</a></td><td>Liste alle Ger�te mit Kan�len und aktuellen Werten</td></tr>
-	<tr><td><a href="./statechange.cgi">statechange.cgi</a></td><td>�ndern eines Kanal-Zustandes mit der angegebenen ID (z.Bsp.: statechange.cgi?ise_id=1234&new_value=0.20)</td></tr>
+	<tr><td><a href="./sysvar.cgi">sysvar.cgi</a></td><td>Eine einzelne Systemvariablen mit Werten. <b>Parameter</b>: ise_id<br>
+	<tr><td><a href="./state.cgi">state.cgi</a></td><td>Gibt ein einzelnes Ger�te mit Kan�len und aktuellen Werten zur�ck (z.Bsp.: state.cgi?device_id=12796 | state.cgi?channel_id=12796 | state.cgi?datapoint_id=12839 (gibt nur Value() zur�ck) )</td></tr>
+	<tr><td><a href="./statelist.cgi">statelist.cgi</a></td><td>Liste alle Ger�te mit Kan�len und aktuellen Werten</td></tr>
+	<tr><td><a href="./statechange.cgi">statechange.cgi</a></td><td>�ndern eines Kanal-Zustandes mit der angegebenen ID (z.Bsp.: statechange.cgi?ise_id=1234&new_value=0.20)</td></tr>
 	<tr><td><a href="./programlist.cgi">programlist.cgi</a></td><td>Liste aller Programme</td></tr>
-	<tr><td><a href="./protocol.cgi">protocol.cgi</a></td><td>Gibt das Systemprotokoll aus</td></tr>
+	<tr><td><a href="./protocol.cgi">protocol.cgi</a></td><td>Gibt das Systemprotokoll aus<br><b>Parameter</b>protocol.cgi?clear=1 l�scht das Systemprotokoll</td></tr>
 	<tr><td><a href="./runprogram.cgi">runprogram.cgi</a></td><td>Startet ein Programm mit der angegebenen ID (z.Bsp.: runprogram.cgi?program_id=1234)</td></tr>
-	<tr><td><a href="./roomlist.cgi">roomlist.cgi</a></td><td>Liste aller R�ume mit Kan�len</td></tr>
-	<tr><td><a href="./rssilist.cgi">rssilist.cgi</a></td><td>Liste aller Ger�te mit Signalst�rke</td></tr>
+	<tr><td><a href="./roomlist.cgi">roomlist.cgi</a></td><td>Liste aller R�ume mit Kan�len</td></tr>
+	<tr><td><a href="./rssilist.cgi">rssilist.cgi</a></td><td>Liste aller Ger�te mit Signalst�rke</td></tr>
 </table>
 </body>
 </html>
diff --git a/xmlapi/programlist.cgi b/xmlapi/programlist.cgi
@@ -1,6 +1,6 @@
 #!/bin/tclsh
 load tclrega.so
-puts  {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
 <?xml version="1.0" encoding="ISO-8859-1" ?>}
diff --git a/xmlapi/protocol.cgi b/xmlapi/protocol.cgi
@@ -1,6 +1,6 @@
 #!/bin/tclsh
 load tclrega.so
-puts  {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
 <?xml version="1.0" encoding="ISO-8859-1" ?>}
@@ -19,7 +19,7 @@ catch {
  }
 }
 
-puts {<systemProtocol>}
+puts -nonewline {<systemProtocol>}
 
 append hm_script {
     string drop = "";
@@ -42,7 +42,7 @@ append hm_script {;
     if (iCount == "0") {
       iCount = eCount;
     }
-    WriteLine("<records start=\"" # iStart # "\" show=\"" # iCount # "\" count=\"" # eCount # "\"/>");
+    Write("<records start=\"" # iStart # "\" show=\"" # iCount # "\" count=\"" # eCount # "\"/>");
 }
 
 append hm_script {
@@ -113,7 +113,7 @@ append hm_script {
 
     }
 
-    WriteLine(drop);
+    Write(drop);
     }
 }
 
diff --git a/xmlapi/roomlist.cgi b/xmlapi/roomlist.cgi
@@ -1,18 +1,9 @@
 #!/bin/tclsh
-
 load tclrega.so
-source once.tcl
-sourceOnce cgi.tcl
-
-
-cgi_eval {
+puts -nonewline {Content-Type: text/xml
+Access-Control-Allow-Origin: *
 
-#  cgi_input
-
-  cgi_content_type "text/xml"
-  cgi_http_head
-  puts -nonewline {<?xml version="1.0" encoding="ISO-8859-1" ?>}
-  puts -nonewline {<roomList>}
+<?xml version="1.0" encoding="ISO-8859-1" ?><roomList>}
 
 array set res [rega_script {
 
@@ -37,6 +28,6 @@ array set res [rega_script {
     }
 
 }]
-  puts -nonewline $res(STDOUT)
-  puts -nonewline {</roomList>}
-}
+puts -nonewline $res(STDOUT)
+puts -nonewline {</roomList>}
+
diff --git a/xmlapi/rssilist.cgi b/xmlapi/rssilist.cgi
@@ -1,52 +1,42 @@
-#!/bin/tclsh
-
-source once.tcl
-sourceOnce cgi.tcl
-sourceOnce xml.tcl
-sourceOnce common.tcl
-
-loadOnce tclrpc.so
-
-set RSSI_BAD -120.0
-set RSSI_MEDIUM -100.0
-set RSSI_GOOD -20.0
-
-
-
-#  !*****************************************************************************
-#  !* rssilist.cgi
-#  !* Signalqualitaet aller funk komponenten
-#  !*
-#  !* Autor      : Dirk Szymanski
-#  !* Erstellt am: gleich, kleinen moment noch
-#  !*
-#  !*****************************************************************************
-
-
-
-cgi_eval {
-
-	set url "xmlrpc_bin://127.0.0.1:2001"
-
-	cgi_input
-	cgi_content_type "text/xml"
-	cgi_http_head
-
-	puts -nonewline {<?xml version="1.0" ?>}
-	puts -nonewline {<rssiList>}
-
-	if { [ catch {
-		#check if the interface supports rssi
-		#failure of this call will throw us out of here
-		xmlrpc $url system.methodHelp rssiInfo
-	} ] } { continue }
-
-	array_clear rssi_map
-	set rssi_list [xmlrpc $url rssiInfo ]
-	array set rssi_map $rssi_list
-
-	foreach dev [lsort [array names rssi_map]] {
-		puts -nonewline "<rssi device='$dev' rx='[lindex [lindex $rssi_map($dev) 1] 0]' tx='[lindex [lindex $rssi_map($dev) 1] 1]'/>"
-	}
-	puts -nonewline {</rssiList>}
-}
+#!/bin/tclsh
+
+#  !*****************************************************************************
+#  !* rssilist.cgi
+#  !* Signalqualitaet aller funk komponenten
+#  !*
+#  !* Autor      : Dirk Szymanski
+#  !* Erstellt am: gleich, kleinen moment noch
+#  !*
+#  !* Modifiziert 11'2012 hobbyquaker: cgi.tcl rausgeschmissen, allow-origin
+#  !* Header hinzugef�gt
+#  !*
+#  !*****************************************************************************
+
+puts -nonewline {Content-Type: text/xml
+Access-Control-Allow-Origin: *
+
+<?xml version="1.0" encoding="ISO-8859-1" ?><rssiList>}
+
+load tclrpc.so
+source common.tcl
+
+set RSSI_BAD -120.0
+set RSSI_MEDIUM -100.0
+set RSSI_GOOD -20.0
+
+set url "xmlrpc_bin://127.0.0.1:2001"
+
+if { [ catch {
+    #check if the interface supports rssi
+    #failure of this call will throw us out of here
+    xmlrpc $url system.methodHelp rssiInfo
+} ] } { continue }
+
+array_clear rssi_map
+set rssi_list [xmlrpc $url rssiInfo ]
+array set rssi_map $rssi_list
+
+foreach dev [lsort [array names rssi_map]] {
+    puts -nonewline "<rssi device='$dev' rx='[lindex [lindex $rssi_map($dev) 1] 0]' tx='[lindex [lindex $rssi_map($dev) 1] 1]'/>"
+}
+puts -nonewline {</rssiList>}
diff --git a/xmlapi/runprogram.cgi b/xmlapi/runprogram.cgi
@@ -15,20 +15,19 @@ catch {
 }
 
 
-puts {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<result>}
+<?xml version="1.0" encoding="ISO-8859-1" ?><result>}
 
 array set res [rega_script "object obj = dom.GetObject($program_id); if (obj) { obj.ProgramExecute(); Write(obj); }"]
 
 if { $res(STDOUT) != "" } {
- puts "<started program_id=\"$program_id\"/>"
+ puts -nonewline "<started program_id=\"$program_id\"/>"
 } else {
- puts {<not_found/>}
+ puts -nonewline {<not_found/>}
 }
 
-puts {</result>}
+puts -nonewline {</result>}
 
 
diff --git a/xmlapi/statechange.cgi b/xmlapi/statechange.cgi
@@ -17,8 +17,7 @@ catch {
 puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<result>}
+<?xml version="1.0" encoding="ISO-8859-1" ?><result>}
 
 array set res [rega_script "Write(dom.GetObject($ise_id).State($new_value));"]
 if {$res(STDOUT) != "null"} {
diff --git a/xmlapi/statelist.cgi b/xmlapi/statelist.cgi
@@ -7,14 +7,13 @@
 #  !* Autor      : Dirk Szymanski
 #  !* Erstellt am: gleich, kleinen moment noch
 #  !* 
-#  !* 1.11.2012 Sebastian Raff: cgi.tcl rausgeworfen, Allow-Origin Header
+#  !* 1.11.2012 hobbyquaker: cgi.tcl rausgeworfen, Allow-Origin Header
 #  !* 	hinzugefügt
 #  !*
 #  !*****************************************************************************
 
-
 load tclrega.so
-puts  -nonewline {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
 <?xml version="1.0" encoding="ISO-8859-1" ?><stateList>}
diff --git a/xmlapi/sysvar.cgi b/xmlapi/sysvar.cgi
@@ -1,6 +1,6 @@
 #!/bin/tclsh
 load tclrega.so
-puts  {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
 <?xml version="1.0" encoding="ISO-8859-1" ?><systemVariables>}
diff --git a/xmlapi/sysvarlist.cgi b/xmlapi/sysvarlist.cgi
@@ -1,6 +1,6 @@
 #!/bin/tclsh
 load tclrega.so
-puts  {Content-Type: text/xml
+puts -nonewline {Content-Type: text/xml
 Access-Control-Allow-Origin: *
 
 <?xml version="1.0" encoding="ISO-8859-1" ?><systemVariables>}
diff --git a/xmlapi/update.cgi b/xmlapi/update.cgi
diff --git a/xmlapi/version.cgi b/xmlapi/version.cgi

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/tclsh`
`2`	`2`	`load tclrega.so`
`3`		`-puts {Content-Type: text/xml`
	`3`	`+puts -nonewline {Content-Type: text/xml`
`4`	`4`	`Access-Control-Allow-Origin: *`
`5`	`5`
`6`	`6`	`<?xml version="1.0" encoding="ISO-8859-1" ?>}`
`@@ -19,7 +19,7 @@ catch {`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
`22`		`-puts {<systemProtocol>}`
	`22`	`+puts -nonewline {<systemProtocol>}`
`23`	`23`
`24`	`24`	`append hm_script {`
`25`	`25`	`string drop = "";`
`@@ -42,7 +42,7 @@ append hm_script {;`
`42`	`42`	`if (iCount == "0") {`
`43`	`43`	`iCount = eCount;`
`44`	`44`	`}`
`45`		`- WriteLine("<records start=\"" # iStart # "\" show=\"" # iCount # "\" count=\"" # eCount # "\"/>");`
	`45`	`+ Write("<records start=\"" # iStart # "\" show=\"" # iCount # "\" count=\"" # eCount # "\"/>");`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`append hm_script {`
`@@ -113,7 +113,7 @@ append hm_script {`
`113`	`113`
`114`	`114`	`}`
`115`	`115`
`116`		`- WriteLine(drop);`
	`116`	`+ Write(drop);`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`