[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9544] Added check on database type in bofellesdata.
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [9544] Added check on database type in bofellesdata. |
Date: |
Mon, 11 Jun 2012 08:45:05 +0000 |
Revision: 9544
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9544
Author: erikhl
Date: 2012-06-11 08:45:03 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Added check on database type in bofellesdata.
If databasetype is postgresql, use lowercase in queries. Else use uppercase as
before.
Done to ensure compatibility with dev-environments
Modified Paths:
--------------
trunk/frontend/inc/class.bofellesdata.inc.php
Modified: trunk/frontend/inc/class.bofellesdata.inc.php
===================================================================
--- trunk/frontend/inc/class.bofellesdata.inc.php 2012-06-11 06:33:42 UTC
(rev 9543)
+++ trunk/frontend/inc/class.bofellesdata.inc.php 2012-06-11 08:45:03 UTC
(rev 9544)
@@ -60,16 +60,32 @@
$sql = "SELECT $columns FROM $table WHERE
V_ORG_ENHET.ORG_ENHET_ID IN ($unit_ids_string) AND V_ORG_ENHET.ORG_NIVAA = 4";
+ if($db->Type == 'postgres')
+ {
+ $sql = strtolower($sql);
+ }
$db->query($sql,__LINE__,__FILE__);
while ($db->next_record())
{
- $result_units[] = array(
- "ORG_UNIT_ID" =>
(int)$db->f('ORG_ENHET_ID'),
- "ORG_NAME" => $db->f('ORG_NAVN'),
- "UNIT_ID" => $db->f('RESULTATENHET'),
- "LEADER" => false
- );
+ if($db->Type == 'postgres')
+ {
+ $result_units[] = array(
+ "ORG_UNIT_ID" =>
(int)$db->f('org_enhet_id'),
+ "ORG_NAME" => $db->f('org_navn'),
+ "UNIT_ID" => $db->f('resultatenhet'),
+ "LEADER" => false
+ );
+ }
+ else
+ {
+ $result_units[] = array(
+ "ORG_UNIT_ID" =>
(int)$db->f('ORG_ENHET_ID'),
+ "ORG_NAME" => $db->f('ORG_NAVN'),
+ "UNIT_ID" => $db->f('RESULTATENHET'),
+ "LEADER" => false
+ );
+ }
}
return $result_units;
@@ -101,16 +117,32 @@
$db = $this->get_db();
$db1 = $this->get_db();
+ //var_dump($db->Type);
+ if($db->Type == "postgres")
+ {
+ $sql = strtolower($sql);
+ }
+ //var_dump($sql);
$db->query($sql,__LINE__,__FILE__);
while ($db->next_record())
{
- $identifier = (int)$db->f('ORG_ENHET_ID');
- $level = (int)$db->f('ORG_NIVAA','int');
- $name = $db->f('ORG_NAVN');
- $unit_id = $db->f('RESULTATENHET');
+ if($db->Type == "postgres")
+ {
+ $identifier = (int)$db->f('org_enhet_id');
+ $level = (int)$db->f('org_nivaa','int');
+ $name = $db->f('org_navn');
+ $unit_id = $db->f('resultatenhet');
+ }
+ else
+ {
+ $identifier = (int)$db->f('ORG_ENHET_ID');
+ $level = (int)$db->f('ORG_NIVAA','int');
+ $name = $db->f('ORG_NAVN');
+ $unit_id = $db->f('RESULTATENHET');
+ }
switch($level)
{
@@ -122,20 +154,41 @@
$joins = "LEFT JOIN
V_ORG_KNYTNING ON (V_ORG_KNYTNING.ORG_ENHET_ID = V_ORG_ENHET.ORG_ENHET_ID)";
$sql = "SELECT $columns FROM
$tables $joins WHERE V_ORG_ENHET.ORG_NIVAA = 4 AND
V_ORG_KNYTNING.ORG_ENHET_ID_KNYTNING = {$identifier}";
+ if($db1->Type == "postgres")
+ {
+ $sql = strtolower($sql);
+ }
$db1->query($sql,__LINE__,__FILE__);
while ($db1->next_record())
{
-
if(!isset($org_unit_ids[(int)$db1->f('ORG_ENHET_ID')]))
- {
- $result_units[]
= array(
-
"ORG_UNIT_ID" => (int)$db1->f('ORG_ENHET_ID'),
-
"ORG_NAME" => $db1->f('ORG_NAVN'),
-
"UNIT_ID" => $db1->f('RESULTATENHET'),
-
"LEADER" => true
- );
-
-
$org_unit_ids[(int)$db1->f('ORG_ENHET_ID')] = true;
- }
+ if($db1->Type == "postgres")
+ {
+
if(!isset($org_unit_ids[(int)$db1->f('org_enhet_id')]))
+ {
+ $result_units[]
= array(
+
"ORG_UNIT_ID" => (int)$db1->f('org_enhet_id'),
+
"ORG_NAME" => $db1->f('org_navn'),
+
"UNIT_ID" => $db1->f('resultatenhet'),
+
"LEADER" => true
+ );
+
+
$org_unit_ids[(int)$db1->f('org_enhet_id')] = true;
+ }
+ }
+ else
+ {
+
if(!isset($org_unit_ids[(int)$db1->f('ORG_ENHET_ID')]))
+ {
+ $result_units[]
= array(
+
"ORG_UNIT_ID" => (int)$db1->f('ORG_ENHET_ID'),
+
"ORG_NAME" => $db1->f('ORG_NAVN'),
+
"UNIT_ID" => $db1->f('RESULTATENHET'),
+
"LEADER" => true
+ );
+
+
$org_unit_ids[(int)$db1->f('ORG_ENHET_ID')] = true;
+ }
+ }
}
break;
case 3: break; // LEVEL: Seksjon (not
in use)
@@ -184,11 +237,22 @@
{
$sql = "SELECT V_ORG_ENHET.ORG_NAVN FROM V_ORG_ENHET
WHERE V_ORG_ENHET.RESULTATENHET = $number";
$db = $this->get_db();
+ if($db->Type == "postgres")
+ {
+ $sql = strtolower($sql);
+ }
$db->query($sql,__LINE__,__FILE__);
if($db->num_rows() > 0)
{
$db->next_record();
- return $db->f('ORG_NAVN', true);
+ if($db->Type == "postgres")
+ {
+ return $db->f('org_navn', true);
+ }
+ else
+ {
+ return $db->f('ORG_NAVN', true);
+ }
}
}
else
@@ -206,13 +270,26 @@
{
$sql = "SELECT V_ORG_ENHET.ORG_NAVN,
V_ORG_ENHET.RESULTATENHET FROM V_ORG_ENHET WHERE V_ORG_ENHET.ORG_ENHET_ID =
$number";
$db = $this->get_db();
+ if($db->Type == "postgres")
+ {
+ $sql = strtolower($sql);
+ }
$db->query($sql,__LINE__,__FILE__);
if($db->num_rows() > 0)
{
$db->next_record();
- return array( 'UNIT_NAME' =>
$db->f('ORG_NAVN', true),
- 'UNIT_NUMBER'
=> $db->f('RESULTATENHET', true)
- );
+ if($db->Type == "postgres")
+ {
+ return array( 'UNIT_NAME' =>
$db->f('org_navn', true),
+ 'UNIT_NUMBER'
=> $db->f('resultatenhet', true)
+ );
+ }
+ else
+ {
+ return array( 'UNIT_NAME' =>
$db->f('ORG_NAVN', true),
+ 'UNIT_NUMBER'
=> $db->f('RESULTATENHET', true)
+ );
+ }
}
}
else
@@ -233,16 +310,32 @@
$sql = "SELECT BRUKERNAVN, FORNAVN, ETTERNAVN, EPOST FROM
V_AD_BRUKERE WHERE BRUKERNAVN = '{$username}'";
$db = $this->get_db();
+ if($db->Type == "postgres")
+ {
+ $sql = strtolower($sql);
+ }
$db->query($sql,__LINE__,__FILE__);
if($db->num_rows() > 0)
{
$db->next_record();
- return array(
- 'username' => $db->f('BRUKERNAVN', true),
- 'firstname' => $db->f('FORNAVN', true),
- 'lastname' => $db->f('ETTERNAVN', true),
- 'email' => $db->f('EPOST', true)
- );
+ if($db->Type == "postgres")
+ {
+ return array(
+ 'username' => $db->f('brukernavn',
true),
+ 'firstname' => $db->f('fornavn',
true),
+ 'lastname' => $db->f('etternavn',
true),
+ 'email' => $db->f('epost', true)
+ );
+ }
+ else
+ {
+ return array(
+ 'username' => $db->f('BRUKERNAVN',
true),
+ 'firstname' => $db->f('FORNAVN',
true),
+ 'lastname' => $db->f('ETTERNAVN',
true),
+ 'email' => $db->f('EPOST', true)
+ );
+ }
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9544] Added check on database type in bofellesdata.,
Erik Holm-Larsen <=