Changeset 4661

Timestamp:

11/07/07 22:52:58 (2 years ago)

Author:

inureyes

Message:

#711

• mysql_ 관련 명령을 model에서 제거 (1)
  • entry model을 보다가 굉장히 재미있는 =_= 부분을 발견해서 고친다고 다음 커밋까지 살짝 걸릴 듯. 무쟈게 느리게 만드는 부분이 하나 있다 싶군요.

Location:

trunk/lib/model

Files:

• blog.archive.php (modified) (2 diffs)
• blog.attachment.php (modified) (2 diffs)
• blog.blogSetting.php (modified) (2 diffs)
• blog.category.php (modified) (6 diffs)

trunk/lib/model/blog.archive.php

@@ -10 +10 @@
     $skinSetting = getSkinSetting($blogid);
     $archivesOnPage = $skinSetting['archivesOnPage'];
-    $result = DBQuery::query("SELECT EXTRACT(year_month FROM FROM_UNIXTIME(e.published)) period, COUNT(*) count 
+    $result = DBQuery::queryAll("SELECT EXTRACT(year_month FROM FROM_UNIXTIME(e.published)) period, COUNT(*) count 
         FROM {$database['prefix']}Entries e
         WHERE e.blogid = $blogid AND e.draft = 0 $visibility AND e.category >= 0 
@@ -17 +17 @@
         DESC LIMIT $archivesOnPage");
     if ($result) {
-        while ($archive = mysql_fetch_array($result))
+        foreach($result as $archive)
             array_push($archives, $archive);
     }

trunk/lib/model/blog.attachment.php

@@ -160 +160 @@
     $origname = $name;
     $name = tc_escape_string($name);
-    if (DBQuery::execute("DELETE FROM {$database['prefix']}Attachments WHERE blogid = $blogid AND name = '$name'") && (mysql_affected_rows() == 1)) {
+    if (DBQuery::execute("DELETE FROM {$database['prefix']}Attachments WHERE blogid = $blogid AND name = '$name'")) {
         @unlink(ROOT . "/attach/$blogid/$origname");
         clearRSS();
@@ -229 +229 @@
         $origname = $name;
         $name = tc_escape_string($name);
-        if (DBQuery::execute("DELETE FROM {$database['prefix']}Attachments WHERE blogid = $blogid AND parent = $parent AND name = '$name'") && (mysql_affected_rows() == 1)) {
+        if (DBQuery::execute("DELETE FROM {$database['prefix']}Attachments WHERE blogid = $blogid AND parent = $parent AND name = '$name'")) {
             unlink(ROOT . "/attach/$blogid/$origname");
         } else {

trunk/lib/model/blog.blogSetting.php

@@ -86 +86 @@
     if (!checkBlogName($name))
         return 1;
-    if (mysql_num_rows(DBQuery::query("select * from {$database['prefix']}ReservedWords where '$name' like word")) > 0)
+    if (DBQuery::queryCount("SELECT * FROM {$database['prefix']}ReservedWords WHERE '$name' like word") > 0)
         return 2;
-    if (mysql_num_rows(DBQuery::query("select * from {$database['prefix']}BlogSettings where name = 'name' and value = '$name'")) > 0)
+    if (DBQuery::queryCount("SELECT * FROM {$database['prefix']}BlogSettings WHERE name = 'name' AND value = '$name'") > 0)
         return 3;
     if(setBlogSetting('name', $name)) {
@@ -310 +310 @@
         $blogName = $identify;
 
-        $result = DBQuery::query("SELECT * 
+        $result = DBQuery::queryCount("SELECT * 
             FROM `{$database['prefix']}ReservedWords` 
             WHERE word = '$blogName'");
-        if ($result && (mysql_num_rows($result) > 0)) {
+        if ($result && $result > 0) {
             return 60;  // Reserved blog name.
         }
-        $result = DBQuery::query("SELECT value 
+        $result = DBQuery::queryCount("SELECT value 
             FROM `{$database['prefix']}BlogSettings` 
             WHERE name = 'name' AND value = '$blogName'");
-        if ($result && (mysql_num_rows($result) > 0)) {
+        if ($result && $result > 0) {
             return 61; // Same blogname is already exists.
         }

trunk/lib/model/blog.category.php

@@ -315 +315 @@
 function updateEntriesOfCategory($blogid, $id = - 1) {
     global $database;
-    $result = DBQuery::query("SELECT * FROM {$database['prefix']}Categories WHERE blogid = $blogid AND parent IS NULL");
-    while ($row = mysql_fetch_array($result)) {
+    $result = DBQuery::queryAll("SELECT * FROM {$database['prefix']}Categories WHERE blogid = $blogid AND parent IS NULL");
+    foreach($result as $row) {
         $parent = $row['id'];
         $parentName = UTF8::lessenAsEncoding($row['name'], 127);
@@ -322 +322 @@
         $countParent = DBQuery::queryCell("SELECT COUNT(id) FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 AND visibility > 0 AND category = $parent");
         $countInLoginParent = DBQuery::queryCell("SELECT COUNT(id) FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0 AND category = $parent");
-        $result2 = DBQuery::query("SELECT * FROM {$database['prefix']}Categories WHERE blogid = $blogid AND parent = $parent");
-        while ($rowChild = mysql_fetch_array($result2)) {
+        $result2 = DBQuery::queryAll("SELECT * FROM {$database['prefix']}Categories WHERE blogid = $blogid AND parent = $parent");
+        foreach ($result2 as $rowChild) {
             $label = tc_escape_string(UTF8::lessenAsEncoding($parentName . '/' . $rowChild['name'], 255));
             $rowChild['name'] = tc_escape_string(UTF8::lessenAsEncoding($rowChild['name'], 127));
@@ -374 +374 @@
     $myPriority = $row['myPriority'];
     $sql = "SELECT count(*) FROM {$database['prefix']}Categories WHERE parent = $myId AND blogid = $blogid";
-    $myIsHaveChild = (mysql_result(DBQuery::query($sql), 0, 0) > 0) ? true : false;
+    $myIsHaveChild = (DBQuery::queryCell($sql) > 0) ? true : false;
     $aux = $parentId == 'NULL' ? 'parent is null' : "parent = $parentId";
     $sql = "SELECT id, parent, priority FROM {$database['prefix']}Categories WHERE $aux AND blogid = $blogid AND priority $sign $myPriority ORDER BY priority $arrange LIMIT 1";
@@ -411 +411 @@
                                 id = $myId AND blogid = $blogid";
                 DBQuery::query($sql);
-                $sql = "SELECT id, priority FROM {$database['prefix']}Categories WHERE parent = $nextId AND blogid = $blogid ORDER BY priority LIMIT 1";
-                $result = DBQuery::query($sql);
-                $row = mysql_fetch_array($result);
+                $sql = "SELECT id, priority FROM {$database['prefix']}Categories WHERE parent = $nextId AND blogid = $blogid ORDER BY priority";
+                $row = DBQuery::queryRow($sql);
                 $nextId = is_null($row['id']) ? 'NULL' : $row['id'];
                 $nextPriority = is_null($row['priority']) ? 'NULL' : $row['priority'];
@@ -455 +454 @@
             if ($overlapCount > 0) {
                 $sql = "SELECT `id`, `parent`, `priority` FROM `{$database['prefix']}Categories` WHERE `parent` IS NULL AND `blogid` = $blogid AND `priority` $sign $parentPriority ORDER BY `priority` $arrange";
-                $result = DBQuery::query($sql);
-                while ($row = mysql_fetch_array($result)) {
+                $result = DBQuery::queryAll($sql);
+                foreach($result as $row) {
                     $nextId = $row['id'];
                     $nextParentId = $row['parent'];
@@ -479 +478 @@
                 $sql = "UPDATE {$database['prefix']}Categories SET parent = NULL WHERE id = $myId AND blogid = $blogid";
                 DBQuery::query($sql);
-                $sql = "SELECT id, priority FROM {$database['prefix']}Categories WHERE parent is null AND blogid = $blogid AND priority $sign $parentPriority ORDER BY priority $arrange LIMIT 1";
-                $result = DBQuery::query($sql);
-                $row = mysql_fetch_array($result);
+                $sql = "SELECT id, priority FROM {$database['prefix']}Categories WHERE parent is null AND blogid = $blogid AND priority $sign $parentPriority ORDER BY priority $arrange";
+                $row = DBQuery::queryRow($sql);
                 $nextId = is_null($row['id']) ? 'NULL' : $row['id'];
                 $nextPriority = is_null($row['priority']) ? 'NULL' : $row['priority'];