=== modified file 'sites/all/modules/project/legacy_paths/project_legacy_paths.info'
--- sites/all/modules/project/legacy_paths/project_legacy_paths.info	2010-04-23 01:32:08 +0000
+++ sites/all/modules/project/legacy_paths/project_legacy_paths.info	2010-07-10 21:37:12 +0000
@@ -5,16 +5,9 @@
 dependencies[] = project
 core = 6.x
 
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
+; Information added by d.o-cvs-to-bzr export/import script on 2010-07-10
 version = "6.x-1.x-dev"
 core = "6.x"
 project = "project"
-datestamp = "1271986273"
-
-
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "project"
-datestamp = "1271986320"
+datestamp = "1278738783"
 

=== modified file 'sites/all/modules/project/legacy_paths/project_legacy_paths.module'
--- sites/all/modules/project/legacy_paths/project_legacy_paths.module	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/legacy_paths/project_legacy_paths.module	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project_legacy_paths.module,v 1.1 2009/01/12 22:57:50 dww Exp $
+// $Id: project_legacy_paths.module,v 1.2 2010/07/08 23:16:17 dww Exp $
 
 /**
  * @file Redirect project browsing paths from the Drupal 5 form to the Drupal 6 form.

=== modified file 'sites/all/modules/project/package/project_package.info'
--- sites/all/modules/project/package/project_package.info	2010-04-23 01:32:08 +0000
+++ sites/all/modules/project/package/project_package.info	2010-07-10 21:37:12 +0000
@@ -7,16 +7,9 @@
 dependencies[] = views
 core = 6.x
 
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
+; Information added by d.o-cvs-to-bzr export/import script on 2010-07-10
 version = "6.x-1.x-dev"
 core = "6.x"
 project = "project"
-datestamp = "1271986273"
-
-
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "project"
-datestamp = "1271986320"
+datestamp = "1278738783"
 

=== modified file 'sites/all/modules/project/project.inc'
--- sites/all/modules/project/project.inc	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/project.inc	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project.inc,v 1.148 2010/04/22 06:10:24 thehunmonkgroup Exp $
+// $Id: project.inc,v 1.149 2010/04/23 23:23:58 dww Exp $
 
 /**
  * Implementation of hook_form().
@@ -376,13 +376,16 @@ function project_project_nodeapi(&$node,
   $language = isset($node->language) ? $node->language : '';
   switch ($op) {
     case 'presave':
-      // Remove terms from vocabularies that have associations for other project_types.
+      // Remove terms from vocabularies that have associations for other
+      // project types.
+      if (!empty($node->taxonomy)) {
       foreach ($node->taxonomy as $vid => $terms) {
         $associated = variable_get('project_type_associated_tid_' . $vid, FALSE);
         if ($associated && $associated != $node->project_type) {
           unset($node->taxonomy[$vid]);
         }
       }
+      }
       break;
 
     case 'insert':

=== modified file 'sites/all/modules/project/project.info'
--- sites/all/modules/project/project.info	2010-04-23 01:32:08 +0000
+++ sites/all/modules/project/project.info	2010-07-10 21:37:12 +0000
@@ -5,16 +5,9 @@
 dependencies[] = views
 core = 6.x
 
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
+; Information added by d.o-cvs-to-bzr export/import script on 2010-07-10
 version = "6.x-1.x-dev"
 core = "6.x"
 project = "project"
-datestamp = "1271986273"
-
-
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "project"
-datestamp = "1271986320"
+datestamp = "1278738783"
 

=== modified file 'sites/all/modules/project/project.js'
--- sites/all/modules/project/project.js	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/project.js	2010-07-10 21:37:12 +0000
@@ -1,4 +1,4 @@
-/* $Id: project.js,v 1.5 2010/04/22 20:55:55 bdragon Exp $ */
+/* $Id: project.js,v 1.6 2010/07/08 23:16:17 dww Exp $ */
 
 Drupal.behaviors.projectAuto = function (context) {
   // The initially selected term, if any.

=== modified file 'sites/all/modules/project/project.module'
--- sites/all/modules/project/project.module	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/project.module	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project.module,v 1.358 2010/04/22 07:20:43 bdragon Exp $
+// $Id: project.module,v 1.359 2010/07/08 23:16:17 dww Exp $
 
 /**
  * Implementation of hook_init().

=== modified file 'sites/all/modules/project/release/includes/project_edit_releases.inc'
--- sites/all/modules/project/release/includes/project_edit_releases.inc	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/release/includes/project_edit_releases.inc	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project_edit_releases.inc,v 1.3 2010/01/17 01:03:58 dww Exp $
+// $Id: project_edit_releases.inc,v 1.4 2010/06/07 22:45:39 dww Exp $
 
 /**
  * @file
@@ -261,6 +261,11 @@ function project_release_project_edit_fo
 function project_release_project_edit_form_submit($form, &$form_state) {
   $nid = $form_state['values']['nid'];
   db_query("UPDATE {project_release_projects} SET releases = %d, version_format = '%s' WHERE nid = %d", $form_state['values']['releases'], $form_state['values']['version_format'], $nid);
+  if (!db_affected_rows()) {
+    // It's possible there's no record in {project_release_projects} if this
+    // particular project was created before project_issue.module was enabled.
+    db_query("INSERT INTO {project_release_projects} (nid, releases, version_format) VALUES (%d, %d, '%s')", $nid, $form_values['releases'], $form_values['version_format']);
+  }
 
   if (!empty($form_state['values']['api'])) {
     foreach ($form_state['values']['api'] as $tid => $values) {

=== modified file 'sites/all/modules/project/release/package-release-nodes.php'
--- sites/all/modules/project/release/package-release-nodes.php	2010-05-03 22:11:56 +0000
+++ sites/all/modules/project/release/package-release-nodes.php	2010-07-10 21:37:12 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-// $Id: package-release-nodes.php,v 1.65 2010/04/22 22:12:23 thehunmonkgroup Exp $
+// $Id: package-release-nodes.php,v 1.66 2010/04/24 02:16:23 thehunmonkgroup Exp $
 
 /**
  * @file
@@ -263,6 +263,7 @@ function package_releases($type, $projec
     $project_short_name = escapeshellcmd($project_short_name);
     $version = escapeshellcmd($version);
     $tag = escapeshellcmd($tag);
+    $release_dir = '';
     db_query("DELETE FROM {project_release_package_errors} WHERE nid = %d", $nid);
     if ($release->rid == DRUPAL_CORE_REPOSITORY_ID) {
       $built = package_release_core($type, $nid, $project_short_name, $version, $tag);
@@ -277,6 +278,10 @@ function package_releases($type, $projec
       $num_built++;
       $project_nids[$pid] = TRUE;
     }
+    // Perform cleanup of failed builds.
+    else {
+      cleanup_failed_build($type, $nid, $project_short_name, $version, $tag, $release_dir);
+    }
     $num_considered++;
     if (count($wd_err_msg)) {
       db_query("INSERT INTO {project_release_package_errors} (nid, messages) values (%d, '%s')", $nid, serialize($wd_err_msg));
@@ -1282,3 +1287,46 @@ function core_make_file($core) {
 
   return $output;
 }
+
+/**
+ * Clean up any junk from failed builds.
+ *
+ * @param $type
+ *   The type of release, 'branch' or 'tag'.
+ * @param $nid
+ *   The node ID of the release.
+ * @param $project_short_name
+ *   {project_projects}.uri
+ * @param $version
+ *   Version string for the release.
+ * @param $tag
+ *   CVS tag for the release.
+ * @param $release_dir
+ *   The CVS directory path for the project (contrib only).
+ */
+function cleanup_failed_build($type, $nid, $project_short_name, $version, $tag, $release_dir) {
+  global $dest_root, $dest_rel;
+
+  $release_file_base_name = $dest_root . '/' . $dest_rel . '/' . $project_short_name . '-' . $version;
+  $base_tarball = $release_file_base_name . '.tar.gz';
+
+  // Remove the tarball generated from the CVS checkout.
+  if (file_exists($base_tarball)) {
+    unlink($base_tarball);
+  }
+
+  // For profiles, clean up any other profile-specific tarballs.
+  if (!empty($release_dir)) {
+    $parts = split('/', $release_dir);
+    // modules, themes, theme-engines, profiles, or translations
+    $contrib_type = $parts[1];
+    if ($contrib_type == 'profiles') {
+      foreach (array('no-core', 'core') as $type) {
+        $profile_tarball = "$release_file_base_name-$type.tar.gz";
+        if (file_exists($profile_tarball)) {
+          unlink($profile_tarball);
+        }
+      }
+    }
+  }
+}

=== modified file 'sites/all/modules/project/release/project-release-create-history.php'
--- sites/all/modules/project/release/project-release-create-history.php	2010-04-24 02:03:13 +0000
+++ sites/all/modules/project/release/project-release-create-history.php	2010-07-10 21:37:12 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 
-// $Id: project-release-create-history.php,v 1.29 2010/01/17 00:00:11 dww Exp $
+// $Id: project-release-create-history.php,v 1.30 2010/07/08 23:16:17 dww Exp $
 
 /**
  * @file

=== modified file 'sites/all/modules/project/release/project-release-private-download.php'
--- sites/all/modules/project/release/project-release-private-download.php	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/release/project-release-private-download.php	2010-07-10 21:37:12 +0000
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: project-release-private-download.php,v 1.3 2009/08/07 05:28:23 dww Exp $
+// $Id: project-release-private-download.php,v 1.4 2010/07/08 23:16:17 dww Exp $
 
 /**
  * @file

=== modified file 'sites/all/modules/project/release/project_release.info'
--- sites/all/modules/project/release/project_release.info	2010-04-23 01:32:08 +0000
+++ sites/all/modules/project/release/project_release.info	2010-07-10 21:37:12 +0000
@@ -8,16 +8,9 @@
 dependencies[] = views
 core = 6.x
 
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
+; Information added by d.o-cvs-to-bzr export/import script on 2010-07-10
 version = "6.x-1.x-dev"
 core = "6.x"
 project = "project"
-datestamp = "1271986273"
-
-
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "project"
-datestamp = "1271986320"
+datestamp = "1278738783"
 

=== modified file 'sites/all/modules/project/release/project_release.install'
--- sites/all/modules/project/release/project_release.install	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/release/project_release.install	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project_release.install,v 1.30 2010/01/30 02:33:40 dww Exp $
+// $Id: project_release.install,v 1.31 2010/06/07 22:45:39 dww Exp $
 
 function project_release_install() {
   // Create the database tables.
@@ -10,6 +10,13 @@ function project_release_install() {
 }
 
 /**
+ * Implement hook_enable().
+ */
+function project_release_enable() {
+  project_release_add_missing_projects();
+}
+
+/**
  * Implementation of hook_uninstall().
  */
 function project_release_uninstall() {
@@ -348,6 +355,17 @@ function project_release_schema() {
 }
 
 /**
+ * Check for existing project nodes that do not have an entry in the
+ * {project_release_projects} table, and add them.
+ */
+function project_release_add_missing_projects() {
+  $projects = db_query("SELECT n.nid FROM {node} n LEFT JOIN {project_release_projects} prp ON n.nid = prp.nid WHERE n.type = 'project_project' AND prp.nid IS NULL");
+  while ($project = db_fetch_object($projects)) {
+    db_query("INSERT INTO {project_release_projects} (nid) VALUES (%d)", $project->nid);
+  }
+}
+
+/**
  * Populate the {project_release_nodes}.security_update field.
  *
  * @param $ret

=== modified file 'sites/all/modules/project/release/project_release.module'
--- sites/all/modules/project/release/project_release.module	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/release/project_release.module	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project_release.module,v 1.152 2010/01/30 02:43:24 dww Exp $
+// $Id: project_release.module,v 1.153 2010/07/08 23:16:17 dww Exp $
 
 define('PROJECT_RELEASE_DEFAULT_VERSION_FORMAT', '!major%minor%patch#extra');
 define('PROJECT_RELEASE_FILE_EXTENSIONS', 'zip gz tar bz2 rar tgz tar.gz dmg rpm deb');

=== modified file 'sites/all/modules/project/release/views/plugins/project_release_table_plugin_style.inc'
--- sites/all/modules/project/release/views/plugins/project_release_table_plugin_style.inc	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/release/views/plugins/project_release_table_plugin_style.inc	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project_release_table_plugin_style.inc,v 1.1 2009/12/01 01:02:02 dww Exp $
+// $Id: project_release_table_plugin_style.inc,v 1.2 2010/07/08 23:16:17 dww Exp $
 
 /**
  * @file

=== modified file 'sites/all/modules/project/solr/ProjectSolrQuery.php'
--- sites/all/modules/project/solr/ProjectSolrQuery.php	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/solr/ProjectSolrQuery.php	2010-07-10 21:37:12 +0000
@@ -3,6 +3,13 @@
 include_once drupal_get_path('module', 'apachesolr') .'/Solr_Base_Query.php';
 
 class ProjectSolrQuery extends Solr_Base_Query {
+  /**
+   * Return the search path.
+   */
+  public function get_path() {
+    return $this->base_path;
+  }
+
   function default_sorts() {
     $sorts = array();
     if (!empty($this->keys)) {

=== added file 'sites/all/modules/project/solr/README.txt'
--- sites/all/modules/project/solr/README.txt	1970-01-01 00:00:00 +0000
+++ sites/all/modules/project/solr/README.txt	2010-07-10 21:37:12 +0000
@@ -0,0 +1,9 @@
+This module integrates Project with the ApacheSolr integration module
+(http://drupal.org/project/apachesolr).  It provides a set of project
+browsing pages based on ApacheSolr instead of Views.  It is used to
+power the drupal.org project browsing pages, for example:
+
+http://drupal.org/project/modules
+
+At this point, project_solr works best with the end of the DRUPAL-6--1
+branch of the ApacheSolr module, what is about to be the 6.x-1.1 release.

=== modified file 'sites/all/modules/project/solr/project_solr.info'
--- sites/all/modules/project/solr/project_solr.info	2010-04-23 01:32:08 +0000
+++ sites/all/modules/project/solr/project_solr.info	2010-07-10 21:37:12 +0000
@@ -7,16 +7,9 @@
 ;dependencies[] = apachesolr
 core = 6.x
 
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
+; Information added by d.o-cvs-to-bzr export/import script on 2010-07-10
 version = "6.x-1.x-dev"
 core = "6.x"
 project = "project"
-datestamp = "1271986273"
-
-
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "project"
-datestamp = "1271986320"
+datestamp = "1278738783"
 

=== modified file 'sites/all/modules/project/solr/project_solr.module'
--- sites/all/modules/project/solr/project_solr.module	2010-05-14 21:43:02 +0000
+++ sites/all/modules/project/solr/project_solr.module	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project_solr.module,v 1.62 2009/09/22 21:52:30 dww Exp $
+// $Id: project_solr.module,v 1.64 2010/07/10 05:12:43 dww Exp $
 
 //----------------------------------------
 // Core hooks
@@ -201,7 +201,7 @@ function project_solr_browse_page($term_
 
     include_once drupal_get_path('module', 'project_solr') .'/ProjectSolrQuery.php';
 
-    $query = new ProjectSolrQuery(apachesolr_get_solr(), $text_query, $filters, $sort, '');
+    $query = new ProjectSolrQuery(apachesolr_get_solr(), $text_query, $filters, $sort, 'project/' . drupal_strtolower($parent_term->name));
     if (is_null($query)) {
       throw new Exception(t('Could not construct a Solr query.'));
     }
@@ -227,6 +227,10 @@ function project_solr_browse_page($term_
     // This is the object that does the communication with the solr server.
     $solr = apachesolr_get_solr();
 
+    // Cache the built query. Since all the built queries go through
+    // this process, all the hook_invocations will happen later
+    apachesolr_current_query($query);
+
     // This hook allows modules to modify the query and params objects.
     apachesolr_modify_query($query, $params, 'project_solr');
     if (!$query) {
@@ -244,20 +248,19 @@ function project_solr_browse_page($term_
     // We add 'fq' (filter query) parameters here to include all the constant
     // filters for the query -- project nodes of the given top-level type that
     // have releases (if project_release is enabled).
-    $fq[] = 'type:project_project';
-    $fq[] = 'im_vid_'. _project_get_vid() .':'. $parent_term->tid;
+    $params['fq'][] = 'type:project_project';
+    $params['fq'][] = 'im_vid_'. _project_get_vid() .':'. $parent_term->tid;
     if (module_exists('project_release')) {
-      $fq[] = 'is_project_has_releases:1';
+      $params['fq'][] = 'is_project_has_releases:1';
     }
-    $params['fq'][] = '('. implode(' AND ', $fq) .')';
 
     $response = $solr->search($query->get_query_basic(), $params['start'], $params['rows'], $params);
 
     // The response is cached so that it is accessible to the blocks and anything
     // else that needs it beyond the initial search.
     $total = $response->response->numFound;
-
-    project_solr_response_cache(array($query, $response, $parent_term));
+    apachesolr_static_response_cache($response);
+    apachesolr_has_searched(TRUE);
 
     // Set breadcrumb
     $breadcrumb = menu_get_active_breadcrumb();
@@ -287,14 +290,6 @@ function project_solr_browse_page($term_
   return $output;
 }
 
-function project_solr_response_cache($set = FALSE) {
-  static $cache = NULL;
-  if ($set !== FALSE) {
-    $cache = $set;
-  }
-  return $cache;
-}
-
 //----------------------------------------
 // Blocks
 //----------------------------------------
@@ -309,10 +304,6 @@ function project_solr_block($op = 'list'
         'info' => t('Project: categories'),
         'cache' => BLOCK_CACHE_PER_PAGE,
       ),
-      'project_solr_order' => array(
-        'info' => t('Project: ordering'),
-        'cache' => BLOCK_CACHE_PER_PAGE,
-      ),
       'project_solr_compability' => array(
         'info' => t('Project: core compatibility'),
         'cache' => BLOCK_CACHE_PER_PAGE,
@@ -324,10 +315,28 @@ function project_solr_block($op = 'list'
     );
   }
 
-  if ($op == 'view' && ($search = project_solr_response_cache())) {
-    list($query, $response, $parent_term) = $search;
-
+  if ($op == 'view' && apachesolr_has_searched() && ($response = apachesolr_static_response_cache()) && ($query = apachesolr_current_query())) {
     if ($delta == 'project_solr_categories') {
+      // Find the parent term for this query.
+      $project_vid = _project_get_vid();
+      if (isset($response->responseHeader->params->fq)) {
+        foreach ($response->responseHeader->params->fq as $query_snippet) {
+          if (preg_match('/^im_vid_'. _project_get_vid() .':(.*)$/', $query_snippet, $matches)) {
+            $tid = trim($matches[1]);
+            $term = taxonomy_get_term($tid);
+            if ($term->vid == $project_vid) {
+              $parent_term = $term;
+              break;
+            }
+          }
+        }
+      }
+
+      if (!isset($parent_term)) {
+        // This facet cannot process generic queries.
+        return;
+      }
+
       $facet = 'im_vid_'.  _project_get_vid();
       $terms = array();
 
@@ -354,7 +363,7 @@ function project_solr_block($op = 'list'
         $term = taxonomy_get_term($tid);
         $new_query = clone $query;
         
-        $path = 'project/' . drupal_strtolower($parent_term->name);
+        $path = $new_query->get_path();
         $options = array();
         if ($active) {
           $new_query->remove_filter('tid', $term->tid);
@@ -394,26 +403,6 @@ function project_solr_block($op = 'list'
       }
       return;
     }
-    else if ($delta == 'project_solr_order') {
-      $sorts = $query->default_sorts();
-      $solrsort = $query->get_solrsort();
-
-      $sort_links = array();
-      $path = 'project/' . drupal_strtolower($parent_term->name);
-      $new_query = clone $query;
-      $toggle = array('asc' => 'desc', 'desc' => 'asc');
-      foreach ($sorts as $name => $sort) {
-        $active = $solrsort['#name'] == $name;
-        $direction = $active ? $solrsort['#direction'] : '';
-        $new_direction = $active ? $toggle[$direction] : $sort['default'];
-        $new_query->set_solrsort($name, $new_direction);
-        $sort_links[] = theme('apachesolr_sort_link', $sort['title'], $path, array('query' => $new_query->get_url_queryvalues()), $active, $direction);
-      }
-      return array(
-        'subject' => t('Sort by'),
-        'content' => theme('apachesolr_sort_list', $sort_links),
-      );
-    }
     else if (module_exists('project_release') && $delta == 'project_solr_compability') {
       $vid = _project_release_get_api_vid();
       $facet = 'im_project_release_api_tids';
@@ -421,17 +410,19 @@ function project_solr_block($op = 'list'
       $active_terms = array_reverse(project_release_compatibility_list(FALSE), TRUE);
 
       $active_term_counts = array();
+      if (isset($response->facet_counts->facet_fields->$facet)) {
       foreach ($response->facet_counts->facet_fields->$facet as $tid => $count) {
         if (!empty($active_terms[$tid])) {
           $active_term_counts[$tid] = $count;
         }
       }
+      }
 
       foreach ($active_terms as $tid => $term_name) {
         if (!empty($active_term_counts[$tid])) {
           $active = $query->has_filter('im_project_release_api_tids', $tid);
-          $path = 'project/' . drupal_strtolower($parent_term->name);
           $new_query = clone $query;
+          $path = $new_query->get_path();
           $new_query->remove_filter('im_project_release_api_tids', $term->tid);
           $options = array();
           if ($active) {
@@ -457,8 +448,8 @@ function project_solr_block($op = 'list'
     }
     else if ($delta == 'project_solr_text') {
       return array(
-        'subject' => t('Search @project_type', array('@project_type' => drupal_strtolower($parent_term->name))),
-        'content' => drupal_get_form('project_sort_freetext'),
+        'subject' => t('Search @project_type', array('@project_type' => drupal_strtolower($query->get_query_basic()))),
+        'content' => drupal_get_form('project_sort_freetext', $query->get_path()),
       );
     }
   }
@@ -481,22 +472,16 @@ function project_solr_append_api_term($v
 /**
  * Form callback; display a free text form.
  */
-function project_sort_freetext() {
-  list($query, $response, $parent_term) = project_solr_response_cache();
-
+function project_sort_freetext(&$form_state, $base_path) {
   $form = array();
   $form['text'] = array(
     '#type' => 'textfield',
-    '#default_value' => $_GET['querypath'],
+    '#default_value' => $_GET['text'],
     '#size' => 20,
   );
   $form['path'] = array(
     '#type' => 'value',
-    '#value' => 'project/' . drupal_strtolower($parent_term->name),
-  );
-  $form['query'] = array(
-    '#type' => 'value',
-    '#value' => $query,
+    '#value' => $base_path,
   );
   $form['submit'] = array(
     '#type' => 'submit',
@@ -509,8 +494,12 @@ function project_sort_freetext() {
  * Submit handler for project_sort_freetext().
  */
 function project_sort_freetext_submit($form, &$form_state) {
-  $query = $form_state['values']['query'];
+  if ($query = apachesolr_current_query()) {
   $queryvalues = $query->get_url_queryvalues();
+  }
+  else {
+    $queryvalues = array();
+  }
   $queryvalues['text'] = $form_state['values']['text'];
   unset($queryvalues['solrsort']);
   $form_state['redirect'] = array($form_state['values']['path'], $queryvalues);

=== modified file 'sites/all/modules/project/usage/project_usage.css'
--- sites/all/modules/project/usage/project_usage.css	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/usage/project_usage.css	2010-07-10 21:37:12 +0000
@@ -1,4 +1,4 @@
-/* $Id: project_usage.css,v 1.2 2008/10/24 02:56:05 dww Exp $ */
+/* $Id: project_usage.css,v 1.3 2010/07/08 23:16:17 dww Exp $ */
 
 th.project-usage-numbers, th.project-usage-numbers a, 
 td.project-usage-numbers, td.project-usage-numbers a {

=== modified file 'sites/all/modules/project/usage/project_usage.info'
--- sites/all/modules/project/usage/project_usage.info	2010-04-23 01:32:08 +0000
+++ sites/all/modules/project/usage/project_usage.info	2010-07-10 21:37:12 +0000
@@ -5,16 +5,9 @@
 dependencies[] = project
 dependencies[] = project_release
 core = 6.x
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
+; Information added by d.o-cvs-to-bzr export/import script on 2010-07-10
 version = "6.x-1.x-dev"
 core = "6.x"
 project = "project"
-datestamp = "1271986273"
-
-
-; Information added by d.o-cvs-to-bzr export/import script on 2010-04-22
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "project"
-datestamp = "1271986320"
+datestamp = "1278738783"
 

=== modified file 'sites/all/modules/project/usage/tests/date_rounding.test'
--- sites/all/modules/project/usage/tests/date_rounding.test	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/usage/tests/date_rounding.test	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: date_rounding.test,v 1.1 2007/09/14 16:17:55 dww Exp $
+// $Id: date_rounding.test,v 1.2 2010/07/08 23:16:17 dww Exp $
 
 class ProjectUsageGetDateTests extends DrupalTestCase {
   function get_info() {

=== modified file 'sites/all/modules/project/views/plugins/project_plugin_argument_validate_project_type_term.inc'

=== modified file 'sites/all/modules/project/views/theme/project-views-view-row-project-fields.tpl.php'
--- sites/all/modules/project/views/theme/project-views-view-row-project-fields.tpl.php	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/views/theme/project-views-view-row-project-fields.tpl.php	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project-views-view-row-project-fields.tpl.php,v 1.1 2009/01/12 20:34:07 dww Exp $
+// $Id: project-views-view-row-project-fields.tpl.php,v 1.2 2010/07/08 23:15:18 dww Exp $
 /**
  * @file project-views-view-row-project-fields.tpl.php
  * View template to display available project fields in a row.

=== modified file 'sites/all/modules/project/views/theme/project-views-view-row-project-node.tpl.php'
--- sites/all/modules/project/views/theme/project-views-view-row-project-node.tpl.php	2010-04-23 01:31:24 +0000
+++ sites/all/modules/project/views/theme/project-views-view-row-project-node.tpl.php	2010-07-10 21:37:12 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: project-views-view-row-project-node.tpl.php,v 1.1 2009/01/12 20:34:07 dww Exp $
+// $Id: project-views-view-row-project-node.tpl.php,v 1.2 2010/07/08 23:16:17 dww Exp $
 /**
  * @file project-views-view-row-project-node.tpl.php
  * Default view template to display a single project node.