holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cats may now be separated by ',' or ';'

Browse Source
This commit is contained in:
Ralf Becker 2002-02-14 19:56:06 +00:00
parent 3bfa6c85d3
commit ca22fe93e1
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
infolog/csv_import.php
View File

@ -85,29 +85,45 @@ function addr_id( $n_family,$n_given,$org_name ) { // find in Addressbook, at l
$cat2id = array( ); $cat2id = array( );
function cat_id( $cats ) function cat_id($cats)
{ {
if (!$cats) if (!$cats)
{
return ''; return '';
}
$cats = explode(',',$cats);
$cats = split('[,;]',$cats);
while (list($k,$cat) = each($cats)) {
if (isset($cat2id[$cat])) { while (list($k,$cat) = each($cats))
$ids[$cat] = $cat2id[$cat]; // cat is in cache {
} else { if (isset($cat2id[$cat]))
if (!is_object($GLOBALS['phpgw']->categories)) { {
$ids[$cat] = $cat2id[$cat]; // cat is in cache
}
else
{
if (!is_object($GLOBALS['phpgw']->categories))
{
$GLOBALS['phpgw']->categories = createobject('phpgwapi.categories'); $GLOBALS['phpgw']->categories = createobject('phpgwapi.categories');
} }
if ($id = $GLOBALS['phpgw']->categories->name2id( $cat )) { // cat exists if ($id = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) ))
{ // cat exists
$cat2id[$cat] = $ids[$cat] = $id; $cat2id[$cat] = $ids[$cat] = $id;
} else { // create new cat }
$GLOBALS['phpgw']->categories->add( $cat,0,$cat,'','public',0); else
$cat2id[$cat] = $ids[$cat] = $GLOBALS['phpgw']->categories->name2id( $cat ); { // create new cat
$GLOBALS['phpgw']->categories->add( array('name' => $cat,'descr' => $cat ));
$cat2id[$cat] = $ids[$cat] = $GLOBALS['phpgw']->categories->name2id( addslashes($cat) );
} }
} }
} }
return implode( ',',$ids ); $id_str = implode( ',',$ids );
if (count($ids) > 1) // multiple cats need to be in ','
{
$id_str = ",$id_str,";
}
return $id_str;
} }
switch ($action) { switch ($action) {
@ -296,11 +312,9 @@ function cat_id( $cats )
$val = ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val); $val = ereg_replace((string) $pattern,str_replace($VPre,'\\',$replace),(string) $val);
// echo "'$val'</p>"; // echo "'$val'</p>";
$quote = $val[0] == '@' ? "'" : '';
$reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg; $reg = $CPreReg.'([a-zA-Z_0-9]+)'.$CPosReg;
while (ereg($reg,$val,$vars)) { // expand all CSV fields while (ereg($reg,$val,$vars)) { // expand all CSV fields
$val = str_replace($CPre.$vars[1].$CPos,$quote.$fields[index($vars[1],$csv_fields)].$quote,$val); $val = str_replace($CPre.$vars[1].$CPos,$val[0] == '@' ? "'".addslashes($fields[index($vars[1],$csv_fields)])."'" : $fields[index($vars[1],$csv_fields)],$val);
} }
if ($val[0] == '@') { if ($val[0] == '@') {
$val = 'return '.substr($val,1).';'; $val = 'return '.substr($val,1).';';