jan
/
ancient-weatherstation
mirror of https://github.com/agdsn/ancient-weatherstation.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xml output added 

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@233 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
jan 2007-11-27 19:05:22 +00:00
parent 3e39cafa52
commit 470f2cf92c
12 changed files with 277 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webstuff/frontend/content/module_sets/set_xml_full.html Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<Module id="1">
{content:addModule:xmltemp_1}
{content:addModule:xmlhum_1}
{content:addModule:xmlpress_1}
</Module>
<Module id="1">
{content:addModule:xmltemp_4}
{content:addModule:xmlhum_4}
</Module>
<Module id="1">
{content:addModule:xmlwind_2}
</Module>
<Module id="1">
{content:addModule:xmlrain_3}
</Module>

45
webstuff/frontend/content/modules/mod_xmlhum.html Normal file
View File

@ -0,0 +1,45 @@
<Humidity>
<SensorId>{content:fill:sens_id}</SensorId>
<Location>{content:fill:sens_location}</Location>
<Description>{content:fill:sens_description}</Description>
<Now>
<Value>{content:fill:hum_now_val}</Value>
<Date>{content:fill:hum_now_date}</Date>
</Now>
<Average>
<Value>{content:fill:hum_av_value}</Value>
<Interval>{content:fill:hum_av_interval}</Interval>
</Average>
<Changing>
<Value>{content:fill:hum_changing}</Value>
</Changing>
<BoundMin>
<Value>{content:fill:hum_max_val}</Value>
<Date>{content:fill:hum_max_date}</Date>
</BoundMin>
<BoundMax>
<Value>{content:fill:hum_min_val}</Value>
<Date>{content:fill:hum_min_date}</Date>
</BoundMax>
<Charts>
<Chart>
<Type>hum</Type>
<Description>Luftfeuchtediagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>10</Interval>
<Link>{content:addChartImgLink:hum_10}</Link>
</Chart>
<Chart>
<Type>hum</Type>
<Description>Luftfeuchtediagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>30</Interval>
<Link>{content:addChartImgLink:hum_30}</Link>
</Chart>
<Chart>
<Type>hum</Type>
<Description>Luftfeuchtediagramm Sensor {content:fill:sens_id} - 365 Tage</Description>
<Interval>365</Interval>
<Link>{content:addChartImgLink:hum_365}</Link>
</Chart>
</Charts>
</Humidity>

46
webstuff/frontend/content/modules/mod_xmlpress.html Normal file
View File

@ -0,0 +1,46 @@
<Pressure>
<SensorId>{content:fill:sens_id}</SensorId>
<Location>{content:fill:sens_location}</Location>
<Description>{content:fill:sens_description}</Description>
<Now>
<Value>{content:fill:press_now_val}</Value>
<Date>{content:fill:press_now_date}</Date>
</Now>
<Average>
<Value>{content:fill:press_av_value}</Value>
<Interval>{content:fill:press_av_interval}</Interval>
</Average>
<Changing>
<Value>{content:fill:press_changing}</Value>
</Changing>
<BoundMin>
<Value>{content:fill:press_max_val}</Value>
<Date>{content:fill:press_max_date}</Date>
</BoundMin>
<BoundMax>
<Value>{content:fill:press_min_val}</Value>
<Date>{content:fill:press_min_date}</Date>
</BoundMax>
<Charts>
<Chart>
<Type>press</Type>
<Description>Luftdruckdiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>10</Interval>
<Link>{content:addChartImgLink:press_10}</Link>
</Chart>
<Chart>
<Type>press</Type>
<Description>Luftdruckdiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>30</Interval>
<Link>{content:addChartImgLink:press_30}</Link>
</Chart>
<Chart>
<Type>press</Type>
<Description>Luftdruckdiagramm Sensor {content:fill:sens_id} - 365 Tage</Description>
<Interval>365</Interval>
<Link>{content:addChartImgLink:press_365}</Link>
</Chart>
</Charts>
</Pressure>

43
webstuff/frontend/content/modules/mod_xmlrain.html Normal file
View File

