Changeset trunk,185

Timestamp:

02/24/10 02:58:48 (5 months ago)

Author:

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

revision id:

csa@dside.dyndns.org-20100224025848-pq272i8uayd4rhg2

branch-nick:

adei

Message:

Support for the masks table in DBReader

Files:

• trunk/classes/database.php (modified) (4 diffs)
• trunk/classes/readers/dbreader.php (modified) (1 diff)

trunk/classes/database.php

@@ -28 +28 @@
-    each($this->arr);    
- }
+
- function valid() {
-        // We don't expect 'false' elements in array (all are arrays)
-    return current($this->arr)?true:false;
- }
-
+
+
+
+
-}
-
@@ -43 +47 @@
- var $dbname;
- 
-"\'"
+'\''
- var $col_quote = "\"";
- var $tbl_quote = "";
@@ -415 +419 @@
- }
-
+ function FixTableName($table) {
+    switch ($this->driver) {
+        case "mssql":
+            $table = preg_replace("/^\[?mda\]?\./", "", $table);
+            $table = preg_replace("/(^\[|\]$)/", "", $table);
+        break;
+    }
+    return $table;
+ }
+
- function ShowColumns($table) {
-    switch ($this->driver) {
@@ -422 +436 @@
-                /* we could get here problems if several non-equal tables with 
-                different prefixes (mda,dbo) are present */
-
-
+
+
+
-            return $this->Query("SELECT name FROM (SELECT DISTINCT TOP 65535 name=syscolumns.name, type=systypes.name, length=syscolumns.length, objname=sysobjects.name, colid=syscolumns.colid
-                FROM sysobjects 

trunk/classes/readers/dbreader.php

@@ -110 +110 @@
-    $this->monitor_timings = $this->opts->Get("monitor_timings");
- }
+
+
+ function GetFilteredMaskList(LOGGROUP $grp = NULL, $maskid = false, $flags = 0) {
+    $grp = $this->CheckGroup($grp, $flags);
+
+    $info = $this->req->GetGroupOption("mask_table", $grp);
+//    $info = $this->opts->Get("mask_table");
+    if (!$info) return parent::GetMaskList($grp, $flags);
+    
+    if (!is_array($info))
+        throw new ADEIException(translate("Invalid mask table specified in the reader configuration, the array with information should be provided"));
+
+    if (!$info['table']) 
+        throw new ADEIException(translate("The mask table is not specified in the reader configuration"));
+
+    if (!$info['id']) 
+        throw new ADEIException(translate("The id column for mask table is not specified in the reader configuration"));
+
+
+    $query = "";
+    if (is_array($info['properties'])) {
+        foreach ($info['properties'] as $prop => $col) {
+            $query.= ", {$this->db->col_quote}$col{$this->db->col_quote} AS ${prop}";
+        }
+    }
+    
+    if ($maskid) {
+        $cond = " WHERE {$this->db->col_quote}{$info['id']}{$this->db->col_quote} = {$this->db->text_quote}{$maskid}{$this->db->text_quote}";
+    } elseif ($info['gid']) {
+        $table = $this->db->FixTableName($grp->table);
+        $cond = " WHERE {$this->db->col_quote}{$info['gid']}{$this->db->col_quote} = {$this->db->text_quote}{$table}{$this->db->text_quote}";
+    } else {
+        $cond = "";
+    }
+    $query = "SELECT {$this->db->col_quote}{$info['id']}{$this->db->col_quote} AS id{$query} FROM {$this->db->tbl_quote}{$info['table']}{$this->db->tbl_quote}" . $cond;
+
+    $masks = $this->db->Query($query);
+
+    if ($masks->rowCount()) {
+        $items = $this->GetItemList($grp, NULL, $flags);
+        $hash = array();
+        foreach ($items as $item) {
+            $hash[$item['name']] = $item;
+        }
+    } else if ($maskid) {
+        throw new ADEIException(translate("Mask \"%s\" is not found for group \"%s\"", $maskid, $grp->gid));
+    }
+    
+    $list = array();
+    foreach ($masks as $mask) {
+        $items = explode(",", $mask['mask']);
+        foreach ($items as &$item) {
+            if (!is_numeric($item)) {
+                if (isset($hash[$item])) {
+                    $item = $hash[$item]['id'];
+                } else {
+                    throw new ADEIException(translate("Item \"%s\" specified in the mask \"%s\" is not available in the group \"%s\"", $item, $mask['id'], $grp->gid));
+                }
+            }
+        }
+
+        $mask['mask'] = implode(",", $items);
+        $mask['id'] =   "maskid" . $mask['id'];
+
+        $list[$mask['id']] = $mask;
+    }
+
+    return array_merge(
+        parent::GetMaskList($grp, $flags),
+        $list
+    );
+ }
+
+ function GetMaskList(LOGGROUP $grp = NULL, $flags = 0) {
+    return $this->GetFilteredMaskList($grp, false, $flags);
+ }
+
+ function CreateMask(LOGGROUP $grp = NULL, array &$minfo = NULL, $flags = 0) {
+    if ($minfo === NULL) {
+        if ($this->req instanceof ITEMGroupRequest)
+            $minfo = $this->req->GetMaskInfo($flags);
+    }
+
+    if (preg_match("/^maskid(\d+)$/", $minfo["db_mask"], $m)) {
+        $res = new MASK(array(), $this, $grp, $flags);
+    
+        $masks = $this->GetFilteredMaskList($grp, $m[1], $flags);
+        $mask = $masks->current();
+
+        if ($mask) {
+            $res->SetIDs($mask['mask'], $mask['id']);
+        } 
+        return $res;
+    } else {
+        return new MASK($minfo, $this, $grp, $flags);
+    }
+ }
+
-
- function CreateAxes($flags = 0) {