lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perf: Little speed enhancement

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-29 21:06:00 +00:00
parent 41ada61bdd
commit da04be88a0
3 changed files with 72 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
htdocs/categories/class/categorie.class.php
View File

@ -56,7 +56,6 @@ class Categorie
/** /**
* Constructor * Constructor
*
* @param DB acces base de donnees * @param DB acces base de donnees
* @param id id de la categorie * @param id id de la categorie
*/ */
@ -70,7 +69,6 @@ class Categorie
/** /**
* Load category into memory from database * Load category into memory from database
*
* @param id id of category * @param id id of category
*/ */
function fetch($id) function fetch($id)
@ -80,7 +78,7 @@ class Categorie
$sql.= " WHERE rowid = ".$id; $sql.= " WHERE rowid = ".$id;
dol_syslog("Categorie::fetch sql=".$sql); dol_syslog("Categorie::fetch sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query ($sql);
if ($resql) if ($resql)
{ {
$res = $this->db->fetch_array($resql); $res = $this->db->fetch_array($resql);
@ -96,7 +94,7 @@ class Categorie
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
@ -105,7 +103,7 @@ class Categorie
$sql.= " WHERE fk_categorie_fille = '".$id."'"; $sql.= " WHERE fk_categorie_fille = '".$id."'";
dol_syslog("Categorie::fetch sql=".$sql); dol_syslog("Categorie::fetch sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query ($sql);
if ($resql) if ($resql)
{ {
$res = $this->db->fetch_array($resql); $res = $this->db->fetch_array($resql);
@ -115,14 +113,13 @@ class Categorie
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
} }
/** /**
* Add category into database * Add category into database
*
* @return int -1 : erreur SQL * @return int -1 : erreur SQL
* -2 : nouvel ID inconnu * -2 : nouvel ID inconnu
* -3 : categorie invalide * -3 : categorie invalide
@ -162,10 +159,10 @@ class Categorie
//$sql.= ",".$this->parentId; //$sql.= ",".$this->parentId;
$sql.= ")"; $sql.= ")";
$res = $this->db->query($sql); $res = $this->db->query ($sql);
if ($res) if ($res)
{ {
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."categorie"); $id = $this->db->last_insert_id (MAIN_DB_PREFIX."categorie");
if ($id > 0) if ($id > 0)
{ {
@ -202,7 +199,6 @@ class Categorie
/** /**
* Update category * Update category
*
* @return int 1 : OK * @return int 1 : OK
* -1 : SQL error * -1 : SQL error
* -2 : invalid category * -2 : invalid category
@ -288,7 +284,6 @@ class Categorie
/** /**
* Delete a category from database * Delete a category from database
*
* @param user Object user that ask to delete * @param user Object user that ask to delete
*/ */
function delete($user) function delete($user)
@ -397,7 +392,6 @@ class Categorie
/** /**
* Ajout d'une sous-categorie * Ajout d'une sous-categorie
*
* @param $fille objet categorie * @param $fille objet categorie
* @return int 1 : OK * @return int 1 : OK
* -2 : $fille est deja dans la famille de $this * -2 : $fille est deja dans la famille de $this
@ -422,7 +416,6 @@ class Categorie
/** /**
* Suppression d'une sous-categorie (seulement "desassociation") * Suppression d'une sous-categorie (seulement "desassociation")
*
* @param $fille objet categorie * @param $fille objet categorie
* @return int 1 : OK * @return int 1 : OK
* -3 : categorie ($this ou $fille) invalide * -3 : categorie ($this ou $fille) invalide
@ -449,11 +442,10 @@ class Categorie
} }
/** /**
* Link an object to the category * \brief Link an object to the category
* * \param obj Object to link to category
* @param obj Object to link to category * \param type Type of category
* @param type Type of category * \return int 1 : OK, -1 : erreur SQL, -2 : id non renseign, -3 : Already linked
* @return int 1 : OK, -1 : erreur SQL, -2 : id non renseign, -3 : Already linked
*/ */
function add_type($obj,$type) function add_type($obj,$type)
{ {
@ -486,9 +478,9 @@ class Categorie
/** /**
* Suppresion d'un produit de la categorie * Suppresion d'un produit de la categorie
* * @param $prod est un objet de type produit
* @param $prod est un objet de type produit * retour : 1 : OK
* @return int 1 if OK, -1 if KO * -1 : erreur SQL
*/ */
function del_type($obj,$type) function del_type($obj,$type)
{ {
@ -576,8 +568,8 @@ class Categorie
/** /**
* Return category description * Return category description
* *
* @param int $cate Category id * @param $cate Category id
* @return string Description * @return string Description
*/ */
function get_desc ($cate) function get_desc ($cate)
{ {
@ -593,7 +585,7 @@ class Categorie
/** /**
* La categorie $fille est-elle une fille de cette categorie ? * La categorie $fille est-elle une fille de cette categorie ?
* *
* @param Category $fille Object category * @param fille Object category
*/ */
function is_fille ($fille) function is_fille ($fille)
{ {
@ -617,10 +609,9 @@ class Categorie
* label = nom de la categorie * label = nom de la categorie
* fulllabel = nom avec chemin complet de la categorie * fulllabel = nom avec chemin complet de la categorie
* fullpath = chemin complet compose des id * fullpath = chemin complet compose des id
* * @param type Type of categories (0=product, 1=suppliers, 2=customers, 3=members)
* @param string $type Type of categories (0=product, 1=suppliers, 2=customers, 3=members) * @param markafterid Mark all categories after this leaf in category tree.
* @param int $markafterid Mark all categories after this leaf in category tree. * @return array Array of categories
* @return array Array of categories
*/ */
function get_full_arbo($type,$markafterid=0) function get_full_arbo($type,$markafterid=0)
{ {
@ -647,7 +638,7 @@ class Categorie
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
@ -681,7 +672,7 @@ class Categorie
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
@ -723,7 +714,6 @@ class Categorie
/** /**
* For category id_categ and its childs available in this->cats, define property fullpath and fulllabel * For category id_categ and its childs available in this->cats, define property fullpath and fulllabel
*
* @param id_categ id_categ entry to update * @param id_categ id_categ entry to update
* @param protection Deep counter to avoid infinite loop * @param protection Deep counter to avoid infinite loop
*/ */
@ -774,7 +764,7 @@ class Categorie
} }
/** /**
* Affiche contenu de $this->cats * \brief Affiche contenu de $this->cats
*/ */
function debug_cats() function debug_cats()
{ {
@ -793,9 +783,8 @@ class Categorie
/** /**
* Retourne toutes les categories * \brief Retourne toutes les categories
* * \return array Tableau d'objet Categorie
* @return array Tableau d'objet Categorie
*/ */
function get_all_categories () function get_all_categories ()
{ {
@ -820,9 +809,8 @@ class Categorie
} }
/** /**
* Retourne le nombre total de categories * \brief Retourne le nombre total de categories
* * \return int Nombre de categories
* @return int Nombre de categories
*/ */
function get_nb_categories () function get_nb_categories ()
{ {
@ -843,7 +831,6 @@ class Categorie
/** /**
* Check if no category with same label already exists for this cat's parent or root and for this cat's type * Check if no category with same label already exists for this cat's parent or root and for this cat's type
*
* @return boolean 1 if already exist, 0 otherwise, -1 if error * @return boolean 1 if already exist, 0 otherwise, -1 if error
*/ */
function already_exists() function already_exists()
@ -891,23 +878,23 @@ class Categorie
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
} }
/** /**
* Retourne les categories de premier niveau (qui ne sont pas filles) * \brief Retourne les categories de premier niveau (qui ne sont pas filles)
*/ */
function get_main_categories() function get_main_categories ()
{ {
$allcats = $this->get_all_categories(); $allcats = $this->get_all_categories ();
$maincats = array (); $maincats = array ();
$filles = array (); $filles = array ();
$sql = "SELECT fk_categorie_fille FROM ".MAIN_DB_PREFIX."categorie_association"; $sql = "SELECT fk_categorie_fille FROM ".MAIN_DB_PREFIX."categorie_association";
$res = $this->db->query($sql); $res = $this->db->query ($sql);
while ($res = $this->db->fetch_array($res)) while ($res = $this->db->fetch_array ($res))
{ {
$filles[] = $res['fk_categorie_fille']; $filles[] = $res['fk_categorie_fille'];
} }
@ -934,7 +921,7 @@ class Categorie
{ {
$ways = array (); $ways = array ();
foreach ($this->get_all_ways() as $way) foreach ($this->get_all_ways () as $way)
{ {
$w = array (); $w = array ();
foreach ($way as $cat) foreach ($way as $cat)
@ -1013,19 +1000,19 @@ class Categorie
$sql = "SELECT fk_categorie_mere FROM ".MAIN_DB_PREFIX."categorie_association "; $sql = "SELECT fk_categorie_mere FROM ".MAIN_DB_PREFIX."categorie_association ";
$sql .= "WHERE fk_categorie_fille = ".$this->id; $sql .= "WHERE fk_categorie_fille = ".$this->id;
$res = $this->db->query($sql); $res = $this->db->query ($sql);
if ($res) if ($res)
{ {
while ($cat = $this->db->fetch_array($res)) while ($cat = $this->db->fetch_array ($res))
{ {
$meres[] = new Categorie($this->db, $cat['fk_categorie_mere']); $meres[] = new Categorie ($this->db, $cat['fk_categorie_mere']);
} }
return $meres; return $meres;
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
} }
@ -1038,9 +1025,9 @@ class Categorie
{ {
$ways = array (); $ways = array ();
foreach ($this->get_meres() as $mere) foreach ($this->get_meres () as $mere)
{ {
foreach ($mere->get_all_ways() as $way) foreach ($mere->get_all_ways () as $way)
{ {
$w = $way; $w = $way;
$w[] = $this; $w[] = $this;
@ -1049,7 +1036,7 @@ class Categorie
} }
} }
if (count($ways) == 0) if (sizeof ($ways) == 0)
$ways[0][0] = $this; $ways[0][0] = $this;
return $ways; return $ways;
@ -1057,7 +1044,6 @@ class Categorie
/** /**
* Return list of categories linked to element of type $type with id $typeid * Return list of categories linked to element of type $type with id $typeid
*
* @param id Id of element * @param id Id of element
* @param typeid Type id of link (0,1,2,3...) * @param typeid Type id of link (0,1,2,3...)
* @return array List of category objects * @return array List of category objects
@ -1077,19 +1063,19 @@ class Categorie
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON ct.fk_categorie = c.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON ct.fk_categorie = c.rowid";
$sql.= " WHERE ct.fk_".$table." = ".$id." AND c.type = ".$typeid; $sql.= " WHERE ct.fk_".$table." = ".$id." AND c.type = ".$typeid;
$res = $this->db->query($sql); $res = $this->db->query ($sql);
if ($res) if ($res)
{ {
while ($cat = $this->db->fetch_array($res)) while ($cat = $this->db->fetch_array ($res))
{ {
$cats[] = new Categorie($this->db, $cat['fk_categorie']); $cats[] = new Categorie ($this->db, $cat['fk_categorie']);
} }
return $cats; return $cats;
} }
else else
{ {
dol_print_error($this->db); dol_print_error ($this->db);
return -1; return -1;
} }
} }
@ -1116,7 +1102,7 @@ class Categorie
{ {
if (! $exact) if (! $exact)
{ {
$nom = '%'.str_replace('*', '%', $nom).'%'; $nom = '%'.str_replace ('*', '%', $nom).'%';
} }
$sql.= "AND label LIKE '".$nom."'"; $sql.= "AND label LIKE '".$nom."'";
} }
@ -1125,12 +1111,12 @@ class Categorie
$sql.="AND rowid = '".$id."'"; $sql.="AND rowid = '".$id."'";
} }
$res = $this->db->query($sql); $res = $this->db->query ($sql);
if ($res) if ($res)
{ {
while ($id = $this->db->fetch_array($res)) while ($id = $this->db->fetch_array ($res))
{ {
$cats[] = new Categorie($this->db, $id['rowid']); $cats[] = new Categorie ($this->db, $id['rowid']);
} }
return $cats; return $cats;
@ -1279,9 +1265,8 @@ class Categorie
} }
/** /**
* Efface la photo de la categorie et sa vignette * \brief Efface la photo de la categorie et sa vignette
* * \param file Chemin de l'image
* @param file Chemin de l'image
*/ */
function delete_photo($file) function delete_photo($file)
{ {
@ -1306,9 +1291,8 @@ class Categorie
} }
/** /**
* Load size of image file * \brief Load size of image file
* * \param file Path to file
* @param file Path to file
*/ */
function get_image_size($file) function get_image_size($file)
{ {
@ -1326,7 +1310,7 @@ class Categorie
{ {
global $user,$langs,$conf; global $user,$langs,$conf;
dol_syslog(get_class($this)."::initAsSpecimen"); dol_syslog("Categorie::initAsSpecimen");
// Initialise parametres // Initialise parametres
$this->id=0; $this->id=0;

21
htdocs/lib/functions.lib.php
View File

@ -3898,18 +3898,19 @@ function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
} }
/** /**
* Advanced sort array by second index function, which produces ascending (default) * Advanced sort array by second index function, which produces
* or descending output and uses optionally natural case insensitive sorting (which * ascending (default) or descending output and uses optionally
* can be optionally case sensitive as well). * natural case insensitive sorting (which can be optionally case
* sensitive as well).
* *
* @param array $array Array to sort * @param array Array to sort
* @param string $index Key in array to use for sorting criteria * @param index
* @param int $order Sort order * @param order
* @param int $natsort 1=use "natural" sort (natsort), 0=use "standard sort (asort) * @param natsort
* @param int $case_sensitive 1=sort is case sensitive, 0=not case sensitive * @param case_sensitive Sort is case sensitive
* @return array Sorted array * @return Sorted array
*/ */
function dol_sort_array(&$array, $index, $order='asc', $natsort=0, $case_sensitive=0) function dol_sort_array(&$array, $index, $order='asc', $natsort, $case_sensitive)
{ {
// Clean parameters // Clean parameters
$order=strtolower($order); $order=strtolower($order);

24
htdocs/societe/class/societe.class.php
View File

@ -47,18 +47,15 @@ class Societe extends CommonObject
var $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id; var $id;
var $name; // TODO obsolete
var $nom; var $nom;
var $nom_particulier; var $nom_particulier;
var $prenom; var $prenom;
var $particulier; var $particulier;
var $address; var $address;
var $adresse; // TODO obsolete var $adresse; // TODO obsolete
var $cp; // TODO obsolete var $cp;
var $zip; var $ville;
var $ville; // TODO obsolete var $status; // 0=activity ceased, 1= in activity
var $town;
var $status; // 0=activity ceased, 1= in activity
var $state_id; var $state_id;
var $state_code; var $state_code;
@ -67,9 +64,9 @@ class Societe extends CommonObject
var $departement_code; var $departement_code;
var $departement; var $departement;
var $pays_id; // TODO obsolete var $pays_id;
var $pays_code; // TODO obsolete var $pays_code;
var $pays; // TODO obsolete var $pays; // TODO obsolete
var $country_id; var $country_id;
var $country_code; var $country_code;
var $country; var $country;
@ -146,8 +143,7 @@ class Societe extends CommonObject
var $logo_mini; var $logo_mini;
/** /**
* Constructor * Constructor for class
*
* @param DB handler acces base de donnees * @param DB handler acces base de donnees
* @param id id societe (0 par defaut) * @param id id societe (0 par defaut)
*/ */
@ -175,7 +171,6 @@ class Societe extends CommonObject
/** /**
* Create third party in database * Create third party in database
*
* @param user Object of user that ask creation * @param user Object of user that ask creation
* @return int >= 0 if OK, < 0 if KO * @return int >= 0 if OK, < 0 if KO
*/ */
@ -296,7 +291,6 @@ class Societe extends CommonObject
/** /**
* Check properties of third party are ok (like name, third party codes, ...) * Check properties of third party are ok (like name, third party codes, ...)
*
* @return int 0 if OK, <0 if KO * @return int 0 if OK, <0 if KO
*/ */
function verify() function verify()
@ -372,7 +366,6 @@ class Societe extends CommonObject
/** /**
* Update parameters of third party * Update parameters of third party
*
* @param id id societe * @param id id societe
* @param user Utilisateur qui demande la mise a jour * @param user Utilisateur qui demande la mise a jour
* @param call_trigger 0=non, 1=oui * @param call_trigger 0=non, 1=oui
@ -411,7 +404,6 @@ class Societe extends CommonObject
$this->ville=$this->town; // TODO obsolete $this->ville=$this->town; // TODO obsolete
$this->state_id=trim($this->state_id); $this->state_id=trim($this->state_id);
$this->pays_id=trim($this->pays_id); $this->pays_id=trim($this->pays_id);
$this->country_id=trim($this->country_id);
$this->tel=trim($this->tel); $this->tel=trim($this->tel);
$this->fax=trim($this->fax); $this->fax=trim($this->fax);
$this->tel = preg_replace("/\s/","",$this->tel); $this->tel = preg_replace("/\s/","",$this->tel);