Updated URLs to incldue 'feature' or 'stock' in the URL, and removed redundant genus

tripal_feature/includes/tripal_feature.sync_features.inc

@@ -163,19 +163,19 @@ function tripal_feature_get_feature_url($node) {
   
   switch ($alias_type) {
     case 'feature_name':
-      $url_alias = $feature->name;
+      $url_alias = "feature/" . $feature->name;
       break;
     case 'feature_unique_name':
-      $url_alias = $feature->uniquename;
+      $url_alias = "feature/" . $feature->uniquename;
       break;
     case 'genus_species_uqname':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $feature->uniquename;
+      $url_alias = "feature/" . $genus . "_" . $species . "/" . $feature->uniquename;
       break;
     case 'genus_species_name':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $feature->name;
+      $url_alias = "feature/" . $genus . "_" . $species . "/" . $feature->name;
       break;
     case 'genus_species_type_uname':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $type . "/" . $feature->uniquename;
+      $url_alias = "feature/" . $genus . "_" . $species . "/" . $type . "/" . $feature->uniquename;
       break;
     default:
       $url_alias = "$aprefix$node->feature_id";

tripal_stock/includes/tripal_stock.sync_stocks.inc

@@ -161,19 +161,19 @@ function tripal_stock_get_stock_url($node) {
   
   switch ($alias_type) {
     case 'stock_name':
-      $url_alias = $stock->name;
+      $url_alias = "stock/" . $stock->name;
       break;
     case 'stock_unique_name':
-      $url_alias = $stock->uniquename;
+      $url_alias = "stock/" . $stock->uniquename;
       break;
     case 'genus_species_uqname':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $stock->uniquename;
+      $url_alias = "stock/" . $genus . "_" . $species . "/" . $stock->uniquename;
       break;
     case 'genus_species_name':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $stock->name;
+      $url_alias = "stock/" . $genus . "_" . $species . "/" . $stock->name;
       break;
     case 'genus_species_type_uname':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $type . "/" . $stock->uniquename;
+      $url_alias = "stock/" . $genus . "_" . $species . "/" . $type . "/" . $stock->uniquename;
       break;
     default:
       $url_alias = "$aprefix$node->stock_id";