Changeset 12447

Timestamp:

02/14/08 14:44:02 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Further caching updates for cron, and some nid/vid stuff

Files:

• util/branches/dev/jsdoc/jsdoc.module (modified) (4 diffs)

util/branches/dev/jsdoc/jsdoc.module

@@ -438 +438 @@
       foreach (jsdoc_projects() as $project) {
         $version = jsdoc_version_node_load('HEAD', $project);
+        $query = db_query("SELECT vid FROM {jsdoc_resources} WHERE used = 0");
+        while ($result = db_fetch_object($query)) {
+          $object_query = db_query("SELECT MAX(vid) AS vid FROM {jsdoc_objects} WHERE resource_vid = %d OR provide_vid = %d GROUP BY nid");
+          if ($vid = db_result($object_query)) {
+            db_query("UPDATE {jsdoc_objects} SET used = 0 WHERE vid = %d", $vid);
+          }
+        }
         db_query("UPDATE {jsdoc_resources} SET used = 0 WHERE used = 1 AND version = %d", $version->nid);
       }
@@ -593 +600 @@
 
       // TODO: Delete items from cache
-      if (!db_result(db_query("SELECT 1 FROM {jsdoc_objects} WHERE used = 0 UNION SELECT 1 FROM {jsdoc_resources} WHERE used = 0"))) {
+      if (!db_result(db_query("SELECT 1 FROM {jsdoc_resources} WHERE used = 0"))) {
         // If all items are used (typically happens the first pass), then none of them are new.
         // We can do this because if nothing is missing, then all then new things are really new.
         db_query("UPDATE {jsdoc_objects} SET new = 0");
-        db_query("UPDATE {jsdoc_resources} SET new = 0");
       }
     }
@@ -3478 +3484 @@
     while ($term = db_fetch_object($result)) {
       if ($term->parent_vid) {
-        $children[$term->parent_vid][] = $term->vid;
-        $parents[$term->vid][] = array($term->parent_nid, $term->parent_vid);
-      }
-      $terms[$term->vid] = $term;
+        $children[$term->parent_nid][] = $term->nid;
+        $parents[$term->nid][] = array($term->parent_nid, $term->parent_vid);
+      }
+      $terms[$term->nid] = $term;
     }
   }
@@ -3641 +3647 @@
 
 function _jsdoc_cron_validate_include() {
-  if (db_result(db_query("SELECT 1 FROM {jsdoc_objects} WHERE used = 0 UNION SELECT 1 FROM {jsdoc_resources} WHERE used = 0"))) {
+  if (db_result(db_query("SELECT 1 FROM {jsdoc_objects} WHERE used = 0"))) {
     watchdog('jsdoc', t('Update code changes before running cron'), WATCHDOG_ERROR);
     return false;