Changeset 778 for branches/0.4/web/addons/job_monarch/libtoga.php

Timestamp:

03/29/13 17:15:20 (10 years ago)

Author:

ramonb

Message:

• more fixes to search

File:

• branches/0.4/web/addons/job_monarch/libtoga.php (modified) (5 diffs)

branches/0.4/web/addons/job_monarch/libtoga.php

@@ -97 +97 @@
 global $JOB_ARCHIVE_DIR;
 global $JOB_ARCHIVE_DBASE;
+global $JOB_ARCHIVE_SQL_USER;
+global $JOB_ARCHIVE_SQL_PASSWORD;
 global $skan_str;
 global $x_first, $y_first;
@@ -160 +162 @@
     var $ip, $dbase, $conn;
 
-    function TarchDbase( $ip = null, $dbase = null )
+    function TarchDbase( $ip = null, $dbase = null, $user =null, $password=null )
     {
         global $CLUSTER_CONFS, $clustername;
@@ -184 +186 @@
     function connect()
     {
+        global $JOB_ARCHIVE_SQL_USER, $JOB_ARCHIVE_SQL_PASSWORD;
+
+        $connect_args ='';
         if( $this->ip == null )
-            $this->conn = pg_connect( "dbname=".$this->dbase );
+        {
+            $connect_args .= "dbname=".$this->dbase;
+        }
         else
-            $this->conn = pg_connect( "host=".$this->ip." dbname=".$this->dbase );
+        {
+            $connect_args .= "host=".$this->ip." dbname=".$this->dbase;
+        }
+        if( isset($JOB_ARCHIVE_SQL_USER) )
+        {
+            $connect_args .= " user=".$JOB_ARCHIVE_SQL_USER;
+        }
+        if( isset($JOB_ARCHIVE_SQL_PASSWORD) )
+        {
+            $connect_args .= " password=".$JOB_ARCHIVE_SQL_PASSWORD;
+        }
+
+
+        $this->conn = pg_connect( $connect_args );
+
     }
 
@@ -260 +281 @@
 
         $ids = $this->queryDbase( $select_query );
+
+        //print_r( $ids );
 
         $ret = array();
@@ -335 +358 @@
     {
         $result_rows = array();
-    
-        if( !$this->conn )
+   
+        if( $this->conn == null )
         {
             $this->connect();
         }
 
+        if( $this->conn == null )
+        {
+            printf(" no connection!\n");
+        }
         $result = pg_query( $this->conn, $query );
 
         while ($row = pg_fetch_assoc($result))
         {
+            //print_r( $row );
             $result_rows[] = $row;
         }