Browse Source

Updating API to include v2.1 improvements: commits cc79e48..9a34e75

Lacey Sanderson 8 years ago
parent
commit
929d03bf77

+ 1 - 1
docs/tripal_doxygen.config

@@ -31,7 +31,7 @@ PROJECT_NAME           = Tripal
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = "v1.1 (6.x-1.1)"
+PROJECT_NUMBER         = "v3.0 (7.x-3.0)"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer

+ 1 - 1
legacy/tripal_analysis/includes/tripal_analysis.chado_node.inc

@@ -215,7 +215,7 @@ function chado_analysis_form($node, &$form_state) {
   $day = preg_replace("/^\d+-\d+-0?(\d+) .*/", "$1", $default_time);
   // If the time is not set, use current time
   if (!$default_time) {
-    $default_time = time();
+    $default_time = REQUEST_TIME;
     $year  = format_date($default_time, 'custom', 'Y');
     $month = format_date($default_time, 'custom', 'n');
     $day   = format_date($default_time, 'custom', 'j');

+ 1 - 1
tripal/api/tripal.jobs.api.inc

@@ -217,7 +217,7 @@ function tripal_max_jobs_exceeded($max_jobs) {
       // the job is not running so terminate it
       $record = new stdClass();
       $record->job_id = $job->job_id;
-      $record->end_time = REQUEST_TIME;
+      $record->end_time = time();
       $record->status = 'Error';
       $record->error_msg = 'Job has terminated unexpectedly.';
       drupal_write_record('tripal_jobs', $record, 'job_id');

+ 2 - 2
tripal_chado/api/modules/tripal_chado.analysis.api.inc

@@ -174,7 +174,7 @@ function tripal_get_analysis_select_options($syncd_only = TRUE) {
   if ($syncd_only) {
     $sql = "
       SELECT *
-      FROM public.chado_analysis CA
+      FROM [chado_analysis] CA
         INNER JOIN {analysis} A ON A.analysis_id = CO.analysis_id
       ORDER BY A.name
     ";
@@ -196,4 +196,4 @@ function tripal_get_analysis_select_options($syncd_only = TRUE) {
     }
   }
   return $analysis_list;
-}
+}