Changeset 13205

Timestamp:

03/25/08 16:43:24 (10 months ago)

Author:

pottedmeat

Message:

Refs #5602. Merge dev branch back into trunk

Location:

util/trunk/jsdoc

Files:

• INSTALL (modified) (2 diffs)
• jsdoc.css (modified) (1 diff)
• jsdoc.install (modified) (3 diffs)
• jsdoc.js (added)
• jsdoc.module (modified) (77 diffs)
• LICENSE (modified) (1 diff)
• template.php (added)
• THEMING (added)

util/trunk/jsdoc/INSTALL

@@ -5 +5 @@
 =================
 
-http://drupal.org/drupal-5.1 (tested on 5.1 at the time of this writing)
+http://drupal.org/drupal-5.7 (tested on 5.7 at the time of this writing)
 http://drupal.org/getting-started/5/install
 
@@ -16 +16 @@
 =====================
 
+http://drupal.org/node/70151
 Drop the jsdoc folder into sites/all/modules
 

util/trunk/jsdoc/jsdoc.css

@@ -1 @@
-/**
- * GeSHi Dynamically Generated Stylesheet
- * --------------------------------------
- * Dynamically generated stylesheet for javascript
- * CSS class: javascript, CSS id: 
- * GeSHi (C) 2004 - 2007 Nigel McNie (http://qbnz.com/highlighter)
- */
-.javascript .de1, .javascript .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;}
-.javascript  {}
-.javascript .head {}
-.javascript .foot {}
-.javascript .imp {font-weight: bold; color: red;}
-.javascript .ln-xtra {color: #cc0; background-color: #ffc;}
-.javascript li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;}
-.javascript li.li2 {font-weight: bold;}
-.javascript .kw1 {color: #000066; font-weight: bold;}
-.javascript .kw2 {color: #003366; font-weight: bold;}
+/* GeSHi (c) Nigel McNie 2004 (http://qbnz.com/highlighter) */
+.javascript .de1, .javascript .de2 {font-weight:normal;background:transparent;color:#000; padding-left: 5px;}
+.javascript .kw1 {color: #a1a100;}
+.javascript .kw2 {color: #000; font-weight: bold;}
 .javascript .kw3 {color: #000066;}
-.javascript .co1 {color: #009900; font-style: italic;}
-.javascript .coMULTI {color: #009900; font-style: italic;}
-.javascript .es0 {color: #000099; font-weight: bold;}
+.javascript .kw4 {color: #f63333;}
+.javascript .co1, .javascript .co2, .javascript .coMULTI {color: #808080;}
+.javascript .es0 {color: #000033; font-weight: bold;}
 .javascript .br0 {color: #66cc66;}
-.javascript .st0 {color: #3366CC;}
-.javascript .nu0 {color: #CC0000;}
-.javascript .me1 {color: #006600;}
-.javascript .sc0 {}
-.javascript .sc1 {}
-.javascript .sc2 {}
-.javascript .sc3 {}
-.javascript .re0 {color: #0066FF;}
-/**
- * GeSHi Dynamically Generated Stylesheet
- * --------------------------------------
- * Dynamically generated stylesheet for javascript
- * CSS class: javascript, CSS id: 
- * GeSHi (C) 2004 - 2007 Nigel McNie (http://qbnz.com/highlighter)
- */
-.javascript .de1, .javascript .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;}
-.javascript  {}
-.javascript .head {}
-.javascript .foot {}
-.javascript .imp {font-weight: bold; color: red;}
-.javascript .ln-xtra {color: #cc0; background-color: #ffc;}
-.javascript li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;}
-.javascript li.li2 {font-weight: bold;}
-.javascript .kw1 {color: #000066; font-weight: bold;}
-.javascript .kw2 {color: #003366; font-weight: bold;}
-.javascript .kw3 {color: #000066;}
-.javascript .kw4 {color: #600000;}
-.javascript .co1 {color: #009900; font-style: italic;}
-.javascript .coMULTI {color: #009900; font-style: italic;}
-.javascript .es0 {color: #000099; font-weight: bold;}
-.javascript .br0 {color: #66cc66;}
-.javascript .st0 {color: #3366CC;}
-.javascript .nu0 {color: #CC0000;}
-.javascript .me1 {color: #006600;}
-.javascript .sc0 {}
-.javascript .sc1 {}
-.javascript .sc2 {}
-.javascript .sc3 {}
-.javascript .re0 {color: #0066FF;}
-/**
- * GeSHi Dynamically Generated Stylesheet
- * --------------------------------------
- * Dynamically generated stylesheet for javascript
- * CSS class: javascript, CSS id: 
- * GeSHi (C) 2004 - 2007 Nigel McNie (http://qbnz.com/highlighter)
- */
-.javascript .de1, .javascript .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;}
-.javascript  {}
-.javascript .head {}
-.javascript .foot {}
-.javascript .imp {font-weight: bold; color: red;}
-.javascript .ln-xtra {color: #cc0; background-color: #ffc;}
-.javascript li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;}
-.javascript li.li2 {font-weight: bold;}
-.javascript .kw1 {color: #000066; font-weight: bold;}
-.javascript .kw2 {color: #003366; font-weight: bold;}
-.javascript .kw3 {color: #000066;}
-.javascript .co1 {color: #009900; font-style: italic;}
-.javascript .coMULTI {color: #009900; font-style: italic;}
-.javascript .es0 {color: #000099; font-weight: bold;}
-.javascript .br0 {color: #66cc66;}
-.javascript .st0 {color: #3366CC;}
-.javascript .nu0 {color: #CC0000;}
-.javascript .me1 {color: #006600;}
-.javascript .sc0 {}
-.javascript .sc1 {}
-.javascript .sc2 {}
-.javascript .sc3 {}
-.javascript .re0 {color: #0066FF;}
-/**
- * GeSHi Dynamically Generated Stylesheet
- * --------------------------------------
- * Dynamically generated stylesheet for javascript
- * CSS class: javascript, CSS id: 
- * GeSHi (C) 2004 - 2007 Nigel McNie (http://qbnz.com/highlighter)
- */
-.javascript .de1, .javascript .de2 {font-family: 'Courier New', Courier, monospace; font-weight: normal;}
-.javascript  {}
-.javascript .head {}
-.javascript .foot {}
-.javascript .imp {font-weight: bold; color: red;}
-.javascript .ln-xtra {color: #cc0; background-color: #ffc;}
-.javascript li {font-family: 'Courier New', Courier, monospace; color: black; font-weight: normal; font-style: normal;}
-.javascript li.li2 {font-weight: bold;}
-.javascript .kw1 {color: #000066; font-weight: bold;}
-.javascript .kw2 {color: #003366; font-weight: bold;}
-.javascript .kw3 {color: #000066;}
-.javascript .co1 {color: #009900; font-style: italic;}
-.javascript .coMULTI {color: #009900; font-style: italic;}
-.javascript .es0 {color: #000099; font-weight: bold;}
-.javascript .br0 {color: #66cc66;}
-.javascript .st0 {color: #3366CC;}
-.javascript .nu0 {color: #CC0000;}
-.javascript .me1 {color: #006600;}
-.javascript .sc0 {}
-.javascript .sc1 {}
-.javascript .sc2 {}
-.javascript .sc3 {}
-.javascript .re0 {color: #0066FF;}
+.javascript .st0 {color: #ff0000;}
+.javascript .nu0 {color: #ff33ff;}
+.javascript .me0 {color: #006600;}
+
+.html4strict .de1, .html4strict .de2 {font-weight:normal;background:transparent;color:#000; padding-left: 5px;}
+.html4strict .kw1 {color: #a1a100;}
+.html4strict .kw2 {color: #000; font-weight: bold;}
+.html4strict .kw3 {color: #000066;}
+.html4strict .kw4 {color: #f63333;}
+.html4strict .co1, .html4strict .co2, .html4strict .coMULTI {color: #808080;}
+.html4strict .es0 {color: #000033; font-weight: bold;}
+.html4strict .br0 {color: #66cc66;}
+.html4strict .st0 {color: #ff0000;}
+.html4strict .nu0 {color: #ff33ff;}
+.html4strict .me0 {color: #006600;}

util/trunk/jsdoc/jsdoc.install

@@ -119 +119 @@
         updating bool NOT NULL DEFAULT 1, -- Flag for update the next go around
         returns varchar(255) NOT NULL,
+        return_summary longtext NOT NULL,
         source longtext NOT NULL,
         private boolean NOT NULL DEFAULT 0,
@@ -139 +140 @@
         parent_vid integer NOT NULL REFERENCES {node_revisions} (vid),
         parent_nid integer NOT NULL REFERENCES {node} (vid), -- node-type: jsdoc_variable
-        type enum('normal', 'prototype', 'instance', 'alias', 'chain', 'mixin'), -- The type of join
+        type enum('normal', 'cascading', 'prototype', 'instance', 'alias', 'chain', 'mixin'), -- The type of join
         subtype enum('call', 'prototype', '') DEFAULT '', -- The subtype of the join
         version integer NOT NULL REFERENCES {node} (nid), -- node-type: jsdoc_version
@@ -180 +181 @@
         weight integer NOT NULL,
         example longtext NOT NULL,
+        markedup longtext NOT NULL,
       PRIMARY KEY (vid, weight)
       ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");

util/trunk/jsdoc/jsdoc.module

@@ -67 +67 @@
       'access' => false
     );
+
+    $items[] = array(
+      'path' => 'jsdoc/jsonp',
+      'type' => MENU_CALLBACK,
+      'callback' => 'jsdoc_jsonp',
+      'access' => true
+    );
+
+    $items[] = array(
+      'path' => 'jsdoc/jsonp',
+      'type' => MENU_CALLBACK,
+      'callback' => 'jsdoc_jsonp',
+      'access' => true
+    );
+
+    $items[] = array(
+      'path' => 'jsdoc/ide',
+      'type' => MENU_CALLBACK,
+      'callback' => 'jsdoc_ide',
+      'access' => true
+    );
   }
   else {
-    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 OR new = 1"))) {
       $items[] = array('path' => 'jsdoc/manage',
         'title' => t('Manage Documentation Changes'),
@@ -79 +100 @@
     }
 
-    if (arg(0) == 'jsdoc' && arg(3) == 'resource') {
-      // jsdoc/namespace/'HEAD'/'resource'/resource
-
-      $node = jsdoc_resource_node_load(arg(1), arg(2), str_replace('__', '/', arg(4)));
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/resource/' . arg(4),
-        'title' => t('View'),
-        'callback' => 'jsdoc_resource_node_view',
-        'callback arguments' => array($node),
-        'access' => node_access('view', $node),
-        'type' => MENU_CALLBACK,
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/resource/' . arg(4) . '/view',
-        'title' => t('View'),
-        'type' => MENU_DEFAULT_LOCAL_TASK,
-        'weight' => -10
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/resource/' . arg(4) . '/private',
-        'title' => t('View w/ Private'),
-        'callback' => 'jsdoc_resource_node_view',
-        'callback arguments' => array($node),
-        'access' => node_access('view', $node),
-        'weight' => -9,
-        'type' => MENU_LOCAL_TASK
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/resource/' . arg(4) . '/edit',
-        'title' => t('Edit'),
-        'callback' => 'jsdoc_resource_edit_redirect',
-        'callback arguments' => array($node),
-        'access' => node_access('update', $node),
-        'weight' => 1,
-        'type' => MENU_LOCAL_TASK
-      );
-    }
-
-    if (arg(0) == 'jsdoc' && arg(3) == 'object' && arg(4)) {
-      // jsdoc/namespace/'HEAD'/'object'/resource/object
-      if (arg(5) && arg(5) != 'view' && arg(5) != 'edit' && arg(5) != 'private') {
-        $item = arg(4) . '/' . arg(5);
-        $detail = $node = jsdoc_object_node_load(arg(1), arg(2), arg(5), str_replace('__', '/', arg(4)));
-      }
-      // jsdoc/namespace/'HEAD'/'object'/object
-      else {
-        $item = arg(4);
-        $detail = $node = jsdoc_object_node_load(arg(1), arg(2), arg(4));
-      }
-
-      if ($node->jsdoc_detail) {
-        $detail = $node->jsdoc_detail;
-      }
-      $items[] = array('path' => 'jsdoc/' . arg(1) . '/' . arg(2) . '/object/' . $item,
-        'title' => t('View'),
-        'callback' => 'jsdoc_object_node_view',
-        'callback arguments' => array($node),
-        'access' => node_access('view', $node),
-        'type' => MENU_CALLBACK
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/view',
-        'title' => t('View'),
-        'type' => MENU_DEFAULT_LOCAL_TASK,
-        'weight' => -10
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/private',
-        'title' => t('View w/ Private'),
-        'callback' => 'jsdoc_object_node_view',
-        'callback arguments' => array($node, null, true),
-        'access' => node_access('view', $node),
-        'weight' => -9,
-        'type' => MENU_LOCAL_TASK
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/edit',
-        'title' => t('Edit'),
-        'callback' => 'jsdoc_object_edit_redirect',
-        'callback arguments' => array($node),
-        'access' => node_access('update', $node),
-        'weight' => 1,
-        'type' => MENU_LOCAL_TASK
-      );
-      $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/edit/' . arg(6),
-        'title' => t('Edit'),
-        'callback' => 'jsdoc_object_edit_redirect',
-        'callback arguments' => array($node, arg(6)),
-        'access' => node_access('update', $node),
-        'weight' => 1,
-        'type' => MENU_LOCAL_TASK
-      );
-
-      if ($detail->jsdoc_type == 'Function') {
-        if ($detail->jsdoc_classlike || $detail->jsdoc_initialized) {
-          $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/view/init',
-            'title' => t('Initialized'),
-            'type' => MENU_DEFAULT_LOCAL_TASK,
-            'weight' => -10
-          );
-          if (!$detail->jsdoc_initialized) {
-            $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/view/normal',
-              'title' => t('Uninitialized'),
-              'callback' => 'jsdoc_object_node_view',
-              'callback arguments' => array($node, false),
-              'access' => node_access('view', $node),
-              'type' => MENU_LOCAL_TASK
-            );
-            $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/private/init',
-              'title' => t('Initialized'),
-              'type' => MENU_DEFAULT_LOCAL_TASK,
-              'weight' => -10
-            );
-            $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/private/normal',
-              'title' => t('Uninitialized'),
-              'callback' => 'jsdoc_object_node_view',
-              'callback arguments' => array($node, false, true),
-              'access' => node_access('view', $node),
-              'type' => MENU_LOCAL_TASK
+    if (arg(0) == 'jsdoc' && arg(1) != 'jsonp') {
+      $project = false;
+      $version = false;
+      $resource = false;
+      $name = '';
+      $path = '';
+      if (arg(4)) {
+        // If we have 4 arguments, assume that we've been passed a resource
+        $project = arg(1);
+        $version = arg(2);
+        $resource = str_replace('__', '/', arg(3));
+        $name = arg(4);
+        $path = "jsdoc/$project/$version/" . arg(3) . "/$name";
+
+        // TODO: Remove this once search engines have stopped indexing it.
+        if ($resource == 'object') {
+          drupal_goto("jsdoc/$project/$version/$name");
+        }
+      }
+      elseif (arg(3)) {
+        // If we have 3 arguments, assume that we don't have a resource
+        $project = arg(1);
+        $version = arg(2);
+        $name = arg(3);
+        $path = "jsdoc/$project/$version/$name";
+      }
+      elseif (arg(2)) {
+        // If we have 2 arguments, assume that we don't have a resource or project
+        // So basically, we assume that version is more important than project
+        $version = arg(1);
+        $name = arg(2);
+        $path = "jsdoc/$version/$name";
+      }
+      elseif (arg(1)) {
+        // Allow the user to only pass the name
+        $name = arg(1);
+        $path = "jsdoc/$name";
+      }
+
+      if ($node = jsdoc_object_nodes_load($name, $project, $version, $resource)) {
+        if (count($node) == 1) {
+          $node = $node[0];
+          jsdoc_current_node($node);
+        }
+        $item = array(
+          'path' => $path,
+          'title' => t('View'),
+          'access' => node_access('view', $node),
+          'type' => MENU_CALLBACK
+        );
+        if (is_array($node)) {
+          $item['callback'] = 'jsdoc_variables_node_view';
+          $item['callback arguments'] = array($node);
+        }
+        else {
+          if ($node->type == 'jsdoc_object') {
+            $item['callback'] = 'jsdoc_object_node_view';
+            $item['callback arguments'] = array($node);
+          }
+          else {
+            $item['callback'] = 'jsdoc_variable_node_view';
+            $item['callback arguments'] = array($node);
+          }
+        }
+        $items[] = $item;
+      }
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Impelementation of hook_block
+ */
+function jsdoc_block($op='list', $delta=0) {
+  if (module_exists('search')) {
+    if ($op == 'list') {
+      $block[0]['info'] = t('JavaScript Documentation Search');
+      $block[1]['info'] = t('JavaScript Namespace List');
+      return $block;
+    }
+    elseif ($op == 'view') {
+      if ($delta == 0) {
+        $block['subject'] = 'Search';
+        $block['content'] = preg_replace('%ignore.*endignore%s', theme('jsdoc_search', 'search'), drupal_get_form('_jsdoc_block_search'));
+        return $block;
+      }
+      elseif ($delta == 1) {
+        $namespaces = array();
+
+        $current = jsdoc_current_node();
+
+        if ($_GET['jsdoc_project'] || $current) {
+          if ($_GET['jsdoc_project']) {
+            $project_title = $_GET['jsdoc_project'];
+          }
+          else {
+            $project_title = jsdoc_get_project($current)->title;
+          }
+
+          foreach (jsdoc_projects() as $project) {
+            if ($project->title != $project_title) {
+              $namespaces[] = (object)array(
+                'title' => $project->title,
+                'url' => url($_GET['q'], 'jsdoc_project=' . $project->title),
+                'a' => l($project->title, $_GET['q'], array(), 'jsdoc_project=' . $project->title)
+              );
+            }
+            else {
+              if ($_GET['jsdoc_project']) {
+                $version = jsdoc_version_node_load('HEAD', $_GET['jsdoc_project']);
+                $project = jsdoc_get_project($version);
+              }
+              else {
+                $version = jsdoc_get_version($current);
+                $project = jsdoc_get_project($current);
+              }
+
+              if (!($all_namespaces = cache_get('jsdoc_namespaces_' . $project->title, 'cache'))) {
+                $all_namespaces = array();
+              }
+              else {
+                $all_namespaces = unserialize($all_namespaces->data);
+              }
+              if (empty($all_namespaces[$version->nid])) {
+                $query = db_query("SELECT n.title, n.nid, n.vid, jo.type AS jsdoc_type, jo.initialized AS jsdoc_initialized FROM {jsdoc_objects} jo JOIN {node} n ON (n.vid = jo.vid) WHERE jo.private = 0 AND jo.private_parent = 0 AND jo.version = %d AND (n.title = '%s' OR n.title LIKE '%s.%%') AND (jo.type = 'Object' OR (jo.type = 'Function' AND jo.initialized = 1)) GROUP BY BINARY n.title ORDER BY n.title", $version->nid, $project->title, $project->title);
+                while ($result = db_fetch_object($query)) {
+                  if (jsdoc_is_namespace($result)) {
+                    $all_namespaces[$version->nid][] = array($result->nid, $result->vid);
+                  }
+                }
+                cache_set('jsdoc_namespaces_' . $project->title, 'cache', serialize($all_namespaces));
+              }
+
+              foreach ($all_namespaces[$version->nid] as $namespace) {
+                $namespace = _jsdoc_node_load($namespace[0], $namespace[1]);
+                $children = false;
+
+                if ($_GET['jsdoc_object'] == $namespace->title) {
+                  $variables = jsdoc_get_child_variables($namespace);
+                  if (!empty($variables)) {
+                    foreach ($variables as $child) {
+                      $children[$child->title] = _jsdoc_get_object_themed($child);
+                    }
+                    uksort($children, "strnatcasecmp");
+                  }
+                }
+
+                $namespace = _jsdoc_get_object_themed($namespace);
+                $namespace->children = $children;
+                $namespace->url = url($namespace->title, $_GET['q'], 'jsdoc_project=' . $_GET['jsdoc_project'] . '&jsdoc_object=' . $namespace->title);
+                $namespace->a = l($namespace->title, $_GET['q'], array(), 'jsdoc_project=' . $_GET['jsdoc_project'] . '&jsdoc_object=' . $namespace->title);
+
+                $namespaces[] = $namespace;
+              }
+            }
+          }
+        }
+        else {
+          foreach (jsdoc_projects() as $project) {
+            $namespaces[] = (object)array(
+              'title' => $project->title,
+              'url' => url($_GET['q'], 'jsdoc_project=' . $project->title),
+              'a' => l($project->title, $_GET['q'], array(), 'jsdoc_project=' . $project->title)
             );
           }
         }
-        else {
-          $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/view/normal',
-            'title' => t('Uninitialized'),
-            'type' => MENU_DEFAULT_LOCAL_TASK,
-            'weight' => -10
-          );
-          $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/view/init',
-            'title' => t('Initialized'),
-            'callback' => 'jsdoc_object_node_view',
-            'callback arguments' => array($node, true),
-            'access' => node_access('view', $node),
-            'type' => MENU_LOCAL_TASK
-          );
-          $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/private/normal',
-            'title' => t('Uninitialized'),
-            'type' => MENU_DEFAULT_LOCAL_TASK,
-            'weight' => -10
-          );
-          $items[] = array('path' => 'jsdoc/'. arg(1) . '/' . arg(2) . '/object/' . $item . '/private/init',
-            'title' => t('Initialized'),
-            'callback' => 'jsdoc_object_node_view',
-            'callback arguments' => array($node, true, true),
-            'access' => node_access('view', $node),
-            'type' => MENU_LOCAL_TASK
-          );
-        }
-      }
-    }
-  }
-
-  return $items;
-}
-
-/**
- * shutdown function to make sure we always mark the last node processed.
- */
-function jsdoc_update_shutdown() {
-  global $last_change, $last_nid;
-
-  if ($last_change && $last_nid) {
-    variable_set('jsdoc_cron_last', $last_change);
-    variable_set('jsdoc_cron_last_nid', $last_nid);
-  }
+        //$namespaces = unserialize(cache_get('jsdoc_namespaces', 'cache')->data);
+        $block['subject'] = 'Objects';
+        $block['content'] = theme('jsdoc_namespaces', $namespaces);
+        return $block;
+      }
+    }
+  }
+}
+
+function _jsdoc_block_search() {
+  if (module_exists('search')) {
+    return array(
+      'ignore' => array(
+        '#value' => 'ignore'
+      ),
+      'search' => array(
+        '#type' => 'textfield'
+      ),
+      'go' => array(
+        '#type' => 'submit',
+        '#value' => 'Go'
+      ),
+      'endignore' => array(
+        '#value' => 'endignore'
+      )
+    );
+  }
+}
+
+function _jsdoc_block_search_submit($form_id, $form) {
+  $search = $form['search'];
+  if (strpos($search, ' ') === false) {
+    $query = db_query("SELECT title FROM {node} WHERE type = 'jsdoc_object' AND title = '%s' GROUP BY BINARY title", $search);
+    if (db_num_rows($query) == 1) {
+      $object = jsdoc_object_node_load(db_result($query));
+      watchdog('search', t('%keys (@type).', array('%keys' => $search, '@type' => 'JavaScript Documentation')), WATCHDOG_NOTICE, l(t('result'), $object->jsdoc_url));
+      drupal_goto($object->jsdoc_url);
+      return;
+    }
+    else {
+      $query = db_query("SELECT title FROM {node} WHERE type = 'jsdoc_object' AND title LIKE '%%%s%%' GROUP BY BINARY title", $search);
+      if (db_num_rows($query) == 1) {
+        $object = jsdoc_object_node_load(db_result($query));
+        watchdog('search', t('%keys (@type).', array('%keys' => $search, '@type' => 'JavaScript Documentation')), WATCHDOG_NOTICE, l(t('result'), $object->jsdoc_url));
+        drupal_goto($object->jsdoc_url);
+        return;
+      }
+    }
+  }
+
+  drupal_goto('search/jsdoc/' . $search);
 }
 
@@ -255 +337 @@
   $last = variable_get('jsdoc_cron_last', 0);
   $last_nid = variable_get('jsdoc_cron_last_nid', 0);
-  $limit = (int)variable_get('jsdoc_cron_limit', 100);
-
-  $result = db_query_range("SELECT GREATEST(IF(c.last_comment_timestamp IS NULL, 0, c.last_comment_timestamp), n.changed) as last_change, n.nid FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.type IN ('jsdoc_variable', 'jsdoc_resource') AND n.status = 1 AND ((GREATEST(n.changed, c.last_comment_timestamp) = %d AND n.nid > %d) OR (n.changed > %d OR c.last_comment_timestamp > %d)) ORDER BY GREATEST(n.changed, c.last_comment_timestamp) ASC, n.nid ASC", $last, $last_nid, $last, $last, $last, 0, $limit);
+  $limit = (int)variable_get('search_cron_limit', 500);
+
+  $result = db_query_range("SELECT GREATEST(IF(c.last_comment_timestamp IS NULL, 0, c.last_comment_timestamp), n.changed) as last_change, n.nid FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.type = 'jsdoc_variable' AND n.status = 1 AND ((GREATEST(n.changed, c.last_comment_timestamp) = %d AND n.nid > %d) OR (n.changed > %d OR c.last_comment_timestamp > %d)) ORDER BY GREATEST(n.changed, c.last_comment_timestamp) ASC, n.nid ASC", $last, $last_nid, $last, $last, $last, 0, $limit);
 
   while ($node = db_fetch_object($result)) {
@@ -264 +346 @@
     $node = _jsdoc_node_load($node->nid);
 
-    $text = '<h1>'. str_replace('.', ' ', $node->title) .'</h1>'. $node->title . ' ' . $node->teaser . ' ' . $node->body;
+    $text = '<h1>'. implode(' ', _jsdoc_build_terms($node->title)) . '</h1> ' . jsdoc_get_teaser($node) . ' ' . jsdoc_get_body($node);
 
     // Fetch extra data normally not visible
@@ -274 +356 @@
     // Update index
     search_index($node->nid, 'jsdoc_' . jsdoc_get_version($node)->title, $text);
+  }
+}
+
+/**
+ * shutdown function to make sure we always mark the last node processed.
+ */
+function jsdoc_update_shutdown() {
+  global $last_change, $last_nid;
+
+  if ($last_change && $last_nid) {
+    variable_set('jsdoc_cron_last', $last_change);
+    variable_set('jsdoc_cron_last_nid', $last_nid);
   }
 }
@@ -290 +384 @@
       $keys = search_query_insert($keys, 'project');
       $version = search_query_extract($keys, 'version');
+      if (empty($version)) {
+        $version = 'HEAD';
+        // TODO: Start using "ANY" here if no version is provided.
+      }
       $keys = search_query_insert($keys, 'version');
 
@@ -295 +393 @@
       $keys = search_query_insert($keys, 'private');
 
-      $private_sql = "";
+      $where = '1';
       if (!$private) {
-        $private_sql = " AND (jo.private = 0 OR jo.private IS NULL) ";
-      }
-
-      $project = _jsdoc_project_get_or_create($project);
-      $version = _jsdoc_version_get_or_create($version, $project);
-
-      $find = do_search(str_replace('.', ' ', $keys) . ' OR ' . $keys, 'jsdoc_' . $version->title, 'LEFT JOIN {jsdoc_objects} jo ON (i.sid = jo.nid) LEFT JOIN {jsdoc_resources} jr ON (i.sid = jr.nid)', '(jo.version = ' . $version->nid . ' OR jr.version = ' . $version->nid . ')' . $private_sql);
+        $where = "jo.private = 0 AND jo.private_parent = 0";
+      }
+
+      $find = do_search(
+        '(' . implode('), (', _jsdoc_build_terms($keys)) . ')',
+        'jsdoc_' . $version,
+        "INNER JOIN {node} n ON (n.nid = i.sid) INNER JOIN {node} n2 ON (n2.title = n.title AND BINARY n2.title = BINARY n.title AND n2.type = 'jsdoc_object') INNER JOIN {jsdoc_objects} jo ON (jo.vid = n2.vid) INNER JOIN {jsdoc_versions} jv ON (jv.nid = jo.version) INNER JOIN {node} n4 ON (n4.nid = jv.project)",
+        $where,
+        array(),
+        'i.relevance + (15 / CHAR_LENGTH(n.title)) AS score',
+        "INNER JOIN {node} n ON (n.nid = i.sid)"
+      );
       $results = array();
       foreach ($find as $item) {
@@ -317 +420 @@
           'node' => $node,
           'score' => $item->score,
-          'snippet' => ($node->teaser) ? search_excerpt($keys, $node->teaser) : ''
+          'snippet' => (jsdoc_get_teaser($node)) ? search_excerpt($keys, jsdoc_get_teaser($node)) : ''
         );
       }
@@ -328 +431 @@
  */
 function jsdoc_search_validate($form_id, $form_values, $form) {