? 774204_2.patch ? 774204_3.patch ? 908034_1_biblio_simpletest.patch ? 908034_2_biblio_simpletest.patch ? 908034_6_biblio_simpletest.patch ? 908034_NEW_biblio_simpletest.patch ? tmpxml8.txt Index: biblio.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/biblio.module,v retrieving revision 1.196.2.24 diff -u -p -r1.196.2.24 biblio.module --- biblio.module 13 Sep 2010 02:29:55 -0000 1.196.2.24 +++ biblio.module 14 Sep 2010 15:35:26 -0000 @@ -2426,7 +2426,12 @@ function biblio_get_title_url_info($node * @return array $map */ function biblio_get_map($type, $format) { - return unserialize(db_result(db_query("SELECT %s FROM {biblio_type_maps} WHERE format='%s'", array($type, $format)))); + $result = db_select('biblio_type_maps', 'btm') + ->fields('btm', array($type)) + ->condition('format', $format) + ->execute() + ->fetchField(); + return unserialize($result); } /** @@ -2442,4 +2447,4 @@ function biblio_set_map($type, $format, function biblio_reset_map($type, $format) { module_invoke_all($format.'_map_reset', $type); -} \ No newline at end of file +} Index: includes/biblio.import.export.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/includes/Attic/biblio.import.export.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 biblio.import.export.inc --- includes/biblio.import.export.inc 13 Sep 2010 02:29:55 -0000 1.1.2.1 +++ includes/biblio.import.export.inc 14 Sep 2010 15:35:26 -0000 @@ -1,4 +1,4 @@ -fields(array( + 'format' => $maps['format'], + 'type_map' => $maps['type_map'], + 'type_names' => $maps['type_names'], + 'field_map' => $maps['field_map'], + )) + ->execute(); } + function _reset_ris_map($type) { $count = db_result(db_query("SELECT COUNT(*) FROM {biblio_type_maps} WHERE format='ris'")); if($count && $type) { //update Index: modules/bibtexParse/biblio_bibtex.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/bibtexParse/Attic/biblio_bibtex.install,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_bibtex.install --- modules/bibtexParse/biblio_bibtex.install 13 Sep 2010 02:29:54 -0000 1.1.4.2 +++ modules/bibtexParse/biblio_bibtex.install 14 Sep 2010 15:35:26 -0000 @@ -137,9 +137,14 @@ function _save_bibtex_maps() { $typenames = _get_bibtex_type_names(); $fieldmap = _get_bibtex_field_map(); $maps = array_merge($typemap, $typenames, $fieldmap); - db_query("INSERT INTO {biblio_type_maps} (format,type_map,type_names,field_map) VALUES ('%s','%s','%s','%s')", - array($maps['format'], $maps['type_map'], $maps['type_names'], $maps['field_map'])); - //drupal_write_record('biblio_type_maps', $maps); + db_insert('biblio_type_maps') + ->fields(array( + 'format' => $maps['format'], + 'type_map' => $maps['type_map'], + 'type_names' => $maps['type_names'], + 'field_map' => $maps['field_map'], + )) + ->execute(); } function _reset_bibtex_map($type) { Index: modules/crossref/biblio_crossref.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/crossref/Attic/biblio_crossref.install,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_crossref.install --- modules/crossref/biblio_crossref.install 13 Sep 2010 02:29:56 -0000 1.1.4.2 +++ modules/crossref/biblio_crossref.install 14 Sep 2010 15:35:26 -0000 @@ -47,16 +47,22 @@ function biblio_crossref_enable() { function biblio_crossref_set_system_weight() { return db_query("UPDATE {system} SET weight = 20 WHERE name = 'biblio_crossref'"); } + function _save_crossref_maps() { $typemap = _get_crossref_type_map(); $typenames = _get_crossref_type_names(); $fieldmap = _get_crossref_field_map(); $maps = array_merge($typemap, $typenames, $fieldmap); - db_query("INSERT INTO {biblio_type_maps} (format,type_map,type_names,field_map) VALUES ('%s','%s','%s','%s')", - array($maps['format'], $maps['type_map'], $maps['type_names'], $maps['field_map'])); - //drupal_write_record('biblio_type_maps', $maps); - + db_insert('biblio_type_maps') + ->fields(array( + 'format' => $maps['format'], + 'type_map' => $maps['type_map'], + 'type_names' => $maps['type_names'], + 'field_map' => $maps['field_map'], + )) + ->execute(); } + function _reset_crossref_map($type) { $count = db_result(db_query("SELECT COUNT(*) FROM {biblio_type_maps} WHERE format='crossref'")); if($count && $type) { //update Index: modules/crossref/biblio_crossref.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/crossref/Attic/biblio_crossref.module,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_crossref.module --- modules/crossref/biblio_crossref.module 13 Sep 2010 02:29:56 -0000 1.1.4.2 +++ modules/crossref/biblio_crossref.module 14 Sep 2010 15:35:26 -0000 @@ -128,7 +128,7 @@ function biblio_crossref_node_insert($no } function biblio_crossref_node_load($nodes, $types) { - $result = db_query('SELECT nid, biblio_crossref_id FROM {biblio_crossref} WHERE nid IN(:nids)', array(':nid' => array_keys($nodes))); + $result = db_query('SELECT nid, biblio_crossref_id FROM {biblio_crossref} WHERE nid IN(:nids)', array(':nids' => array_keys($nodes))); foreach ($result as $record) { $nodes[$record->nid]->biblio_crossref_id = $record->biblio_crossref_id; } Index: modules/endnote/biblio_tagged.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/endnote/Attic/biblio_tagged.install,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_tagged.install --- modules/endnote/biblio_tagged.install 13 Sep 2010 02:29:56 -0000 1.1.4.2 +++ modules/endnote/biblio_tagged.install 14 Sep 2010 15:35:26 -0000 @@ -171,9 +171,14 @@ function _save_tagged_maps() { $typenames = _get_tagged_type_names(); $fieldmap = _get_tagged_field_map(); $maps = array_merge($typemap, $typenames, $fieldmap); - db_query("INSERT INTO {biblio_type_maps} (format,type_map,type_names,field_map) VALUES ('%s','%s','%s','%s')", - array($maps['format'], $maps['type_map'], $maps['type_names'], $maps['field_map'])); - //drupal_write_record('biblio_type_maps', $maps); + db_insert('biblio_type_maps') + ->fields(array( + 'format' => $maps['format'], + 'type_map' => $maps['type_map'], + 'type_names' => $maps['type_names'], + 'field_map' => $maps['field_map'], + )) + ->execute(); } function _reset_tagged_map($type) { Index: modules/endnote/biblio_tagged.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/endnote/Attic/biblio_tagged.module,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_tagged.module --- modules/endnote/biblio_tagged.module 13 Sep 2010 02:29:56 -0000 1.1.4.2 +++ modules/endnote/biblio_tagged.module 14 Sep 2010 15:35:26 -0000 @@ -250,7 +250,9 @@ function _biblio_tagged_import($file, $t default : $field = _biblio_tagged_field_map($tag); - $node->$field = $value; + if (isset($node->$field)) { + $node->$field = $value; + } break; } //end switch } Index: modules/endnote/biblio_xml.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/endnote/Attic/biblio_xml.install,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_xml.install --- modules/endnote/biblio_xml.install 13 Sep 2010 02:29:56 -0000 1.1.4.2 +++ modules/endnote/biblio_xml.install 14 Sep 2010 15:35:26 -0000 @@ -53,15 +53,21 @@ function _save_xml_maps() { _save_endnote7_maps(); _save_endnote8_maps(); } + function _save_endnote7_maps() { $format = 'endnote7'; $typemap = _get_endnote7_type_map(); $typenames = _get_endnote7_type_names(); $fieldmap = _get_endnote7_field_map(); $maps = array_merge($typemap, $typenames, $fieldmap); - db_query("INSERT INTO {biblio_type_maps} (format,type_map,type_names,field_map) VALUES ('%s','%s','%s','%s')", - array($maps['format'], $maps['type_map'], $maps['type_names'], $maps['field_map'])); - // drupal_write_record('biblio_type_maps', $maps); + db_insert('biblio_type_maps') + ->fields(array( + 'format' => $maps['format'], + 'type_map' => $maps['type_map'], + 'type_names' => $maps['type_names'], + 'field_map' => $maps['field_map'], + )) + ->execute(); } function _save_endnote8_maps() { @@ -69,10 +75,14 @@ function _save_endnote8_maps() { $typenames = _get_endnote8_type_names(); $fieldmap = _get_endnote8_field_map(); $maps = array_merge($typemap, $typenames, $fieldmap); - db_query("INSERT INTO {biblio_type_maps} (format,type_map,type_names,field_map) VALUES ('%s','%s','%s','%s')", - array($maps['format'], $maps['type_map'], $maps['type_names'], $maps['field_map'])); - //drupal_write_record('biblio_type_maps', $maps); - + db_insert('biblio_type_maps') + ->fields(array( + 'format' => $maps['format'], + 'type_map' => $maps['type_map'], + 'type_names' => $maps['type_names'], + 'field_map' => $maps['field_map'], + )) + ->execute(); } function _reset_endnote_xml_map($version, $type) { Index: modules/endnote/biblio_xml.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/modules/endnote/Attic/biblio_xml.module,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 biblio_xml.module --- modules/endnote/biblio_xml.module 13 Sep 2010 02:29:56 -0000 1.1.4.2 +++ modules/endnote/biblio_xml.module 14 Sep 2010 15:35:26 -0000 @@ -117,8 +117,10 @@ function biblio_xml_node_delete($node) { } function biblio_xml_node_insert($node) { - if ($node->type != 'biblio' || !isset($node->biblio_xml_md5)) return - drupal_write_record('biblio_xml', $node); + if ($node->type != 'biblio' || !isset($node->biblio_xml_md5)) { + return; + } + drupal_write_record('biblio_xml', $node); } function biblio_xml_biblio_import($file, $terms = array(), $batch = FALSE, $session_id = NULL, $save = TRUE, $string = FALSE) { Index: tests/import.export.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/biblio/tests/Attic/import.export.test,v retrieving revision 1.1.2.11 diff -u -p -r1.1.2.11 import.export.test --- tests/import.export.test 13 Sep 2010 02:29:56 -0000 1.1.2.11 +++ tests/import.export.test 14 Sep 2010 15:35:26 -0000 @@ -2,10 +2,8 @@ // $Id: import.export.test,v 1.1.2.11 2010/09/13 02:29:56 rjerome Exp $ class BiblioImportExportWebTestCase extends BiblioWebTestCase { function setUp() { - parent::setUp('biblio'); - module_load_include('inc', 'biblio', 'biblio.import.export'); - module_load_include('inc', 'biblio', 'biblio.type.mapper'); - + parent::setUp('biblio', 'biblio_ris', 'biblio_bibtex', 'biblio_tagged', 'biblio_xml', 'biblio_crossref'); + require_once(drupal_get_path('module', 'biblio') .'/includes/biblio.import.export.inc'); } } @@ -35,15 +33,14 @@ class BiblioImportExportUnitTest extends } function testBiblioNodeExport() { - module_load_include('inc', 'biblio', 'endnote8_export'); + module_load_include('inc', 'biblio_xml', 'endnote8_export'); $node = $this->createNode(); - $this->assertEqual(biblio_endnote_tagged_export($node), $this->getTaggedString());//, 'Export a node in EndNote Tagged format'); - $this->assertEqual(biblio_bibtex_export($node), $this->getBibTexString(), 'Export a node in BibTex format'); + $this->assertEqual(_biblio_tagged_export($node), $this->getTaggedString(), 'Export a node in EndNote Tagged format'); + $this->assertEqual(_biblio_bibtex_export($node), $this->getBibTexString(), 'Export a node in BibTex format'); $xml = _endnote8_XML_export('', 'begin'); $xml .= _endnote8_XML_export($node); $xml .= _endnote8_XML_export('', 'end'); $this->assertEqual($xml, $this->getXMLString(), 'Export a node in EndNote XML format'); - } function testBiblioXMLFileImport() { @@ -53,7 +50,7 @@ class BiblioImportExportUnitTest extends $this->assertEqual(count($nids), 1, 'Imported 1 EndNote XML entry'); file_delete($file); $node = $this->createNode(); - $fields = array_filter(biblio_get_field_map('endnote8')); + $fields = array_filter(biblio_get_map('field_map', 'endnote8')); $fields += array('title','biblio_contributors', 'biblio_keywords'); foreach ($nids as $nid) { $this->nids[] = $nid; @@ -69,7 +66,7 @@ class BiblioImportExportUnitTest extends $this->assertEqual(count($nids), 1, 'Imported 1 Tagged entry'); file_delete($file); $node = $this->createNode(); - $fields = array_filter(biblio_get_field_map('tagged')); + $fields = array_filter(biblio_get_map('field_map', 'tagged')); $fields += array('title','biblio_contributors', 'biblio_keywords'); foreach ($nids as $nid) { $this->nids[] = $nid; @@ -85,7 +82,7 @@ class BiblioImportExportUnitTest extends $this->assertEqual(count($nids), 1, 'Imported 1 Bibtex entry'); file_delete($file); $node = $this->createNode(); - $fields = array_filter(biblio_get_field_map('bibtex')); + $fields = array_filter(biblio_get_map('field_map', 'bibtex')); $fields += array('title','biblio_contributors'); foreach ($nids as $nid) { $this->nids[] = $nid; @@ -101,7 +98,7 @@ class BiblioImportExportUnitTest extends $this->assertEqual(count($nids), 1, 'Imported 1 RIS entry'); file_delete($file); $node = $this->createNode(); - $fields = array_unique(array_filter(biblio_get_field_map('ris'))); + $fields = array_filter(biblio_get_map('field_map', 'ris')); $fields += array('title','biblio_contributors'); foreach ($nids as $nid) { $this->nids[] = $nid;