@ -0,0 +1,43 @@
<Rain>
<SensorId>{content:fill:sens_id}</SensorId>
<Location>{content:fill:sens_location}</Location>
<Description>{content:fill:sens_description}</Description>
<Value interval="hour">{content:fill:rain_now_hour}</Value>
<Value interval="day">{content:fill:rain_now_day}</Value>
<Value interval="month">{content:fill:rain_now_month}</Value>
<Max interval="hour">
<Date>{content:fill:rain_max_hour_date}</Date>
<Value>{content:fill:rain_max_hour_val}</Value>
</Max>
<Max interval="day">
<Date>{content:fill:rain_max_day_date}</Date>
<Value>{content:fill:rain_max_day_val}</Value>
</Max>
<Max interval="month">
<Date>{content:fill:rain_max_month_date}</Date>
<Value>{content:fill:rain_max_month_val}</Value>
</Max>
<Charts>
<Chart>
<Type>rain</Type>
<Description>Regendiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>10</Interval>
<Link>{content:addChartImgLink:rain_10}</Link>
</Chart>
<Chart>
<Type>rain</Type>
<Description>Regendiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>30</Interval>
<Link>{content:addChartImgLink:rain_30}</Link>
</Chart>
<Chart>
<Type>rain</Type>
<Description>Regendiagramm Sensor {content:fill:sens_id} - 365 Tage</Description>
<Interval>365</Interval>
<Link>{content:addChartImgLink:rain_365}</Link>
</Chart>
</Charts>
</Rain>

45
webstuff/frontend/content/modules/mod_xmltemp.html Normal file
View File

@ -0,0 +1,45 @@
<Temperature>
<SensorId>{content:fill:sens_id}</SensorId>
<Location>{content:fill:sens_location}</Location>
<Description>{content:fill:sens_description}</Description>
<Now>
<Value>{content:fill:temp_now_val}</Value>
<Date>{content:fill:temp_now_date}</Date>
</Now>
<Average>
<Value>{content:fill:temp_av_value}</Value>
<Interval>{content:fill:temp_av_interval}</Interval>
</Average>
<Changing>
<Value>{content:fill:temp_changing}</Value>
</Changing>
<BoundMin>
<Value>{content:fill:temp_max_val}</Value>
<Date>{content:fill:temp_max_date}</Date>
</BoundMin>
<BoundMax>
<Value>{content:fill:temp_min_val}</Value>
<Date>{content:fill:temp_min_date}</Date>
</BoundMax>
<Charts>
<Chart>
<Type>temp</Type>
<Description>Temparaturdiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>10</Interval>
<Link>{content:addChartImgLink:temp_10}</Link>
</Chart>
<Chart>
<Type>temp</Type>
<Description>Temparaturdiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>30</Interval>
<Link>{content:addChartImgLink:temp_30}</Link>
</Chart>
<Chart>
<Type>temp</Type>
<Description>Temparaturdiagramm Sensor {content:fill:sens_id} - 365 Tage</Description>
<Interval>365</Interval>
<Link>{content:addChartImgLink:temp_365}</Link>
</Chart>
</Charts>
</Temperature>

42
webstuff/frontend/content/modules/mod_xmlwind.html Normal file
View File

@ -0,0 +1,42 @@
<Wind>
<SensorId>{content:fill:sens_id}</SensorId>
<Location>{content:fill:sens_location}</Location>
<Description>{content:fill:sens_description}</Description>
<Now>
<Value>{content:fill:wind_now_val}</Value>
<Date>{content:fill:wind_now_date}</Date>
</Now>
<Average>
<Value>{content:fill:wind_av_value}</Value>
<Interval>{content:fill:wind_av_interval}</Interval>
</Average>
<Changing>
<Value>{content:fill:wind_changing}</Value>
</Changing>
<BoundMax>
<Value>{content:fill:wind_max_val}</Value>
<Date>{content:fill:wind_max_date}</Date>
</BoundMax>
<Charts>
<Chart>
<Type>wind</Type>
<Description>Winddiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>10</Interval>
<Link>{content:addChartImgLink:wind_10}</Link>
</Chart>
<Chart>
<Type>wind</Type>
<Description>Winddiagramm Sensor {content:fill:sens_id} - 30 Tage</Description>
<Interval>30</Interval>
<Link>{content:addChartImgLink:wind_30}</Link>
</Chart>
<Chart>
<Type>wind</Type>
<Description>Winddiagramm Sensor {content:fill:sens_id} - 365 Tage</Description>
<Interval>365</Interval>
<Link>{content:addChartImgLink:wind_365}</Link>
</Chart>
</Charts>
</Wind>

