X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fdbase_pgsql.phh;h=520a4f09f26ebdc8e7597a09744941e3ab9ff69b;hb=e2d1e08df1bfffaeda9487b60a0d13aafbedde57;hp=4790e8b9946ecc4ad537fc9471cb6355b12f3c73;hpb=ab8d1f71caed7bf1a7f02660fb12b28177811ad7;p=brisk.git diff --git a/web/Obj/dbase_pgsql.phh b/web/Obj/dbase_pgsql.phh index 4790e8b..520a4f0 100644 --- a/web/Obj/dbase_pgsql.phh +++ b/web/Obj/dbase_pgsql.phh @@ -25,7 +25,7 @@ require_once("${G_base}Obj/dbase_base.phh"); $escsql_from = array( "\\", "'" ); -$escsql_to = array( "\\\\", "\\'" ); +$escsql_to = array( "\\\\", "''" ); function escsql($s) { @@ -62,8 +62,9 @@ class DBConn static function destroy() { if (DBConn::$dbcnnx != FALSE) { + $ret = pg_close(DBConn::$dbcnnx); DBConn::$dbcnnx = FALSE; - return (pg_close(DBConn::$dbcnnx)); + return ($ret); } return TRUE; } @@ -112,11 +113,17 @@ class BriskDB function query($sql) { - if (($res = pg_query($this->dbconn->db(), $sql)) == FALSE) { + if (!$this->dbconn) + if (($this->dbconn = DBConn::recover()) == FALSE) + return FALSE; + + if (($res = @pg_query($this->dbconn->db(), $sql)) == FALSE) { + error_log('pg_result_status: ' . pg_result_status($res)); + error_log('pg_connection_status: ' . pg_connection_status($this->dbconn->db())); // try to recover the connection if (($this->dbconn = DBConn::recover()) == FALSE) return FALSE; - return (pg_query($this->dbconn->db(), $sql)); + return (@pg_query($this->dbconn->db(), $sql)); } return ($res); @@ -352,11 +359,9 @@ class BriskDB $user_sql = sprintf("UPDATE %susers SET (type, supp_comp) = (%d, '%s') WHERE code = %d;", $G_dbpfx, $flags, escsql($supp_comp), $code); - fprintf(STDERR, "REQUEST [%s]\n", $user_sql); if ( ! (($user_pg = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { return FALSE; } - fprintf(STDERR, "REQUEST GOOD [%s]\n", $user_sql); return TRUE; } @@ -367,11 +372,9 @@ class BriskDB $user_sql = sprintf("UPDATE %susers SET (type, disa_reas) = (%d, %d) WHERE code = %d;", $G_dbpfx, $flags, $disa_reas, $code); - fprintf(STDERR, "REQUEST [%s]\n", $user_sql); if ( ! (($user_pg = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { return FALSE; } - fprintf(STDERR, "REQUEST GOOD [%s]\n", $user_sql); return TRUE; } @@ -382,11 +385,9 @@ class BriskDB $user_sql = sprintf("UPDATE %susers SET (tos_vers) = ('%s') WHERE code = %d;", $G_dbpfx, escsql($tos_vers), $code); - fprintf(STDERR, "REQUEST [%s]\n", $user_sql); if ( ! (($user_pg = $this->query($user_sql)) != FALSE && pg_affected_rows($user_pg) == 1) ) { return FALSE; } - fprintf(STDERR, "REQUEST GOOD [%s]\n", $user_sql); return TRUE; } @@ -855,29 +856,145 @@ INSERT INTO %smails (code, ucode, type, tstamp, subj, body_txt, body_htm, hash) return (TRUE); } - function usersnet_bycode($owner, $target) + function friendship_default() + { + return (array(usersnet_friend_getlabel(1) => "0", + usersnet_friend_getlabel(2) => "0", + usersnet_friend_getlabel(3) => "0", + usersnet_friend_getlabel(4) => "0", + usersnet_friend_getlabel(5) => "0")); + } + + function usersnet_widefriend($owner, $target) + { + GLOBAL $G_dbpfx; + + $widefriend = $this->friendship_default(); + + $wfri_sql = sprintf("SELECT * FROM %susersnet_widefriend WHERE owner = %d AND target = %d;", + $G_dbpfx, $owner, $target); + if (($wfri_pg = $this->query($wfri_sql)) == FALSE) { + return ($widefriend); + } + + for ($i = 0 ; $i < pg_numrows($wfri_pg) ; $i++) { + $wfri_obj = pg_fetch_object($wfri_pg, $i); + $widefriend[usersnet_friend_getlabel(intval($wfri_obj->friend))] = $wfri_obj->count; + } + + return ($widefriend); + } + + function usersnet_narrowfriend($owner, $target) + { + GLOBAL $G_dbpfx; + + $narrowfriend = $this->friendship_default(); + + $nfri_sql = sprintf("SELECT * FROM %susersnet_narrowfriend WHERE owner = %d AND target = %d;", + $G_dbpfx, $owner, $target); + if (($nfri_pg = $this->query($nfri_sql)) == FALSE) { + return $narrowfriend; + } + + for ($i = 0 ; $i < pg_numrows($nfri_pg) ; $i++) { + $nfri_obj = pg_fetch_object($nfri_pg, $i); + $narrowfriend[usersnet_friend_getlabel(intval($nfri_obj->friend))] = $nfri_obj->count; + } + return ($narrowfriend); + } + + function usersnet_bycode($owner, $target, $widefriend, $narrowfriend) { GLOBAL $G_dbpfx; $ret = FALSE; $net_sql = sprintf("SELECT * FROM %susersnet WHERE owner = %d AND target = %d;", - $G_dbpfx, $owner, $target); - if (($net_pg = $this->query($net_sql)) == FALSE) { + $G_dbpfx, $owner, $target); + if (($net_pg = $this->query($net_sql)) == FALSE) return FALSE; - } + if (pg_numrows($net_pg) != 1) return FALSE; $net_obj = pg_fetch_object($net_pg, 0); - return (UsersNetItem::UsersNetItemFromRecord($net_obj)); + return (UsersNetItem::UsersNetItemFromRecord($net_obj, $widefriend, $narrowfriend)); } - function usersnet_default($owner, $target) + function usersnet_default($owner, $target, $widefriend, $narrowfriend) { - return (UsersNetItem::UsersNetItemDefaults($owner, $target)); + return (UsersNetItem::UsersNetItemDefaults($owner, $target, $widefriend, $narrowfriend)); } + function usersnet_save($owner_id, $json) + { + GLOBAL $G_dbpfx; + $ret = 99999; + $trans = FALSE; + + do { + $friend = usersnet_friend_getid($json->friend); + + $json->skill = intval($json->skill); + $json->trust = intval($json->trust); + + if ($json->skill < 1 || $json->skill > 5 || + $json->trust < 1 || $json->trust > 5 || + $friend == FALSE) { + $ret = 1; + break; + } + $this->transaction('BEGIN'); + $trans = TRUE; + + // try to update + $net_sql = sprintf(" + UPDATE %susersnet SET (friend, skill, trust, mtime) = + (%d, %d, %d, now()) + FROM %susers as us + WHERE owner = %d AND us.login = '%s' AND target = us.code RETURNING *;", + $G_dbpfx, + $friend, $json->skill, $json->trust, + $G_dbpfx, + $owner_id, escsql($json->login)); + if (($net_pg = $this->query($net_sql)) == FALSE || pg_numrows($net_pg) == 0) { + $net_sql = sprintf(" + INSERT INTO %susersnet SELECT %d AS owner, us.code as target, + %d as friend, %d as skill, %d as trust + FROM %susers as us WHERE us.login = '%s' RETURNING *;", + $G_dbpfx, $owner_id, + $friend, $json->skill, $json->trust, + $G_dbpfx, $json->login); + if (($net_pg = $this->query($net_sql)) == FALSE) { + log_wr('insert query failed'); + $ret = 2; + break; + } + if (pg_numrows($net_pg) != 1) { + log_wr(sprintf('insert numrow failed [%s] [%d]', $net_sql, pg_numrows($net_pg))); + $ret = 3; + break; + } + } + else { + if (pg_numrows($net_pg) != 1) { + log_wr('update numrow failed'); + $ret = 4; + break; + } + } + + $net_obj = pg_fetch_object($net_pg, 0); + $this->transaction('COMMIT'); + return (0); + } while (0); + + if ($trans) + $this->transaction('ROLLBACK'); + + return ($ret); + } } // End class BriskDB class LoginDBOld