Index: Solr_Base_Query.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/Solr_Base_Query.php,v
retrieving revision 1.1
diff -u -r1.1 Solr_Base_Query.php
--- Solr_Base_Query.php	27 Dec 2007 20:33:50 -0000	1.1
+++ Solr_Base_Query.php	28 Mar 2008 16:50:26 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 class Solr_Base_Query {
 
@@ -223,4 +224,4 @@
     }
     $this->_query = trim(implode(' ', array_filter($fields, 'trim')));
   }
-}
+}
\ No newline at end of file
Index: apachesolr.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.info,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 apachesolr.info
--- apachesolr.info	29 Jan 2008 18:06:46 -0000	1.1.2.1
+++ apachesolr.info	28 Mar 2008 16:49:48 -0000
@@ -1,4 +1,6 @@
+; $Id$
 name = Apache Solr framework
 description = Framework for searching with solr
-dependencies = search
+dependencies [] = search
 package = ApacheSolr
+core = "6.x"
\ No newline at end of file
Index: apachesolr.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.install,v
retrieving revision 1.1
diff -u -r1.1 apachesolr.install
--- apachesolr.install	27 Dec 2007 20:33:50 -0000	1.1
+++ apachesolr.install	28 Mar 2008 16:49:54 -0000
@@ -1,9 +1,9 @@
 <?php
-
+// $Id$
 function apachesolr_uninstall() {
   variable_del('apachesolr_cron_last');
   variable_del('apachesolr_cron_last_nid');
   variable_del('apachesolr_host');
   variable_del('apachesolr_port');
   variable_del('apachesolr_path');
-}
+}
\ No newline at end of file
Index: apachesolr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 apachesolr.module
--- apachesolr.module	5 Mar 2008 15:45:51 -0000	1.1.2.6
+++ apachesolr.module	28 Mar 2008 23:57:51 -0000
@@ -1,23 +1,22 @@
 <?php
+// $Id$
 
