Fixed a few bugs in syncing

tripal_feature/includes/tripal_feature.admin.inc

@@ -12,6 +12,7 @@
  */
 function tripal_feature_admin() {
 
+  /*
   // before proceeding check to see if we have any
   // currently processing jobs. If so, we don't want
   // to give the opportunity to sync libraries
@@ -20,7 +21,7 @@ function tripal_feature_admin() {
     $active_jobs = TRUE;
   }
   if (!$active_jobs) {
-
+*/
     get_tripal_feature_admin_form_title_set($form);
     get_tripal_feature_admin_form_url_set($form);
 
@@ -123,7 +124,7 @@ function tripal_feature_admin() {
     get_tripal_feature_admin_form_taxonomy_set($form);
     get_tripal_feature_admin_form_reindex_set($form);
     get_tripal_feature_admin_form_cleanup_set($form);
-  }
+/*  }
   else {
     $form['notice'] = array(
        '#type' => 'fieldset',
@@ -139,6 +140,7 @@ function tripal_feature_admin() {
           "jobs page.'),
     );
   }
+  */
   return system_settings_form($form);
 }
 

tripal_feature/includes/tripal_feature.sync_features.inc

@@ -125,14 +125,13 @@ function tripal_feature_set_urls($job_id = NULL) {
   $sql = "SELECT * FROM {chado_feature}";
   $nodes = db_query($sql);
   while ($node = db_fetch_object($nodes)) {
-
-    print "Setting URL alias for feature $feature->name: node/$node->nid => $url_alias\n";
-
+   
     // remove any previous alias
     db_query("DELETE FROM {url_alias} WHERE src = '%s'", "node/$node->nid");
     
     // add the new alias
     $url_alias = tripal_feature_get_feature_url($node);
+    print "Setting URL alias for feature $feature->name: node/$node->nid => $url_alias\n";
     path_set_alias("node/$node->nid", $url_alias);
   }
 }
@@ -173,7 +172,7 @@ function tripal_feature_get_feature_url($node) {
       $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $feature->uniquename;
       break;
     case 'genus_species_name':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $feature->sname;
+      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $feature->name;
       break;
     case 'genus_species_type_uname':
       $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $type . "/" . $feature->uniquename;

tripal_stock/includes/tripal_stock.admin.inc

@@ -15,6 +15,7 @@
 function tripal_stock_admin() {
   $form = array();
 
+  /*
   // before proceeding check to see if we have any
   // currently processing jobs.
   $active_jobs = FALSE;
@@ -37,7 +38,7 @@ function tripal_stock_admin() {
     );
     return system_settings_form($form);
   }
-  
+*/  
   get_tripal_stock_admin_form_title_set($form);
   get_tripal_stock_admin_form_url_set($form);
   get_tripal_stock_admin_form_vocabulary_set($form);       

tripal_stock/includes/tripal_stock.sync_stocks.inc

@@ -123,14 +123,13 @@ function tripal_stock_set_urls($job_id = NULL) {
   $sql = "SELECT * FROM {chado_stock}";
   $nodes = db_query($sql);
   while ($node = db_fetch_object($nodes)) {
-
-    print "Setting URL alias for stock $stock->name: node/$node->nid => $url_alias\n";
-
+    
     // remove any previous alias
     db_query("DELETE FROM {url_alias} WHERE src = '%s'", "node/$node->nid");
     
     // add the new alias
     $url_alias = tripal_stock_get_stock_url($node);
+    print "Setting URL alias for stock $stock->name: node/$node->nid => $url_alias\n";
     path_set_alias("node/$node->nid", $url_alias);
   }
 }
@@ -171,7 +170,7 @@ function tripal_stock_get_stock_url($node) {
       $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $stock->uniquename;
       break;
     case 'genus_species_name':
-      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $stock->sname;
+      $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $stock->name;
       break;
     case 'genus_species_type_uname':
       $url_alias = $genus . "/" . $genus . "_" . $species . "/" . $type . "/" . $stock->uniquename;