Changeset 12444

Timestamp:

02/14/08 13:03:39 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Further caching updates for cron

Location:

util

Files:

• branches/dev/jsdoc/jsdoc.module (modified) (6 diffs)
• branches/dev/jsdoc/template.php (modified) (1 diff)
• trunk/docscripts/includes/dojo.inc (modified) (1 diff)

util/branches/dev/jsdoc/jsdoc.module

@@ -468 +468 @@
         else{
           variable_set('jsdoc_cron_files', $files);
-          if (empty($files)) {
-            break;
-          }
         }
 
@@ -478 +475 @@
         unset($contents);
         print "$file_name<br>";
+        if (empty($files)) {
+          print 'FINISHED';
+        }
         ob_flush();
         flush();
@@ -485 +485 @@
         $cache_dir = _jsdoc_get_base_path() . '/' . drupal_get_path('module', 'jsdoc') . '/cache/';
         $ctime = call_user_func(_jsdoc_base() . '_get_file_time', $namespace, $file_name);
+        $cache_hit = false;
         $query = db_query("SELECT ctime, cid, namespace, filepath FROM {jsdoc_cache} WHERE namespace = '%s' AND filepath = '%s'", $namespace, $file_name);
         if ($cache = db_fetch_object($query)) {
@@ -493 +494 @@
           }
           else {
-            print 'cache hit ' . $cache->filepath . '<br>';
+            $cache_hit = true;
             db_query("UPDATE {jsdoc_cache} SET used = 1 WHERE namespace = '%s' AND filepath = '%s'", $namespace, $file_name);
             $contents = unserialize(file_get_contents($cache_dir . $cache->cid));
@@ -510 +511 @@
           $resource_node = _jsdoc_resource_get_or_create($contents['#resource'], $namespace);
 
+          db_query("UPDATE {jsdoc_resources} SET used = 1 WHERE vid = %d", $provides_node->vid);
+          db_query("UPDATE {jsdoc_resources} SET used = 1 WHERE vid = %d", $resource_node->vid);
+
+          if ($cache_hit) {
+            if (!$resource_node->is_new) {
+              continue;
+            }
+            print 'cache hit ' . $cache->filepath . '<br>';
+          }
+
           db_query("UPDATE {jsdoc_objects} SET used = 0 WHERE used = 1 AND version = %d AND resource_vid = %d", $version->nid, $resource_node->vid);
 
           unset($project);
           unset($version);
-
-          db_query("UPDATE {jsdoc_resources} SET used = 1 WHERE vid = %d", $provides_node->vid);
-          db_query("UPDATE {jsdoc_resources} SET used = 1 WHERE vid = %d", $resource_node->vid);
 
           db_query("DELETE FROM {jsdoc_resource_hierarchy} WHERE nid = %d AND version = %d", $provides_node->nid, jsdoc_get_version($provides_node)->nid);
@@ -3729 +3737 @@
         return false;
     }
+    $last = variable_get('jsdoc_cron_file_ctime', 0);
+    $current = filectime(_jsdoc_file_location());
+    if ($last != $current) {
+      variable_set('jsdoc_cron_file_ctime', $current);
+      db_query("DELETE FROM jsdoc_cache");
+    }
     include_once(_jsdoc_file_location());
   }

util/branches/dev/jsdoc/template.php

@@ -8 +8 @@
 // Use these functions to create the equivalent tpl.php files
 
-function phptemplate_jsdoc_object_resources($node) {
-  return _phptemplate_callback('jsdoc_object_resources', array('node' => $node));
+// function theme_jsdoc_object_children($children) {
+function phptemplate_jsdoc_object_children($children) {
+  return _phptemplate_callback('jsdoc_object_children', array('children' => $children));
 }
-
-function phptemplate_jsdoc_object_type($node) {
-  return _phptemplate_callback('jsdoc_object_type', array('node' => $node));
-}
-
-/**
- * Theme the statement used to require this file
- */
-function phptemplate_jsdoc_object_require($node) {
-  return _phptemplate_callback('jsdoc_object_require', array('node' => $node));
-}
-
-function phptemplate_jsdoc_function($node) {
-  return _phptemplate_callback('jsdoc_function', array('node' => $node));
-}
-
-function phptemplate_jsdoc_object($node) {
-  return _phptemplate_callback('jsdoc_object', array('node' => $node));
-}
-
-function phptemplate_jsdoc_object_parent($node) {
-  return _phptemplate_callback('jsdoc_object_parent', array('node' => $node));
-}
-
-function phptemplate_jsdoc_class_list($nodes) {
-  return _phptemplate_callback('jsdoc_class_list', array('nodes' => $nodes));
-}
-
-function phptemplate_jsdoc_function_list($nodes) {
-  return _phptemplate_callback('jsdoc_function_list', array('nodes' => $nodes));
-}
-
-function phptemplate_jsdoc_field_list($nodes) {
-  return _phptemplate_callback('jsdoc_field_list', array('nodes' => $nodes));
-}
-
-function phptemplate_jsdoc_any_list($nodes) {
-  return _phptemplate_callback('jsdoc_any_list', array('nodes' => $nodes));
-}

util/trunk/docscripts/includes/dojo.inc

@@ -203 +203 @@
       $output[$name]['chains']['prototype'][] = $args[2]->getVariable();
       $output[$name]['chains']['call'][] = $args[2]->getVariable();
-      $output[$name]['mixins']['prototype'][] = $args[2]->getVariable() . '.prototype';
     }
     elseif ($args[2]->isA(DojoArray)) {