From 4d705f504eff38752a29ffd55b8c189df1382129 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sun, 4 Feb 2001 09:03:53 +0000
Subject: [PATCH] Updated to new field names

---
 addressbook/conv/Debug MySQL | 48 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/addressbook/conv/Debug MySQL b/addressbook/conv/Debug MySQL
index d45a4e0c8e..7a7ebe76a9 100644
--- a/addressbook/conv/Debug MySQL	
+++ b/addressbook/conv/Debug MySQL	
@@ -27,26 +27,26 @@ class outlook_conv {
   var $currentrecord; //used for buffering to allow uid lines to go first
 
   var $outlook = array(
-	"Title" => "", 
-	"First Name" => "ab_firstname",
-	"Middle Name" => "",
-	"Last Name" => "ab_lastname",
-	"Suffix" => "",
-	"Company" => "ab_company",  //objectclass: organization
-	"Department" => "", //objectclass: organizationalPerson
-	"Job Title" => "ab_title", //objectclass: organizationalPerson
-	"Business Street" => "ab_address2",
+	"Title" => "TITLE", 
+	"First Name" => "N_Given",
+	"Middle Name" => "N_Middle",
+	"Last Name" => "N_Family",
+	"Suffix" => "N_Suffix",
+	"Company" => "ORG_Name",  //objectclass: organization
+	"Department" => "ORG_Unit", //objectclass: organizationalPerson
+	"Job Title" => "TITLE", //objectclass: organizationalPerson
+	"Business Street" => "address2",
 	"Business Street 2" => "",
 	"Business Street 3" => "",
 	"Business City" => "",
 	"Business State" => "",
 	"Business Postal Code" => "",
 	"Business Country" => "",
-	"Home Street" => "ab_street",
-	"Home City" => "ab_city",
-	"Home State" => "ab_state",
-	"Home Postal Code" => "ab_zip",
-	"Home Country" => "",
+	"Home Street" => "ADR_Street",
+	"Home City" => "ADR_Locality",
+	"Home State" => "ADR_Region",
+	"Home Postal Code" => "ADR_PostalCode",
+	"Home Country" => "ADR_CountryName",
 	"Home Street 2" => "",
 	"Home Street 3" => "",
 	"Other Street" => "",
@@ -55,20 +55,20 @@ class outlook_conv {
 	"Other Postal Code" => "",
 	"Other Country" => "",
 	"Assistant's Phone" => "",
-	"Business Fax" => "ab_fax",
-	"Business Phone" => "ab_wphone",
-	"Business Phone 2" => "ab_ophone",
+	"Business Fax" => "C_TEL",
+	"Business Phone" => "B_TEL",
+	"Business Phone 2" => "ophone",
 	"Callback" => "",
 	"Car Phone" => "",
 	"Company Main Phone" => "",
 	"Home Fax" => "",
-	"Home Phone" => "ab_hphone",
+	"Home Phone" => "A.TEL",
 	"Home Phone 2" => "", //This will make another homePhone entry
 	"ISDN" => "",
-	"Mobile Phone" => "ab_mphone", //newPilotPerson
+	"Mobile Phone" => "mphone", //newPilotPerson
 	"Other Fax" => "",
 	"Other Phone" => "",
-	"Pager" => "ab_pager",
+	"Pager" => "pager",
 	"Primary Phone" => "",
 	"Radio Phone" => "",
 	"TTY/TDD Phone" => "",
@@ -77,11 +77,11 @@ class outlook_conv {
 	"Anniversary" => "",
 	"Assistant's Name" => "", //newPilotPerson
 	"Billing Information" => "",
-	"Birthday" => "ab_bday",
+	"Birthday" => "bday",
 	"Categories" => "", 
 	"Children" => "",
 	"Directory Server" => "",
-	"E-mail Address" => "ab_email",
+	"E-mail Address" => "D_EMAIL",
 	"E-mail Display Name" => "",
 	"E-mail 2 Address" => "",
 	"E-mail 2 Display Name" => "",
@@ -150,8 +150,8 @@ function outlook_end_record($buffer,$private="private") {
         $thisname="";
 	$thisvalu="";
       }
-      $namelist = $namelist."\nINSERT INTO addressbook (ab_owner,ab_access,".$thisname;
-      $valulist = $valulist."VALUES ('".$phpgw_info["user"]["account_id"]."','".$private."',".$thisvalu;
+      $namelist = $namelist."\nINSERT INTO addressbook (owner,".$thisname;
+      $valulist = $valulist."VALUES ('".$phpgw_info["user"]["account_id"]."',".$thisvalu;
     } elseif ($row==count($lines)-1) {
       if (!empty($name) && !empty($value)) {
         $thisname=$name.") ";