Merge branch '6.x-1.x' of http://git.drupal.org/sandbox/spficklin/1337878.git into 6.x-1.x

tripal_feature/includes/tripal_feature.sync_features.inc

@@ -176,6 +176,12 @@ function tripal_feature_set_urls($na = NULL, $job = NULL) {
       return; 
     }    
     
+    // if the src and dst is the same (the URL alias couldn't be set)
+    // then skip to the next one. There's nothing we can do about this one.
+    if($src == $dst) {
+      continue;
+    }
+    
     // remove any previous alias and then add the new one
     $success = db_query("EXECUTE del_url_alias_by_src('%s')", $src);    
     if (!$success) {
@@ -277,6 +283,13 @@ function tripal_feature_get_feature_url($node, $url_alias = NULL) {
   $url_alias = preg_replace('/\[name\]/', $feature->name, $url_alias);
   $url_alias = preg_replace('/\[uniquename\]/', $feature->uniquename, $url_alias);
  
+  // the dst field of the url_alias table is only 128 characters long. 
+  // if this is the case then simply return the node URL, we can't set this one
+  if (strlen($url_alias) > 128) {
+    watchdog('trp-seturl', "Cannot set alias longer than 128 characters: %alias.", array('%alias' => $url_alias), WATCHDOG_ERROR);
+    return "node/" . $node->nid;
+  }
+  
   return $url_alias;
 }
 /**

tripal_stock/includes/tripal_stock.sync_stocks.inc

@@ -172,7 +172,13 @@ function tripal_stock_set_urls($na = NULL, $job = NULL) {
       db_query('DEALLOCATE "ins_url_alias_nisrds"');
       db_query("ROLLBACK"); 
       return; 
-    }    
+    }
+    
+    // if the src and dst is the same (the URL alias couldn't be set)
+    // then skip to the next one. There's nothing we can do about this one.
+    if($src == $dst) {
+      continue;
+    }
     
     // remove any previous alias and then add the new one
     $success = db_query("EXECUTE del_url_alias_by_src('%s')", $src);    
@@ -275,6 +281,13 @@ function tripal_stock_get_stock_url($node, $url_alias = NULL) {
   $url_alias = preg_replace('/\[name\]/', $stock->name, $url_alias);
   $url_alias = preg_replace('/\[uniquename\]/', $stock->uniquename, $url_alias);
  
+  // the dst field of the url_alias table is only 128 characters long. 
+  // if this is the case then simply return the node URL, we can't set this one
+  if (strlen($url_alias) > 128) {
+    watchdog('trp-seturl', "Cannot set alias longer than 128 characters: %alias.", array('%alias' => $url_alias), WATCHDOG_ERROR);
+    return "node/" . $node->nid;
+  }
+  
   return $url_alias;
 }
 /**