Browse Source

Fix to tripal.install and to Chado prepare function

Stephen Ficklin 8 years ago
parent
commit
0290450c32

+ 3 - 1
tripal/includes/TripalImporter.inc

@@ -237,10 +237,12 @@ class TripalImporter {
    *   -fid: provides the Drupal managed File ID for the file.
    *   -file_local: provides the full path to the file on the server.
    *   -file_remote: provides the remote URL for the file.
+   *   This argument is optional if the loader does not use the built-in
+   *   file loader.
    *
    * @throws Exception
    */
-  public function create($run_args, $file_details) {
+  public function create($run_args, $file_details = array()) {
     global $user;
     $class = get_called_class();
 

+ 1 - 0
tripal/tripal.install

@@ -188,6 +188,7 @@ function tripal_schema() {
   $schema['tripal_term'] = tripal_tripal_term_schema();
   $schema['tripal_entity'] = tripal_tripal_entity_schema();
   $schema['tripal_bundle'] = tripal_tripal_bundle_schema();
+  $schema['tripal_import'] = tripal_tripal_import_schema();
 
   // Adds a table for additional information related to bundles.
   $schema['tripal_bundle_variables'] = tripal_tripal_bundle_variables_schema();

+ 1 - 1
tripal_chado/includes/setup/tripal_chado.setup.inc

@@ -126,7 +126,7 @@ function tripal_chado_load_ontologies() {
         print "Loading ontology: " . $ontologies[$i]['name'] . " ($obo_id)...\n";
         $obo_importer = new OBOImporter();
         $obo_importer->create(array('obo_id' => $obo_id));
-        $obo->run();
+        $obo_importer->run();
       }
       else {
         print "Ontology already loaded (skipping): " . $ontologies[$i]['name'] . "...\n";