3
webstuff/frontend/frontend.conf
View File

@ -80,4 +80,7 @@ $report = array(
'hum_365_4' =>array( "Daten - Report", "Listet St&uuml;ndliche Luftfeuchtigkeits - Werte der Letzten 10 Tage", 4, "hum", "day", "1 years", "Luftfeuchtigkeit", 1, "%", "hum", true, "DD.MM.YYYY ", "report") 'hum_365_4' =>array( "Daten - Report", "Listet St&uuml;ndliche Luftfeuchtigkeits - Werte der Letzten 10 Tage", 4, "hum", "day", "1 years", "Luftfeuchtigkeit", 1, "%", "hum", true, "DD.MM.YYYY ", "report")
); );
/* Nicht-Standard-Sets */
$notStandard = array("xml_full");
?> ?>

12
webstuff/frontend/index.php
View File

@ -7,6 +7,8 @@
$path = "./"; $path = "./";
include_once($path."php_inc/module_set.inc.php"); include_once($path."php_inc/module_set.inc.php");
if (ModuleSet::isStandardPage($_REQUEST['setType'])) {
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html> <html>
@ -17,8 +19,14 @@
</head> </head>
<body> <body>
<h1><? echo Config::getAllTitle(); ?></h1> <h1><? echo Config::getAllTitle(); ?></h1>
<? new ModuleSet($_REQUEST['setType']);?> <?
}
new ModuleSet($_REQUEST['setType']);
if (ModuleSet::isStandardPage($_REQUEST['setType'])) {
?>
<p id="copyright">(c) 2006 by Jan Losinski</p> <p id="copyright">(c) 2006 by Jan Losinski</p>
</body> </body>
</html> </html>
<?
}
?>

9
webstuff/frontend/php_inc/chart.inc.php
View File

@ -72,6 +72,15 @@ class Chart{
return Chart::_getChartImgTag($chartName); return Chart::_getChartImgTag($chartName);
} }
function insertChartLink($chartName){
if($chartName == "auto"){
$chartName = $_REQUEST['chartName'];
}
$chartArray = Config::getChartArray($chartName);
return Chart::_getChartImgLink($chartArray[0]);
}
} }
?> ?>

5
webstuff/frontend/php_inc/config.inc.php
View File

@ -53,5 +53,10 @@ class Config{
global $average_interval; global $average_interval;
return $average_interval; return $average_interval;
} }
function getNotStandardPages(){
global $notStandard;
return $notStandard;
}
} }
?> ?>

8
webstuff/frontend/php_inc/module.inc.php
View File

@ -42,8 +42,10 @@ class Module{
$this->parserInstance = &$parser; $this->parserInstance = &$parser;
$this->table = $this->_getTableName(); $this->table = $this->_getTableName();
if (ModuleSet::isStandardPage($_REQUEST['setType']))
$parser->parseContent($this->_getModuleFilename("frame"), & $this, "top"); /* Oberen Modulrahmen parsen */ $parser->parseContent($this->_getModuleFilename("frame"), & $this, "top"); /* Oberen Modulrahmen parsen */
$parser->parseContent($this->_getModuleFilename($modName), & $this, NULL); /* Modul Parsen */ $parser->parseContent($this->_getModuleFilename($modName), & $this, NULL); /* Modul Parsen */
if (ModuleSet::isStandardPage($_REQUEST['setType']))
$parser->parseContent($this->_getModuleFilename("frame"), & $this, "bottom"); /* unteren Modulrahmen Parsen */ $parser->parseContent($this->_getModuleFilename("frame"), & $this, "bottom"); /* unteren Modulrahmen Parsen */
} }
@ -126,7 +128,11 @@ class Module{
} }
function addChart($chartName){ function addChart($chartName){
Chart::insertChart($chartName); return Chart::insertChart($chartName);
}
function addChartImgLink($chartName){
return Chart::insertChartLink($chartName.'_'.$this->sensId);
} }
function addSetLink($setName){ function addSetLink($setName){

4
webstuff/frontend/php_inc/module_set.inc.php
View File

@ -109,5 +109,9 @@ class ModuleSet{
return $buff; return $buff;
} }
function isStandardPage($set_type){
return !in_array($set_type, Config::getNotStandardPages());
}
} }
?> ?>