-function apachesolr_menu($may_cache) {
+function apachesolr_menu() {
   $items = array();
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/settings/apachesolr',
+    $items['admin/settings/apachesolr'] = array(
       'title' => t('Apache Solr search'),
       'description' => t('Administer Apache Solr.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'apachesolr_settings',
-      'access' => user_access('administer site configuration'),
+      'page callback' => 'drupal_get_form',
+      'page arguments' => 'apachesolr_settings',
+      'access callback' => 'user_access',
+      'access arguments' => array('administer site configuration'),
       );
-    $items[] = array(
-      'path' => 'admin/settings/apachesolr/index',
+    $items['admin/settings/apachesolr/index'] = array(
       'title' => t('Apache Solr search index'),
-      'callback' => 'apachesolr_index_page',
-      'access' => user_access('administer site configuration'),
+      'page callback' => 'apachesolr_index_page',
+      'access callback' => 'user_access',
+      'access arguments' => array('administer site configuration'),
     );
-  }
   return $items;
 }
 
@@ -48,7 +47,7 @@
 function apachesolr_index_page() {
   //TODO: Should we be generating the dynamic blocks based on what is indexed?
   // Or should we be using things like node_field.type to get this list?
-  $response = drupal_http_request(apachesolr_base_url(). "/admin/luke?numTerms=0");
+  $response = drupal_http_request(apachesolr_base_url() ."/admin/luke?numTerms=0");
   if ($response->code == '200') {
     $xml_response = simplexml_load_string($response->data);
     $fields = $xml_response->xpath("//lst[@name='fields']/lst");
@@ -75,17 +74,17 @@
   public static $_namespaces = array();
 
   static function reset($namespace) {
-    variable_del($namespace. '_last_change');
-    variable_del($namespace. '_last_id');
+    variable_del($namespace .'_last_change');
+    variable_del($namespace .'_last_id');
   }
 
   static function get_change($namespace) {
-    $var = variable_get($namespace. '_last_change', 0);
+    $var = variable_get($namespace .'_last_change', 0);
     return $var;
   }
 
   static function get_last($namespace) {
-    $var = variable_get($namespace. '_last_id', 0);
+    $var = variable_get($namespace .'_last_id', 0);
     return $var;
   }
 
@@ -193,7 +192,7 @@
         $document->text = $text;
         $documents[] = $document;
         if ($count++ % 20 == 19) {
-          watchdog('Apache Solr', "Adding ". count($documents). " docs");
+          watchdog('Apache Solr', "Adding ". count($documents) ." docs");
           $solr->addDocuments($documents);
           $count = 0;
           $documents = array();
@@ -206,7 +205,7 @@
     if (is_object($solr)) {
       // remaining documents
       try {
-        watchdog('Apache Solr', "Adding ". count($documents). " docs in cleanup");
+        watchdog('Apache Solr', "Adding ". count($documents) ." docs in cleanup");
         $solr->addDocuments($documents);
         $solr->commit();
         $solr->optimize(FALSE, FALSE);
@@ -291,12 +290,12 @@
                 if ($active = $query->has_field('tid', $tid)) {
                   $contains_active = TRUE;
                   $new_query->remove_field('tid', $term->tid);
-                  $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                  $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                   $unclick_link = theme('apachesolr_unclick_link', $path);
                 }
                 else {
                   $new_query->add_field('tid', $term->tid);
-                  $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                  $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                 }
                 $countsort = $count == 0 ? '' : 1 / $count;
                 // if numdocs == 1 and !active, don't add.
@@ -304,13 +303,13 @@
                   // skip
                 }
                 else {
-                  $terms[$term->vid][$active ? $countsort. $term->name : 1 + $countsort. $term->name] = theme('apachesolr_facet_item', $term->name, $count, $path, $active, $unclick_link);
+                  $terms[$term->vid][$active ? $countsort . $term->name : 1 + $countsort . $term->name] = theme('apachesolr_facet_item', $term->name, $count, $path, $active, $unclick_link);
                 }
               }
             }
           }
           $vid = substr($delta, 11, 1);
-          $vocab = taxonomy_get_vocabulary($vid);
+          $vocab =taxonomy_vocabulary_load($vid);
           if (is_numeric($vid) && is_array($terms) && is_array($terms[$vid])) {
             ksort($terms[$vid]);
             return array('subject' => t('Filter by @name', array('@name' => $vocab->name)),
@@ -333,12 +332,12 @@
                 if ($active = $query->has_field('type', $t)) {
                   $contains_active = TRUE;
                   $new_query->remove_field('type', $t);
-                  $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                  $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                   $unclick_link = theme('apachesolr_unclick_link', $path);
                 }
                 else {
                   $new_query->add_field('type', $t);
-                  $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                  $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                 }
                 $countsort = $count == 0 ? '' : 1 / $count;
                 // if numdocs == 1 and !active, don't add.
@@ -346,7 +345,7 @@
                   // skip
                 }
                 else {
-                  $types[$active ? $countsort. $type : 1 + $countsort. $type] = theme('apachesolr_facet_item', $type, $count, $path, $active, $unclick_link);
+                  $types[$active ? $countsort . $type : 1 + $countsort . $type] = theme('apachesolr_facet_item', $type, $count, $path, $active, $unclick_link);
                 }
               }
               if (is_array($types)) {
@@ -367,12 +366,12 @@
                 if ($active = $query->has_field('uid', $uid)) {
                   $contains_active = TRUE;
                   $new_query->remove_field('uid', $uid);
-                  $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                  $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                   $unclick_link = theme('apachesolr_unclick_link', $path);
                 }
                 else {
                   $new_query->add_field('uid', $uid);
-                  $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                  $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                 }
                 $countsort = $count == 0 ? '' : 1 / $count;
                 // if numdocs == 1 and !active, don't add.
@@ -380,7 +379,7 @@
                   // skip
                 }
                 else {
-                  $users[$active ? $countsort. name : 1 + $countsort. $name] = theme('apachesolr_facet_item', $name, $count, $path, $active, $unclick_link);
+                  $users[$active ? $countsort . name : 1 + $countsort . $name] = theme('apachesolr_facet_item', $name, $count, $path, $active, $unclick_link);
                 }
               }
               if (is_array($users)) {
@@ -405,12 +404,12 @@
                     if ($active = $query->has_field($index_key, $facet)) {
                       $contains_active = TRUE;
                       $new_query->remove_field($index_key, $facet);
-                      $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                      $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                       $unclick_link = theme('apachesolr_unclick_link', $path);
                     }
                     else {
                       $new_query->add_field($index_key, $facet);
-                      $path = 'search/'. arg(1). '/'. $new_query->get_query();
+                      $path = 'search/'. arg(1) .'/'. $new_query->get_query();
                     }
                     $countsort = $count == 0 ? '' : 1 / $count;
                     // if numdocs == 1 and !active, don't add.
@@ -418,7 +417,7 @@
                       // skip
                     }
                     else {
-                      $facets[$active ? $countsort. $facet : 1 + $countsort. $facet] = theme('apachesolr_facet_item', $facet, $count, $path, $active, $unclick_link);
+                      $facets[$active ? $countsort . $facet : 1 + $countsort . $facet] = theme('apachesolr_facet_item', $facet, $count, $path, $active, $unclick_link);
                     }
                   }
                   if (is_array($facets)) {
@@ -438,7 +437,7 @@
   }
 }
 
