<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
WHERE name = {?}",
$address[$area . 'Name']);
if ($res->numRows() == 0) {
- $address[$area . 'Id'] = XDB::execute("INSERT INTO " . $databases[$area] . " (name, country)
- VALUES ({?}, {?})",
- $address[$area . 'Name'], $address['countryId']);
+ XDB::execute('INSERT INTO ' . $databases[$area] . ' (name, country)
+ VALUES ({?}, {?})',
+ $address[$area . 'Name'], $address['countryId']);
+ $address[$area . 'Id'] = XDB::insertId();
} else {
$address[$area . 'Id'] = $res->fetchOneCell();
}
}
if ($isPseudoCountry) {
- return $address['text'];
+ return implode("\n", array_slice($textLines, 0, -1));
}
- return implode("\n", array_slice($textLines, 0, -1));
+ return $address['text'];
}
// Search for the lign from the given address that is the closest to the geocoded thoroughfareName