--- calendar.module     2007-04-05 09:12:35.000000000 -0500
+++ calendar.module.old 2007-03-08 09:54:01.000000000 -0600
@@ -10,7 +10,6 @@
  * Implementation of hook_init().
  */
 function calendar_init() {
-
   // ensure we are not serving a cached page
   if (function_exists('drupal_set_content')) {
     // TODO this can be removed later. Added to ease transition to new schema that requires Date API.
@@ -1431,62 +1430,18 @@ function calendar_setup_form_submit($for
  */
 function calendar_node_stripe($view, $node, $query_name, $delta, $stripe = NULL, $label = '') {
   $type_names = node_get_types('names');
-
-
-  // Explode the $node->nid to get the first piece that is the actual node id without the title
-  $pieces = explode(":", $node->nid);
-  // Using the first piece [0], the node id, retrieve the taxonomy terms associated with this node
-  $terms = taxonomy_node_get_terms($pieces[0]);
-
-  // If there exist any results (ie at least one taxomomy term is associated with this node) then continue
-  if (count($terms)) {
-    // The terms return in an format of:  Array( "someid" => Array( "tid"=>???, "vid"=>???, "name"=>??? )
-    // where "someid" is unknown, so strip out only the values of the main array, which effectively
-    // renumbers the array to be:         Array( "0"      => Array( "tid"=>???, "vid"=>???, "name"=>??? )
-    // and so simply looking at the first index of the array [0], then you can retrieve the other data
-    $terms = array_values($terms);
-    // Using the Vocabulary ID 'vid', get the taxonomy tree for that vocabulary.
-    $vocabulary = taxonomy_get_tree($terms[0]->vid);
-
-    // Using the list of all of the terms of the vocabulary, check if the name of this node matches
-    // the name of any of the terms in the vocabulary list...if so, then store the index of that
-    // position in the list as the '$stripe' id, and the '$label' as the name of the node, and break
-    // out of the loop. If the node name is not found in the vocabulary list, then the default values
-    // that were previously set are used instead. They default to a '$stripe' of -1, and '$label' of
-    // "?"
-    $stripe = -1;
-    $label  = "?";
-    for($i=0; $i<count($vocabulary); $i++) {
-      if ($vocabulary[$i]->name === $terms[0]->name) {
-        $stripe = $i+1;
-        $label  = $terms[0]->name;
+  if (!$label) {
+    $label = $view->field[$delta]['label'] .' ('. $type_names[$node->type] .')';
+  }
+  if (!$stripe) {
+    $i = 1;
+    foreach ($type_names as $k => $v) {
+      if ($k == $node->type) {
         break;
       }
     }
-  // Else, no terms exist, so assign the default values for '$stripe' and '$label'
-  } else {
-    $stripe = -1;
-    $label = "?";
+    $stripe = intval((20 * $delta) + $i);
   }
-
-
-// This effects the LEGEND labels
-//  if (!$label) {
-//    $label = $view->field[$delta]['label'] .' ('. $type_names[$node->type] .')';
-//  }
-
-
-// This affects the LEGEND stripe
-//   if (!$stripe) {
-//    $i = 1;
-//    foreach ($type_names as $k => $v) {
-//      if ($k == $node->type) {
-//        break;
-//      }
-//    }
-//    $stripe = intval((20 * $delta) + $i);
-//  }
-
   $GLOBALS['calendar_stripe_labels'][$stripe] = $label;
   return $stripe;
-}
+}
\ No newline at end of file