-function apachesolr_form_alter($form_id, &$form) {
+function apachesolr_form_alter(&$form, &$form_state, $form_id) {
   $arg = arg(1);
   $alias = drupal_lookup_path('alias', "search/{$arg}");
   if (preg_match("&/search/{$arg}&", $form['#action']) ||
@@ -446,7 +445,7 @@
       strpos($form['#action'], $alias)) {
     if (!isset($_POST['form_id'])) {
       // Set up our validation function
-      $form['#validate']['apachesolr_search_validate'] = array();
+      $form['#element_validate']['apachesolr_search_validate'] = array();
 
       // if no keys, there's nothing to do.
       if (empty($form['basic']['inline']['keys']['#default_value'])) {
@@ -472,7 +471,7 @@
 
   if (empty($solr_cache[$host][$port][$path])) {
     $include_path = get_include_path();
-    set_include_path ('./'. drupal_get_path('module', 'apachesolr') .'/SolrPhpClient/');
+    set_include_path('./'. drupal_get_path('module', 'apachesolr') .'/SolrPhpClient/');
     include_once('Apache/Solr/Service.php');
     set_include_path($include_path);
     $solr_cache[$host][$port][$path] = new Apache_Solr_Service($host, $port, $path);
@@ -509,14 +508,14 @@
     $keys = search_get_keys();
   }
   if (empty($_queries) || empty($_queries[$keys])) {
-    include_once drupal_get_path('module', 'apachesolr'). '/Solr_Base_Query.php';
+    include_once drupal_get_path('module', 'apachesolr') .'/Solr_Base_Query.php';
     $_queries[$keys] = new Solr_Base_Query($keys);
   }
   return $_queries[$keys];
 }
 
 function apachesolr_base_url() {
-  return "http://". variable_get('apachesolr_host', 'localhost'). ':'. variable_get('apachesolr_port', '8983'). variable_get('apachesolr_path', '/solr');
+  return "http://". variable_get('apachesolr_host', 'localhost') .':'. variable_get('apachesolr_port', '8983') . variable_get('apachesolr_path', '/solr');
 }
 
 /**
@@ -583,7 +582,7 @@
 }
 
 function apachesolr_simpletest() {
-  $dir = drupal_get_path('module', 'apachesolr'). '/tests';
+  $dir = drupal_get_path('module', 'apachesolr') .'/tests';
   $tests = file_scan_directory($dir, '\.test$');
   return array_keys($tests);
 }
@@ -594,10 +593,10 @@
     $attributes['class'] = 'active';
   }
   if ($unclick_link) {
-    return $unclick_link . " $name";
+    return $unclick_link ." $name";
   }
   else {
-    return l($name. " ($count)",  $path, $attributes);
+    return l($name ." ($count)",  $path, $attributes);
   }
 }
 
@@ -631,3 +630,29 @@
   $term = taxonomy_get_term($tid);
   return $term->name;
 }
+
+/**
+ * Implementation of hook_theme().
+ */
+function apachesolr_theme() {
+  return array(
+    'apachesolr_facet_item' => array(
+      'arguments' => array('name' => NULL, 'count' => NULL, 'path' => NULL, 'active' => FALSE, 'unclick_link' => NULL),
+    ),
+    'apachesolr_unclick_link' => array(
+      'arguments' => array('url' => NULL),
+    ),
+    'apachesolr_facet_list' => array(
+      'arguments' => array('items' => NULL),
+    ),
+    'apachesolr_breadcrumb_type' => array(
+      'arguments' => array('type' => NULL),
+    ),
+    'content_apachesolr_breadcrumb_uid' => array(
+      'arguments' => array('uid' => NULL),
+    ),
+    'apachesolr_breadcrumb_tid' => array(
+      'arguments' => array('tid' => NULL),
+    ),
+  );
+}
\ No newline at end of file
Index: apachesolr_search.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.info,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 apachesolr_search.info
--- apachesolr_search.info	29 Jan 2008 18:06:46 -0000	1.1.2.1
+++ apachesolr_search.info	28 Mar 2008 16:50:09 -0000
@@ -1,4 +1,7 @@
+; $Id$
 name = Apache Solr search
 description = Search with solr
-dependencies = search apachesolr
+dependencies[] = search
+dependencies[] = apachesolr
 package = ApacheSolr
+core = "6.x"
\ No newline at end of file
Index: apachesolr_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr_search.module,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 apachesolr_search.module
--- apachesolr_search.module	5 Feb 2008 10:07:01 -0000	1.1.2.4
+++ apachesolr_search.module	28 Mar 2008 16:50:16 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 function apachesolr_update_index() {
   ApacheSolrUpdate::update_index('apachesolr');
@@ -87,4 +88,4 @@
       }
 
   } // switch
-}
+}
\ No newline at end of file
cvs diff: Diffing SolrPhpClient
cvs diff: Diffing SolrPhpClient/Apache
cvs diff: Diffing SolrPhpClient/Apache/Solr
cvs diff: Diffing SolrPhpClient/Apache/Solr/Service
cvs diff: Diffing SolrPhpClient/phpdocs
cvs diff: Diffing SolrPhpClient/phpdocs/Apache
cvs diff: Diffing SolrPhpClient/phpdocs/Apache/Solr
cvs diff: Diffing SolrPhpClient/phpdocs/media
cvs diff: Diffing contrib
cvs diff: Diffing contrib/apachesolr_image
Index: contrib/apachesolr_image/apachesolr_image.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/contrib/apachesolr_image/Attic/apachesolr_image.info,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 apachesolr_image.info
--- contrib/apachesolr_image/apachesolr_image.info	29 Jan 2008 18:05:50 -0000	1.1.2.1
+++ contrib/apachesolr_image/apachesolr_image.info	28 Mar 2008 16:49:21 -0000
@@ -1,5 +1,7 @@
-; $Id: apachesolr_image.info,v 1.1.2.1 2008/01/29 18:05:50 robertDouglass Exp $
+; $Id$
 name = ApacheSolr Image integration
 description = Integrates the ApacheSolr and Image modules
-dependencies = image apachesolr
+dependencies[] = image
+dependencies[] = apachesolr
 package = ApacheSolr
+core = "6.x"
\ No newline at end of file
Index: contrib/apachesolr_image/apachesolr_image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/contrib/apachesolr_image/Attic/apachesolr_image.module,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 apachesolr_image.module
--- contrib/apachesolr_image/apachesolr_image.module	29 Jan 2008 18:05:50 -0000	1.1.2.1
+++ contrib/apachesolr_image/apachesolr_image.module	28 Mar 2008 16:27:44 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 function apachesolr_image_apachesolr_update_index(&$document, $node) {
   if ($node->type == 'image') {
@@ -52,10 +53,10 @@
   $break = '';
   if ($node = $item['node']) {
     if ($path = $node->ssfield_imagemodule_image) {
-      $item['snippet'] = '<span class="image">'. theme('image', $path, '', '', array('align' => 'left')). '</span>'. $item['snippet'];
+      $item['snippet'] = '<span class="image">'. theme('image', $path, '', '', array('align' => 'left')) .'</span>'. $item['snippet'];
       $break = '<br clear="all"/>';
     }
   }
-  $output .= ' <dd>'. ($item['snippet'] ? '<p>'. $item['snippet'] . $break. '</p>' : '') .'<p class="search-info">'. implode(' - ', $info) .'</p></dd>';
+  $output .= ' <dd>'. ($item['snippet'] ? '<p>'. $item['snippet'] . $break .'</p>' : '') .'<p class="search-info">'. implode(' - ', $info) .'</p></dd>';
   return $output;
-}
+}
\ No newline at end of file
cvs diff: Diffing tests
Index: tests/solr_base_query.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/tests/solr_base_query.test,v
retrieving revision 1.1
diff -u -r1.1 solr_base_query.test
--- tests/solr_base_query.test	27 Dec 2007 20:33:51 -0000	1.1
+++ tests/solr_base_query.test	28 Mar 2008 16:30:27 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 class DrupalSolrQueryTests extends DrupalTestCase {
   function get_info() {
@@ -38,7 +39,7 @@
     foreach ($this->queries as $string) {
       $query =& apachesolr_drupal_query($string, TRUE);
       $query->add_field('wham', '1');
-      if (!$this->assertEqual($string. ' wham:1', $query->get_query())) {
+      if (!$this->assertEqual($string .' wham:1', $query->get_query())) {
         return FALSE;
       }
     }
@@ -90,4 +91,4 @@
 
     return TRUE;
   }
-}
+}
\ No newline at end of file
Index: tests/solr_base_query_breadcrumb.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/tests/solr_base_query_breadcrumb.test,v
retrieving revision 1.1
diff -u -r1.1 solr_base_query_breadcrumb.test
--- tests/solr_base_query_breadcrumb.test	27 Dec 2007 20:33:51 -0000	1.1
+++ tests/solr_base_query_breadcrumb.test	28 Mar 2008 16:30:17 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 class DrupalSolrQueryBreadcrumbTests extends DrupalTestCase {
   function get_info() {
@@ -15,7 +16,7 @@
     $types = node_get_types('types');
     shuffle($types);
     $type = array_pop($types);
-    $this->query_string = "sudo tid:44 uid:46 type:". $type->type. ' tid:58';
+    $this->query_string = "sudo tid:44 uid:46 type:". $type->type .' tid:58';
     $query =& apachesolr_drupal_query($this->query_string, TRUE);
     $this->breadcrumb = $query->get_breadcrumb();
     $this->menu_active_breadcrumb = menu_get_active_breadcrumb();
@@ -33,4 +34,4 @@
     $message = "The number of items in the breadcrumb ($query_breadcrumb_count) should be equal to the number of items in \$menu_active_breadcrumb ($menu_active_count) plus the number of words in \$string ($string_count) minus 1.";
     return $this->assertEqual($query_breadcrumb_count, $breadcrumb_count, "'%s' ". t($message));
   }
-}
+}
\ No newline at end of file