Browse Source

Just some commenting changes and a missing semicolon in jobs.inc file

Stephen Ficklin 9 years ago
parent
commit
e214613884

+ 3 - 3
tripal_core/api/tripal_core.chado_nodes.api.inc

@@ -1031,9 +1031,9 @@ function chado_cleanup_orphaned_nodes($table, $nentries = 25000, $linking_table
   }
 
   $transaction = db_transaction();
-  print "\nNOTE: Syncing is performed using a database transaction. \n" .
-    "If the sync fails or is terminated prematurely then the entire set of \n" .
-    "synced items is rolled back and will not be found in the database\n\n";
+  print "\nNOTE: This operation is performed using a database transaction. \n" .
+    "If it fails or is terminated prematurely then the entire set of \n" .
+    "changes is rolled back and will not be found in the database\n\n";
   try {
     $m = ceil($count / $nentries);
     for ($i = 0; $i < $m; $i++) {

+ 1 - 1
tripal_core/includes/tripal_core.jobs.inc

@@ -283,7 +283,7 @@ function tripal_jobs_view($job_id) {
   }
 
   // build the links
-  $links  = l('Return to jobs list', "admin/tripal/tripal_jobs/") . ' | ' .
+  $links  = l('Return to jobs list', "admin/tripal/tripal_jobs/") . ' | ';
   $links .= l('Re-run this job', "admin/tripal/tripal_jobs/rerun/" . $job->job_id) . ' | ';
   if ($job->start_time == 0 and $job->end_time == 0) {
     $links .= l('Cancel this job', "admin/tripal/tripal_jobs/cancel/" . $job->job_id) . ' | ';

+ 6 - 2
tripal_feature/includes/tripal_feature.fasta_loader.inc

@@ -123,14 +123,18 @@ function tripal_feature_fasta_load_form() {
     '#description' => t('Enter the regular expression that will extract the
        feature name from the FASTA definition line. For example, for a
        defintion line with a name and unique name separated by a bar \'|\' (>seqname|uniquename),
-       the regular expression for the name would be, "^(.*?)\|.*$".')
+       the regular expression for the name would be, "^(.*?)\|.*$".  All FASTA
+       definition lines begin with the ">" symbol.  You do not need to incldue
+       this symbol in your regular expression.')
   );
   $form['advanced']['re_uname'] = array('#type' => 'textfield',
     '#title' => t('Regular expression for the unique name'),'#required' => FALSE,
     '#description' => t('Enter the regular expression that will extract the
        feature name from the FASTA definition line. For example, for a
        defintion line with a name and unique name separated by a bar \'|\' (>seqname|uniquename),
-       the regular expression for the unique name would be "^.*?\|(.*)$").')
+       the regular expression for the unique name would be "^.*?\|(.*)$").  All FASTA
+       definition lines begin with the ">" symbol.  You do not need to incldue
+       this symbol in your regular expression.')
   );
 
   // Advanced database cross-reference optoins