Changeset 12622

Timestamp:

02/22/08 13:21:21 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Make sure the resource tree is build properly

Files:

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

util/branches/dev/jsdoc/jsdoc.module

@@ -367 +367 @@
     $files = variable_get('jsdoc_cron_files', array());
     if (!empty($files)) {
+      // Call this without caring about its return, just to handle any set up it does
       call_user_func(_jsdoc_base() . '_get_files');
       print count($files) . ' files left<br>';
@@ -403 +404 @@
 
       $ignores = array();
-      $query = db_query("SELECT parent.title FROM jsdoc_variable_hierarchy AS jvh JOIN node AS child ON (child.vid = jvh.vid) JOIN jsdoc_objects AS jschild ON (jschild.vid = jvh.nid) JOIN node AS parent ON (parent.vid = jvh.parent_vid) WHERE jvh.type NOT IN ('cascading', 'normal', 'alias') AND (parent.title LIKE 'dojo.%'  OR parent.title LIKE 'dojox.%' OR parent.title LIKE 'dijit.%') AND jschild.private = 0 AND jschild.private_parent = 0 GROUP BY BINARY parent.title ORDER BY parent.title");
+      $query = db_query("SELECT parent.title FROM {jsdoc_variable_hierarchy} AS jvh JOIN {node} AS child ON (child.vid = jvh.vid) JOIN {jsdoc_objects} AS jschild ON (jschild.vid = jvh.nid) JOIN {node} AS parent ON (parent.vid = jvh.parent_vid) WHERE jvh.type NOT IN ('cascading', 'normal', 'alias') AND (parent.title LIKE 'dojo.%'  OR parent.title LIKE 'dojox.%' OR parent.title LIKE 'dijit.%') AND jschild.private = 0 AND jschild.private_parent = 0 GROUP BY BINARY parent.title ORDER BY parent.title");
       while ($result = db_fetch_object($query)) {
         $ignores[] = $result->title;
       }
       $namespaces = array();
-      $query = db_query("SELECT parent.title FROM jsdoc_variable_hierarchy AS jvh JOIN node AS child ON (child.vid = jvh.vid) JOIN jsdoc_objects AS jschild ON (jschild.vid = jvh.nid) JOIN node AS parent ON (parent.vid = jvh.parent_vid) WHERE jvh.type = 'normal' AND (parent.title LIKE 'dojo.%'  OR parent.title LIKE 'dojox.%' OR parent.title LIKE 'dijit.%') AND jschild.private = 0 AND jschild.private_parent = 0 GROUP BY BINARY parent.title ORDER BY parent.title");
+      $query = db_query("SELECT parent.title FROM {jsdoc_variable_hierarchy} AS jvh JOIN {node} AS child ON (child.vid = jvh.vid) JOIN {jsdoc_objects} AS jschild ON (jschild.vid = jvh.nid) JOIN {node} AS parent ON (parent.vid = jvh.parent_vid) WHERE jvh.type = 'normal' AND (parent.title LIKE 'dojo.%'  OR parent.title LIKE 'dojox.%' OR parent.title LIKE 'dijit.%') AND jschild.private = 0 AND jschild.private_parent = 0 GROUP BY BINARY parent.title ORDER BY parent.title");
       while ($result = db_fetch_object($query)) {
         $found = false;
@@ -423 +424 @@
       cache_set('jsdoc_namespaces', 'cache', serialize($namespaces));
 
-      $timestamp = variable_get('jsdoc_cron_time', 0);
-      if ($timestamp && time() - $timestamp < 43200) {
-        // 12 hours
-        // return;
-      }
-      variable_set('jsdoc_cron_time', time());
-
+      // Build an array of ctimes from our cache table
       $file_ctimes = array();
       $query = db_query("SELECT ctime, cid, namespace, filepath FROM {jsdoc_cache}");
@@ -439 +434 @@
       }
 
-      $count = 0;
       while (count($files)) {
         $list = array_shift($files);
@@ -450 +444 @@
         }
 
-        ++$count;
         list($namespace, $file_name) = $list;
         unset($list);
@@ -458 +451 @@
           print 'FINISHED';
         }
+        flush();
         ob_flush();
-        flush();
-
-        set_time_limit(300); // 5 minutes
+
+        set_time_limit(60); // 1 minute
         // Cache the results from a parse in the file and reuse it if we can.
         $cache_dir = _jsdoc_get_base_path() . '/' . drupal_get_path('module', 'jsdoc') . '/cache/';
@@ -570 +563 @@
       }
 
-      // TODO: Delete items from cache
       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.
+        // If all items are used, 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");
       }
@@ -2974 +2967 @@
   }
   if ($prototype) {
-    if ($parent = jsdoc_object_node_load($prototype, jsdoc_get_project($node), jsdoc_get_version($node), $node->jsdoc_provide_nids)) {
+    if ($parent = jsdoc_object_node_load($prototype, jsdoc_get_project($node), jsdoc_get_version($node), jsdoc_get_resources($node)->jsdoc_provide_nids)) {
       return jsdoc_get_prototype_chain($parent, $environments, $output);
     }
@@ -3079 +3072 @@
   if ($parents[$parent]) {
     foreach ($parents[$parent] as $parent) {
-      if (isset($terms[$parent[1]])) {
-        $term = $terms[$parent[1]];
+      if (isset($terms[$parent[0]])) {
+        $term = $terms[$parent[0]];
       }
       else {
@@ -3088 +3081 @@
 
       $term->depth = $depth;
-      $term->children = $children[$parent[1]];
+      $term->children = $children[$parent[0]];
       $tree[] = $term;
 
-      if ($parents[$parent[1]]) {
-        if (in_array($parent[1], $visited)) {
+      if ($parents[$parent[0]]) {
+        if (in_array($parent[0], $visited)) {
           return $tree;
         }
-        $visited[] = $parent[1];
-        $tree = array_merge($tree, _jsdoc_get_tree($environments, $parent[1], $depth, $visited));
+        $visited[] = $parent[0];
+        $tree = array_merge($tree, _jsdoc_get_tree($environments, $parent[0], $depth, $visited));
       }
     }