Navigation

← Previous Changeset
Next Changeset →

Changeset trunk,193

Timestamp:

05/07/10 15:58:42 (4 months ago)

Author:

Suren A. Chilingaryan <csa@dside.dyndns.org>

revision id:

csa@dside.dyndns.org-20100507155842-lfixnek02lfjb6kt

branch-nick:

adei

Message:

Few fixes and setup for ASEC installation

Files:

trunk/setups/dvin (added)
trunk/setups/dvin/.exclude (added)
trunk/setups/dvin/config.php (added)
trunk/setups/dvin/dvin.css (added)
trunk/setups/nmdb (deleted)
trunk/setups/nmdb/.exclude (deleted)
trunk/setups/nmdb/config.php (deleted)
trunk/setups/nmdb/nmdb.css (deleted)
trunk/ToDo (modified) (1 diff)
trunk/classes/draw.php (modified) (1 diff)
trunk/classes/filters/badvaluefilter.php (modified) (1 diff)
trunk/config.php (modified) (2 diffs)
trunk/setups/asec/config.php (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/ToDo

r187	r193
13	13
14	14	- Support for Database names
	15
	16	Easy ToDo
	17	=========
	18	- Image Download
	19	- List of displayed elements in options tab in left-bottom corner
15	20
16	21	KATRIN

trunk/classes/draw.php

r188	r193
1237	1237	$this->graph->ynaxis[$axis_i]->SetTitleSide(SIDE_LEFT);
1238	1238	if ($JPGRAPH_VERSION > 2) {
1239		$this->graph->ynaxis[$axis_i]->SetTitleMargin(20 - $this->graph_yaxis_size);
	1239	$this->graph->ynaxis[$axis_i]->SetTitleMargin(15 - $this->graph_yaxis_size);
1240	1240	} else {
1241	1241	$this->graph->ynaxis[$axis_i]->SetTitleMargin($this->graph_yaxis_size-20);

trunk/classes/filters/badvaluefilter.php

r108	r193
14	14	function ProcessVector(&$data, &$time, &$values) {
15	15	foreach ($values as &$value) {
16		if ($value == ~~1999~~) {
	16	if ($value == $this->badval) {
17	17	$value = NULL;
18	18	}

trunk/config.php

r182	r193
10	10	$DEFAULT_MODULE = "wiki";
11	11
12		$MODULES = array("~~config", "~~slowcontrol", "alarms", "graph", "wiki");
	12	$MODULES = array("slowcontrol", "alarms", "graph", "wiki");
13	13	$POPUPS = array("source", "controls");
14	14
…	…
100	100	/* "0" => array(
101	101	),*/
	102	"countrate" => array(
	103	"axis_name" => _("Count Rate"),
	104	"axis_units" => false,
	105	"axis_mode" => "STANDARD",
	106	"axis_range" => false
	107	),
102	108	"temperature" => array(
103	109	"axis_units" => _("C"),

trunk/setups/asec/config.php

r96	r193
1	1	<?php
2		$TITLE = "";
3		$MODULES = array("~~config", "~~graph", "wiki");
	2	$TITLE = "ASEC";
	3	$MODULES = array("graph", "wiki");
4	4
5	5
…	…
7	7	"asec" => array (
8	8	"title" => _("ASEC"),
9		"reader" => "~~DVIN~~Reader",
	9	"reader" => "IPEReader",
10	10	"driver" => "mysql",
11		"host" => "localhost",
12		"port" => 0,
13		"user" => "asec",
14		"password" => 'asecpw',
15		"database" => array("asec"),
16		"persistent" => true
17		// "charset" => "ISO8859-1",
	11	"host" => "192.168.24.8",
	12	"port" => 3306,
	13	"user" => "read",
	14	"password" => "read",
	15	"database" => array("crd"),
	16	"charset" => "ISO8859-1",
	17	"timeout" => 200000, // us
	18	"ping" => true, // host and port should be specified
18	19	// "disconnected" => true
19	20	)
…	…
23	24	else $READER_DB = $READER_DB_ASEC;
24	25
25		$OPTIONS["asec__asec"] = array(
26		"groups" => array(
27		"/^all$/" => 'finalASEC',
28		),
	26
	27	$OPTIONS["asec"] = array(
	28	/* "groups" => array(
	29	"/^Data_011_EB1_DAR$/" => 'Data_011_EB1_DAR_[Energy_balance_station_1 DAR]',
	30	"/^Data_012_EB2_DAR$/" => 'Data_012_EB2_DAR_[Energy_balance_station_2 DAR]',
	31	"/^Data_012_EB2_DAX$/" => 'Data_012_EB2_DAX_[Energy_balance_station_2 DAX]'
	32
	33	),*/
29	34	"tables" => array(
30		"/^finalASEC$/" => array(
31		'gid' => 'all',
32		'title' => 'ASEC'
	35	"/^((.*)_view)$/" => array(
	36	'gid' => '${1}',
	37	'title' => '${2}'
	38	),
	39	"/^((.*)_view_sum)$/" => array(
	40	'gid' => '${1}',
	41	'title' => 'sums of ${2}'
	42	),
	43	"/^((.*)_view_sum_corrected)$/" => array(
	44	'gid' => '${1}',
	45	'title' => 'corrected sums of ${2}'
33	46	)
34	47	),
35	48	"columns" => array(
36	49	"time" => "Time",
37		"data" => "/^(C\d+)$/"
	50	// "data" => "/^C/"
	51	"data" => "/^(arnm\|asnt\|nanm\|nammm1\|nammm2\|wh\|ammm\|maket\|sa\|sna\|sm\|sy\|sz\|count\|vert\|dir)/"
	52	// "data" => "/^(arnm\|nanm)/"
38	53	),
39		~~// "timezone" => "Europe/Berlin",~~
40		~~// "time_module" => "MSTICKS",~~
41		~~// "time_options" => -36000000000, // correction~~
42	54	"timesort" => 1, // 0 - NATURAL, 1 - ASC, -1 - DESC, string whith request
43		// "date_limit" => "1970-01-01 00:00:00", //GMT
	55	"date_limit" => "1990-01-01 00:00:00", //GMT
	56	// "time_format" => "U",
44	57	"min_resolution" => 600,
45		~~"maximal_allowed_gap" => 120,~~
46	58	"ignore_subseconds" => true,
47	59	"optimize_empty_cache" => true,
48	60	"use_cache_timewindow" => true,
49	61	// "use_cache_reader" => true,
50		~~"use_md5_postfix" => fals~~e,
	62	// "use_md5_postfix" => true,
51	63	"trace_timings" => false,
52	64	"monitor_timings" => array(
53	65	"query_limit" => 500000, /* us */
54	66	"raise_exception" => true
55		)
	67	),
	68	"item_table" => array(
	69	"table" => "CHANNEL_LIST",
	70	"id" => "name",
	71	// "gid" => "group",
	72	"properties" => array(
	73	"name" => "title",
	74	"axis" => "axis"
	75	)
	76	),
	77	"mask_table" => array(
	78	"table" => "MASK_LIST",
	79	"id" => "id",
	80	"gid" => "gid",
	81	"properties" => array(
	82	"name" => "mask_name",
	83	"mask" => "channel_list"
	84	)
	85	),
	86	/* "cache_config" => array(
	87	array("min" => 630720000, "res" => 604800),
	88	array("min" => 31536000, "res" => 43200)
	89	),
	90	"data_filters" => array(
	91	"BADVALUEFilter" => array (
	92	"badvalue" => -9000
	93	),
	94	),
	95	*/
56	96	);
57	97
	98
58	99	?>

Advanced Data Extraction Infrastructure