Attachment #2658 for bug #2625

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2625
Collapse All | Expand All





    if ( file.size() == 0 ) {
      file.close();
      kdDebug(5700) << "File size is zero. Evaluating backups" << endl;
      for (int i=0; i!=20; i++)
      {
        TQFile backup( mFileName + "__" + TQString::number(i) );
        kdDebug(5700) << "Evaluating" << backup.name() << " size: " << backup.size() << endl;
        if ( backup.size() != 0 )
        {
          kdDebug(5700) << "Restoring backup " << i << endl;
          const TQString src = mFileName + "__" + TQString::number(i);
          const TQString dest = mFileName;

          // copy src to dest
          if ( ! backup.open( IO_ReadOnly ) ) {
//             const TQByteArray data = backup.readAll();
	    kdDebug(5700) << "can not open source for reading " << src << endl;
	    continue;
	  }

          // remove dest
          TQFile::remove( dest );

	  TQString text;
	  TQTextStream instream( &backup );
	  instream.setEncoding( TQTextStream::UnicodeUTF8 );
	  text = instream.read();
	  backup.close();

	  TQFile out( dest );
	  if ( ! out.open( IO_WriteOnly ) ) {
//          out.writeBlock( data );
		kdDebug(5700) << "can not open target for writing " << dest << endl;
		continue;
	  }
	  TQTextStream outstream( &out );
	  outstream.setEncoding( TQTextStream::UnicodeUTF8 );
	  outstream << text;
	  out.close();

          return true;
        }
      }
      return true;

  TQFile file( mFileName + "__0" );
  if ( file.size() != 0 ) {
    const TQString last = mFileName + "__20";
    kdDebug(5700) << "deleting " << last << endl;

    TQFile::remove( last );



      // copy src to dest
      TQFile in( src );
      if ( ! in.exists() )
	continue;
      if ( ! in.open( IO_ReadOnly ) ) {
//         const TQByteArray data = in.readAll();
	  kdDebug(5700) << "can not open source for reading " << src << endl;
	  return false;
          out.close();
        }

        in.close();
      }
      TQString text;
      TQTextStream instream( &in );

      instream.setEncoding( TQTextStream::UnicodeUTF8 );
      text = instream.read();
      in.close();

      TQFile out( dest );
      if ( ! out.open( IO_WriteOnly ) ) {
//          out.writeBlock( data );
	  kdDebug(5700) << "can not open target for writing " << dest << endl;
	  return false;
      }
      TQTextStream outstream( &out );
      outstream.setEncoding( TQTextStream::UnicodeUTF8 );
      outstream << text;
      out.close();

      // remove src
      TQFile::remove( src );
    }
  } else
    kdDebug(5700) << "Not starting logrotate __0 is 0 bytes." << endl;

  TQString extension = "__0";
  (void) KSaveFile::backupFile( mFileName, TQString::null /*directory*/,
                                extension );

  mDirWatch.stopScan();

  KSaveFile saveFile( mFileName );

Lines 41-47 bool VCardFormatPlugin::load( Addressee &addressee, TQFile *file ) Link Here

(-)a/tdelibs.orig/tdeabc/vcardformatplugin.cpp (-4 / +12 lines)
41	TQString data;	41	TQString data;
42		42
43	TQTextStream t( file );	43	TQTextStream t( file );
44	t.setEncoding( TQTextStream::Latin1 );	44	t.setEncoding( TQTextStream::UnicodeUTF8 );
45	data = t.read();	45	data = t.read();
46		46
47	VCardConverter converter;	47	VCardConverter converter;
Lines 60-66 bool VCardFormatPlugin::loadAll( AddressBook, Resource resource, TQFile *file Link Here
60	TQString data;	60	TQString data;
61		61
62	TQTextStream t( file );	62	TQTextStream t( file );
63	t.setEncoding( TQTextStream::Latin1 );	63	t.setEncoding( TQTextStream::UnicodeUTF8 );
64	data = t.read();	64	data = t.read();
65		65
66	VCardConverter converter;	66	VCardConverter converter;
Lines 88-94 void VCardFormatPlugin::save( const Addressee &addressee, TQFile *file ) Link Here
88		88
89	TQTextStream t( file );	89	TQTextStream t( file );
90	t.setEncoding( TQTextStream::UnicodeUTF8 );	90	t.setEncoding( TQTextStream::UnicodeUTF8 );
91	t << converter.createVCards( vcardlist );	91	TQString text = converter.createVCards( vcardlist );
		92	// kdDebug(5700)<< ">>>>>>>>> DEBUG <<<<<<<<<<" << endl;
		93	// kdDebug(5700)<< text << endl;
		94	// kdDebug(5700)<< ">>>>>>>>> DEBUG <<<<<<<<<<" << endl;
		95	t << text;
92	}	96	}
93		97
94	void VCardFormatPlugin::saveAll( AddressBook, Resource resource, TQFile *file )	98	void VCardFormatPlugin::saveAll( AddressBook, Resource resource, TQFile *file )
Lines 104-110 void VCardFormatPlugin::saveAll( AddressBook, Resource resource, TQFile *file Link Here
104		108
105	TQTextStream t( file );	109	TQTextStream t( file );
106	t.setEncoding( TQTextStream::UnicodeUTF8 );	110	t.setEncoding( TQTextStream::UnicodeUTF8 );
107	t << converter.createVCards( vcardlist );	111	TQString text = converter.createVCards( vcardlist );
		112	// kdDebug(5700)<< ">>>>>>>>> DEBUG <<<<<<<<<<" << endl;
		113	// kdDebug(5700)<< text << endl;
		114	// kdDebug(5700)<< ">>>>>>>>> DEBUG <<<<<<<<<<" << endl;
		115	t << text;
108	}	116	}
109		117
110	bool VCardFormatPlugin::checkFormat( TQFile *file ) const	118	bool VCardFormatPlugin::checkFormat( TQFile *file ) const

Lines 11-24 Link Here

(-)a/tdelibs.orig/tdeabc/vcardparser/CMakeLists.txt (+78 lines)
11		11
12	include_directories(	12	include_directories(
13	${TQT_INCLUDE_DIRS}	13	${TQT_INCLUDE_DIRS}
		14	${CMAKE_BINARY_DIR}
		15	${CMAKE_SOURCE_DIR}
14	${CMAKE_BINARY_DIR}/tdecore	16	${CMAKE_BINARY_DIR}/tdecore
15	${CMAKE_SOURCE_DIR}/tdecore	17	${CMAKE_SOURCE_DIR}/tdecore
		18	${CMAKE_BINARY_DIR}/tdeabc
		19	${CMAKE_SOURCE_DIR}/tdeabc
		20	${CMAKE_SOURCE_DIR}/tdeabc/vcard/include
		21	${CMAKE_SOURCE_DIR}/tdeabc/vcard/include/generated
		22	${CMAKE_SOURCE_DIR}/tdeio/tdeio
		23	${CMAKE_SOURCE_DIR}/dcop
16	)	24	)
17		25
18	link_directories(	26	link_directories(
19	${TQT_LIBRARY_DIRS}	27	${TQT_LIBRARY_DIRS}
20	)	28	)
21		29
		30	set( TDEABC_TESTS_LINK
		31	${TQT_LIBRARIES}
		32	DCOP-shared
		33	tdecore-shared
		34	tdeui-shared
		35	tdefx-shared
		36	tdeio-shared
		37	tdetexteditor-shared
		38	tdeabc-shared
		39	)
22		40
23	##### headers ###################################	41	##### headers ###################################
24		42
Lines 38-40 set( ${target}_SRCS Link Here
38	tde_add_library( ${target} STATIC_PIC	56	tde_add_library( ${target} STATIC_PIC
39	SOURCES ${${target}_SRCS}	57	SOURCES ${${target}_SRCS}
40	)	58	)
		59
		60
		61	##### test programs ##############################
		62
		63	tde_add_executable( testread
		64	SOURCES testread.cpp AUTOMOC
		65	LINK ${TDEABC_TESTS_LINK}
		66	)
		67
		68	tde_add_executable( testread2
		69	SOURCES testread2.cpp testutils.cpp AUTOMOC
		70	LINK ${TDEABC_TESTS_LINK}
		71	)
		72
		73	tde_add_executable( testwrite
		74	SOURCES testwrite.cpp AUTOMOC
		75	LINK ${TDEABC_TESTS_LINK}
		76	)
		77
		78	tde_add_executable( testwrite2
		79	SOURCES testwrite2.cpp AUTOMOC
		80	LINK ${TDEABC_TESTS_LINK}
		81	)
		82
		83	tde_add_executable( testvcardformat
		84	SOURCES testvcardformat.cpp AUTOMOC
		85	LINK ${TDEABC_TESTS_LINK}
		86	)
		87
		88	tde_add_executable( testvcardformatimpl
		89	SOURCES testvcardformatimpl.cpp AUTOMOC
		90	LINK ${TDEABC_TESTS_LINK}
		91	)
		92
		93	add_custom_target(testing ALL
		94	COMMAND echo "creating test infrastructure"
		95	DEPENDS testread
		96	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
		97	)
		98
		99	add_custom_command(
		100	TARGET testing PRE_BUILD
		101	COMMAND test
		102	ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/test.sh \|\| ln -s ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser/test.sh ${CMAKE_CURRENT_BINARY_DIR}
		103	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
		104	)
		105
		106	add_custom_command(
		107	TARGET testing PRE_BUILD
		108	COMMAND test
		109	ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/checkvcard.pl \|\| ln -s ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser/checkvcard.pl ${CMAKE_CURRENT_BINARY_DIR}
		110	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
		111	)
		112
		113	add_custom_command(
		114	TARGET testing PRE_BUILD
		115	COMMAND test
		116	ARGS -d ${CMAKE_CURRENT_BINARY_DIR}/tests \|\| ln -s ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser/tests ${CMAKE_CURRENT_BINARY_DIR}
		117	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
		118	)




#!/usr/bin/perl

use utf8;
use strict;
use warnings;

if ( @ARGV != 1 ) {
  print STDERR "Missing arg: filename\n";
  exit 1;
}

my $file = $ARGV[0];
my $ref = "$file.ref";

my $options="";
my $error=0;
my @prscont;
my @refcont;

open( IN, "<", $file ) || die ("Unable to open $file");
while( <IN> ) {
  if (/^VERSION:(.*)$/ ) { my $v = $1; $options = "--vcard21" if $v eq "2.1"; }
    $version = $1;
    if ( $version eq "2.1" ) { $options = "--vcard21"; }
  }
}

close IN;

open( REF, "$ref" ) ||  die ("Unable to open $ref");
while( <REF> ) { 
  next if $_ =~ /^UID/;
  push @refcont , $_ ; 
  exit 1;
}

while( <REF> ) {
  push @ref, $_;
}

close REF;

open( READ, "./testread $file $options 2> /dev/null |" ) || die  ("Unable to open testread");
print "Checking: $file ";
  exit 1;
}

print "Checking '$file':\n";

$gotsomething = 0;
$error = 0;
$i = 0;
while( <READ> ) {
  next if $_ =~ /^UID/;
  push @prscont , $_;
  $ref = @ref[$i++];

  if ( $out ne $ref ) {
    if ( $ref =~ /^UID/ && $out =~ /^UID/ ) { next; }
    $error++;
    print "  Expected      : $ref";
    print "  Parser output : $out";
  }
}

close READ;


if ( $#refcont != $#prscont ) {
  print "\n  FAILED: ref size and parsed size mismatch.\n";
  system "touch FAILED";
  exit 1;
}

for (my $i=0; $i<=$#refcont; $i++) {
   if ( $refcont[$i] ne $prscont[$i] ) {
	$error++;
	print "\n  Expected      : $refcont[$i]";
	print "  Parser output : $prscont[$i]";
   }
}

if ( $error > 0 ) {
  print "\n  FAILED: $error errors found.\n";
  system "touch FAILED";

Line 0 Link Here

(-)a/tdelibs-trinity-14.0.3/tdeabc/vcardparser/test.sh (+6 lines)
	1	TESTFILES="vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf vcard8.vcf vcard9.vcf"
	2
	3	test -f FAILED && rm -f FAILED;
	4	for i in $TESTFILES;
	5	do perl ./checkvcard.pl ./tests/$i ;
	6	done;

Lines 30-36 Link Here

(-)a/tdelibs.orig/tdeabc/vcardparser/testread.cpp (-2 / +2 lines)
30	#include <tdelocale.h>	30	#include <tdelocale.h>
31	#include <tdeaboutdata.h>	31	#include <tdeaboutdata.h>
32		32
33	#include "vcardconverter.h"	33	#include "tdeabc/vcardconverter.h"
34	#include "vcard.h"	34	#include "vcard.h"
35		35
36	static const TDECmdLineOptions options[] =	36	static const TDECmdLineOptions options[] =
Lines 70-76 int main( int argc, char **argv ) Link Here
70	TQString text;	70	TQString text;
71		71
72	TQTextStream s( &file );	72	TQTextStream s( &file );
73	s.setEncoding( TQTextStream::Latin1 );	73	s.setEncoding( TQTextStream::UnicodeUTF8 );
74	text = s.read();	74	text = s.read();
75	file.close();	75	file.close();
76		76

Lines 34-40 main() Link Here

(-)a/tdelibs.orig/tdeabc/vcardparser/testread2.cpp (+2 lines)
34	kdDebug()<<"\t\t"<< (itr1).fullEmail() << " VS. " << (itr2).fullEmail()<<endl;	34	kdDebug()<<"\t\t"<< (itr1).fullEmail() << " VS. " << (itr2).fullEmail()<<endl;
35	} else {	35	} else {
36	kdDebug()<<"\tAddressee - FAILED"<<endl;	36	kdDebug()<<"\tAddressee - FAILED"<<endl;
		37	kdDebug()<<">>>>>>>Addressee from code<<<<<<<<"<<endl;
37	(*itr1).dump();	38	(*itr1).dump();
		39	kdDebug()<<">>>>>>>Addressee from file<<<<<<<<"<<endl;
38	(*itr2).dump();	40	(*itr2).dump();
39	//kdDebug()<<"\t\t"<< (itr1).fullEmail() << " VS. " << (itr2).fullEmail()<<endl;	41	//kdDebug()<<"\t\t"<< (itr1).fullEmail() << " VS. " << (itr2).fullEmail()<<endl;
40	}	42	}




BEGIN:VCARD
ADR;TYPE=home:;;Müllerstrasse 21;Wörthersee;Kärnten;8400;Österreich;
ORG:HansWürstel AG
EMAIL:boehmermann@wuerstel.com
FN:Jahn Böhmermann
N:Böhmermann;Jahn;;;
TITLE:Komödiant
REV:2016-04-02T23:54:06Z
TEL;TYPE=VOICE,MSG,WORK:+43 699373419
VERSION:3.0
X-GENDER-GENDER:Male
END:VCARD




BEGIN:VCARD
ADR;TYPE=home:;;Müllerstrasse 21;Wörthersee;Kärnten;8400;Österreich
EMAIL:boehmermann@wuerstel.com
FN:Jahn Böhmermann
N:Böhmermann;Jahn;;;
ORG:HansWürstel AG
REV:2016-04-02T23:54:06Z
TEL;TYPE=MSG;TYPE=VOICE;TYPE=WORK:+43 699373419
TITLE:Komödiant
UID:vz7nMFMbYE
VERSION:3.0
X-GENDER-GENDER:Male
END:VCARD


Line 0 Link Here

(-)a/tdelibs-trinity-14.0.3/tdeabc/vcardparser/tests/vcard9.vcf (+14 lines)
	1	BEGIN:VCARD
	2	ADR;TYPE=home:;;Цар Борис III;София;София град;1000;България
	3	ORG:България ООД
	4	EMAIL:иван.иванов@българия.com
	5	FN:Иван Иванов
	6	NAME:Иван
	7	N:Иванов;
	8	TITLE:Др
	9	REV:2016-04-03T23:54:06Z
	10	TEL;TYPE=VOICE,MSG,WORK:+359 888 111 222
	11	VERSION:3.0
	12	X-GENDER-GENDER:Male
	13	END:VCARD
	14

Line 0 Link Here

(-)a/tdelibs-trinity-14.0.3/tdeabc/vcardparser/tests/vcard9.vcf.ref (+15 lines)
	1	BEGIN:VCARD
	2	ADR;TYPE=home:;;Цар Борис III;София;София град;1000;България
	3	EMAIL:иван.иванов@българия.com
	4	FN:Иван Иванов
	5	N:Иванов;;;;
	6	NAME:Иван
	7	ORG:България ООД
	8	REV:2016-04-03T23:54:06Z
	9	TEL;TYPE=MSG;TYPE=VOICE;TYPE=WORK:+359 888 111 222
	10	TITLE:Др
	11	UID:nzIRLdymsP
	12	VERSION:3.0
	13	X-GENDER-GENDER:Male
	14	END:VCARD
	15




#include "vcardparser.h"
#include <tdeabc/addressee.h>
#include <tqfile.h>
#include <tqstring.h>

using namespace TDEABC;


    return addr;
}

Addressee
vcard8()
{
    Addressee addr;

    addr.setName( TQString::fromUtf8("Jahn") );
    addr.setFamilyName( TQString::fromUtf8("Böhmermann") );
    addr.setFormattedName( TQString::fromUtf8("Jahn Böhmermann") );
    addr.setOrganization( TQString::fromUtf8("HansWürstel AG") );
    addr.insertEmail( TQString::fromUtf8("boehmermann@wuerstel.com") );
    addr.setTitle( TQString::fromUtf8("Komödiant") );
    addr.insertPhoneNumber( PhoneNumber("+43 699373419",PhoneNumber::Voice|PhoneNumber::Msg|PhoneNumber::Work) );
    Address a( Address::Work );
    a.setStreet( TQString::fromUtf8("Müllerstrasse 21") );
    a.setLocality( TQString::fromUtf8("Wörthersee") );
    a.setRegion( TQString::fromUtf8("Kärnten") );
    a.setPostalCode( "8400" );
    a.setCountry( TQString::fromUtf8("Österreich") );
    addr.insertAddress( a );
    return addr;
}

Addressee
vcard9()
{
    Addressee addr;

    addr.setName( TQString::fromUtf8("Иван") );
    addr.setFamilyName( TQString::fromUtf8("Иванов") );
    addr.setFormattedName( TQString::fromUtf8("Иван Иванов") );
    addr.setOrganization( TQString::fromUtf8("България ООД") );
    addr.insertEmail( TQString::fromUtf8("иван.иванов@българия.com") );
    addr.setTitle( TQString::fromUtf8("Др") );
    addr.insertPhoneNumber( PhoneNumber("+359 888 111 222",PhoneNumber::Voice|PhoneNumber::Msg|PhoneNumber::Work) );
    Address a( Address::Work );
    a.setStreet( TQString::fromUtf8("Цар Борис III") );
    a.setLocality( TQString::fromUtf8("София") );
    a.setRegion( TQString::fromUtf8("София град") );
    a.setPostalCode( "1000" );
    a.setCountry( TQString::fromUtf8("България") );
    addr.insertAddress( a );
    return addr;
}


TQString
vcardAsText( const TQString& location )
{
    TQString line;

    l.append( vcard1() );
    l.append( vcard2() );
    l.append( vcard3() );
    l.append( vcard8() );
    l.append( vcard9() );

    return l;
}

TQString
 vCardsAsText()
{
    TQString vcards = vcardAsText( "tests/vcard1.vcf" );
    vcards += vcardAsText( "tests/vcard2.vcf" );
    vcards += vcardAsText( "tests/vcard3.vcf" );
    vcards += vcardAsText( "tests/vcard8.vcf" );
    vcards += vcardAsText( "tests/vcard9.vcf" );

    return vcards;
}





/*
    This file is part of libtdeabc.

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
*/

#include <kdebug.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
// #include <tdelocale.h>
#include <tdeaboutdata.h>

#include "vcardformatplugin.h"

using namespace TDEABC;

/**
 * 
 * @param argc 
 * @param argv 
 * @return 
 */
int
main( int argc, char **argv )
{
  TDEAboutData aboutData( "testvcardformatplugin", "vCard format plugin", "0.1" );

  TDECmdLineArgs::init( argc, argv, &aboutData );

  TDEApplication app( false, false );
  

  TDEABC::Addressee addressee;

  addressee.setNameFromString( TQString::fromUtf8("Иван Иванов") );
  addressee.setNickName( TQString::fromUtf8("иванчо") );
  addressee.setBirthday( TQDate( 1981, 7, 19 ) );
  addressee.setMailer( "mutt1.2" );
  addressee.setTimeZone( TDEABC::TimeZone( +2 ) );

  TDEABC::Geo geo;
  geo.setLatitude( 30 );
  geo.setLongitude( 51 );
  addressee.setGeo( geo );

  addressee.setTitle( TQString::fromUtf8("Др") );
  addressee.setRole( TQString::fromUtf8("Самарянин") );
  addressee.setOrganization( TQString::fromUtf8("България ООД") );
  addressee.setNote( TQString::fromUtf8("не\nпипай работеща система") );
  addressee.setProductId( "testId" );
  addressee.setRevision( TQDateTime::currentDateTime() );
  addressee.setSortString( TQString::fromUtf8("сортиране") );
  addressee.setUrl( KURL( "http://wgess17.dyndns.org") );
  addressee.setSecrecy(  TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
/*
  TQImage img;
  img.load( "testimg.png", "PNG" );
  TDEABC::Picture photo;
  photo.setData( img );
  addressee.setPhoto( photo );

  TQImage img2;
  img2.load( "testimg.png", "PNG" );
  TDEABC::Picture logo;
  logo.setData( img2 );
  addressee.setLogo( logo );

  TQFile soundFile( "testsound.wav" );
  soundFile.open( IO_ReadOnly );
  TQByteArray data = soundFile.readAll();
  soundFile.close();
  TDEABC::Sound sound;
  sound.setData( data );
  addressee.setSound( sound );
*/
  addressee.insertEmail( TQString::fromUtf8("иван.иванов@българия.оод"), true );
  addressee.insertEmail( TQString::fromUtf8("иванчо@yahoo.de"), true );

  TDEABC::PhoneNumber phone1( "029876543", TDEABC::PhoneNumber::Pref | TDEABC::PhoneNumber::Home );
  TDEABC::PhoneNumber phone2( "+359888111222", TDEABC::PhoneNumber::Work );
  addressee.insertPhoneNumber( phone1 );
  addressee.insertPhoneNumber( phone2 );

  TDEABC::Key key( "secret key", TDEABC::Key::X509 );
  addressee.insertKey( key );

  TQStringList categories;
  categories << "Friends" << "School" << "KDE";
  addressee.setCategories( categories );

  TDEABC::Address a( TDEABC::Address::Work | TDEABC::Address::Postal | TDEABC::Address::Parcel );
  a.setStreet( TQString::fromUtf8("Цар Борис III") );
  a.setLocality( TQString::fromUtf8("София" ));
  a.setRegion( TQString::fromUtf8("София град" ));
  a.setPostalCode( TQString::fromUtf8("1000" ));
  a.setCountry( TQString::fromUtf8("България" ));
  addressee.insertAddress( a );

  addressee.insertCustom( "1hsdf", "test1",TQString::fromUtf8( "ежзик" ));
  addressee.insertCustom( "2hsdf", "test2",TQString::fromUtf8( "ежзик" ));
  addressee.insertCustom( "3hsdf", "test3",TQString::fromUtf8( "ежзик" ));

  addressee.dump();

//   TDEABC::Addressee::List list;
//   for ( int i = 0; i < 20; ++i ) {
//     TDEABC::Addressee addr = addressee;
//     addr.setUid( TQString::number( i ) );
//     list.append( addr );
//   }

//   TDEABC::VCardConverter converter;
//   TQString txt = converter.createVCards( list );
// 
//   TQFile file( "out2.vcf" );
//   file.open( IO_WriteOnly );
// 
//   TQTextStream s( &file );
//   s.setEncoding( TQTextStream::UnicodeUTF8 );
//   s << txt;
//   file.close();

  VCardFormatPlugin *vcfplugin = new VCardFormatPlugin();
  TQFile file( "vfout.vcf" );
  if ( file.open(IO_WriteOnly) ){
	vcfplugin->save(addressee, &file);
	file.close();
  }

  
  TDEABC::Addressee addressee2;

  if ( file.open(IO_ReadOnly ) ){
	vcfplugin->load(addressee2, &file);
	file.close();
  }

  addressee2.dump();

  return 0;


/*    Addressee::List::iterator itr1;
    Addressee::List::iterator itr2;
    for ( itr1 = l.begin(), itr2 = parsed.begin();
          itr1 != l.end(); ++itr1, ++itr2 ) {
        if ( (*itr1).fullEmail() == (*itr2).fullEmail() &&
             (*itr1).organization() == (*itr2).organization() &&
             (*itr1).phoneNumbers() == (*itr2).phoneNumbers()  &&
             (*itr1).emails() == (*itr2).emails() &&
             (*itr1).role() == (*itr2).role()  ) {
            kdDebug()<<"\tAddressee  - PASSED"<<endl;
            kdDebug()<<"\t\t"<< (*itr1).fullEmail() << " VS. " << (*itr2).fullEmail()<<endl;
        } else {
            kdDebug()<<"\tAddressee  - FAILED"<<endl;
            kdDebug()<<">>>>>>>Addressee from code<<<<<<<<"<<endl;
            (*itr1).dump();
            kdDebug()<<">>>>>>>Addressee from file<<<<<<<<"<<endl;
            (*itr2).dump();
            //kdDebug()<<"\t\t"<< (*itr1).fullEmail() << " VS. " << (*itr2).fullEmail()<<endl;
        }
    }
*/
}





/*
    This file is part of libtdeabc.

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
*/

#include <kdebug.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
// #include <tdelocale.h>
#include <tdeaboutdata.h>

#include "vcardformatimpl.h"

using namespace TDEABC;

int
main( int argc, char **argv )
{
  TDEAboutData aboutData( "testvcardformatimpl", "vCard format plugin", "0.1" );

  TDECmdLineArgs::init( argc, argv, &aboutData );

  TDEApplication app( false, false );
  

  TDEABC::Addressee addressee;

  addressee.setNameFromString( TQString::fromUtf8("Иван Иванов") );
  addressee.setNickName( TQString::fromUtf8("иванчо") );
  addressee.setBirthday( TQDate( 1981, 7, 19 ) );
  addressee.setMailer( "mutt1.2" );
  addressee.setTimeZone( TDEABC::TimeZone( +2 ) );

  TDEABC::Geo geo;
  geo.setLatitude( 30 );
  geo.setLongitude( 51 );
  addressee.setGeo( geo );

  addressee.setTitle( TQString::fromUtf8("Др") );
  addressee.setRole( TQString::fromUtf8("Самарянин") );
  addressee.setOrganization( TQString::fromUtf8("България ООД") );
  addressee.setNote( TQString::fromUtf8("не\nпипай работеща система") );
  addressee.setProductId( "testId" );
  addressee.setRevision( TQDateTime::currentDateTime() );
  addressee.setSortString( TQString::fromUtf8("сортиране") );
  addressee.setUrl( KURL( "http://wgess17.dyndns.org") );
  addressee.setSecrecy(  TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
/*
  TQImage img;
  img.load( "testimg.png", "PNG" );
  TDEABC::Picture photo;
  photo.setData( img );
  addressee.setPhoto( photo );

  TQImage img2;
  img2.load( "testimg.png", "PNG" );
  TDEABC::Picture logo;
  logo.setData( img2 );
  addressee.setLogo( logo );

  TQFile soundFile( "testsound.wav" );
  soundFile.open( IO_ReadOnly );
  TQByteArray data = soundFile.readAll();
  soundFile.close();
  TDEABC::Sound sound;
  sound.setData( data );
  addressee.setSound( sound );
*/
  addressee.insertEmail( TQString::fromUtf8("иван.иванов@българия.оод"), true );
  addressee.insertEmail( TQString::fromUtf8("иванчо@yahoo.de"), true );

  TDEABC::PhoneNumber phone1( "029876543", TDEABC::PhoneNumber::Pref | TDEABC::PhoneNumber::Home );
  TDEABC::PhoneNumber phone2( "+359888111222", TDEABC::PhoneNumber::Work );
  addressee.insertPhoneNumber( phone1 );
  addressee.insertPhoneNumber( phone2 );

  TDEABC::Key key( "secret key", TDEABC::Key::X509 );
  addressee.insertKey( key );

  TQStringList categories;
  categories << "Friends" << "School" << "KDE";
  addressee.setCategories( categories );

  TDEABC::Address a( TDEABC::Address::Work | TDEABC::Address::Postal | TDEABC::Address::Parcel );
  a.setStreet( TQString::fromUtf8("Цар Борис III") );
  a.setLocality( TQString::fromUtf8("София" ));
  a.setRegion( TQString::fromUtf8("София град" ));
  a.setPostalCode( TQString::fromUtf8("1000" ));
  a.setCountry( TQString::fromUtf8("България" ));
  addressee.insertAddress( a );

  addressee.insertCustom( "1hsdf", "test1",TQString::fromUtf8( "ежзик" ));
  addressee.insertCustom( "2hsdf", "test2",TQString::fromUtf8( "ежзик" ));
  addressee.insertCustom( "3hsdf", "test3",TQString::fromUtf8( "ежзик" ));

  addressee.dump();

  kdDebug() << ">>>>>>>>>>>>>>>>END FIRST ADDRESSEE<<<<<<<<<<<<<<" << endl;

//   TDEABC::Addressee::List list;
//   for ( int i = 0; i < 20; ++i ) {
//     TDEABC::Addressee addr = addressee;
//     addr.setUid( TQString::number( i ) );
//     list.append( addr );
//   }

//   TDEABC::VCardConverter converter;
//   TQString txt = converter.createVCards( list );
// 
//   TQFile file( "out2.vcf" );
//   file.open( IO_WriteOnly );
// 
//   TQTextStream s( &file );
//   s.setEncoding( TQTextStream::UnicodeUTF8 );
//   s << txt;
//   file.close();

  VCardFormatImpl *vcfImpl = new VCardFormatImpl();
  TQFile file( "vfimpout.vcf" );
  if ( file.open(IO_WriteOnly) ){
	vcfImpl->save(addressee, &file);
	file.close();
  }

  
  TDEABC::Addressee addressee2;

  if ( file.open(IO_ReadOnly ) ){
	vcfImpl->load(addressee2, &file);
	file.close();
  }

  addressee2.dump();

  return 0;


/*    Addressee::List::iterator itr1;
    Addressee::List::iterator itr2;
    for ( itr1 = l.begin(), itr2 = parsed.begin();
          itr1 != l.end(); ++itr1, ++itr2 ) {
        if ( (*itr1).fullEmail() == (*itr2).fullEmail() &&
             (*itr1).organization() == (*itr2).organization() &&
             (*itr1).phoneNumbers() == (*itr2).phoneNumbers()  &&
             (*itr1).emails() == (*itr2).emails() &&
             (*itr1).role() == (*itr2).role()  ) {
            kdDebug()<<"\tAddressee  - PASSED"<<endl;
            kdDebug()<<"\t\t"<< (*itr1).fullEmail() << " VS. " << (*itr2).fullEmail()<<endl;
        } else {
            kdDebug()<<"\tAddressee  - FAILED"<<endl;
            kdDebug()<<">>>>>>>Addressee from code<<<<<<<<"<<endl;
            (*itr1).dump();
            kdDebug()<<">>>>>>>Addressee from file<<<<<<<<"<<endl;
            (*itr2).dump();
            //kdDebug()<<"\t\t"<< (*itr1).fullEmail() << " VS. " << (*itr2).fullEmail()<<endl;
        }
    }
*/
}




/*
    This file is part of libtdeabc.

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
*/

#include <tdeabc/addressee.h>
#include <tdeabc/phonenumber.h>
#include <tdeabc/address.h>
#include <tdeabc/key.h>
#include <tdeabc/picture.h>
#include <tdeabc/sound.h>
#include <tdeabc/secrecy.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>

#include <tqfile.h>
#include <tqtextstream.h>

#include "vcardconverter.h"

int main( int argc, char **argv )
{
  TDEAboutData aboutData( "testwrite", "vCard test writer", "0.1" );

  TDECmdLineArgs::init( argc, argv, &aboutData );

  TDEApplication app( false, false );


  TDEABC::Addressee addressee;

  addressee.setNameFromString( TQString::fromUtf8("Иван Иванов") );
  addressee.setNickName( TQString::fromUtf8("иванчо") );
  addressee.setBirthday( TQDate( 1981, 7, 19 ) );
  addressee.setMailer( "mutt1.2" );
  addressee.setTimeZone( TDEABC::TimeZone( +2 ) );

  TDEABC::Geo geo;
  geo.setLatitude( 30 );
  geo.setLongitude( 51 );
  addressee.setGeo( geo );

  addressee.setTitle( TQString::fromUtf8("Др") );
  addressee.setRole( TQString::fromUtf8("Самарянин") );
  addressee.setOrganization( TQString::fromUtf8("България ООД") );
  addressee.setNote( TQString::fromUtf8("не\nпипай работеща система") );
  addressee.setProductId( "testId" );
  addressee.setRevision( TQDateTime::currentDateTime() );
  addressee.setSortString( TQString::fromUtf8("сортиране") );
  addressee.setUrl( KURL( "http://wgess17.dyndns.org") );
  addressee.setSecrecy(  TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
/*
  TQImage img;
  img.load( "testimg.png", "PNG" );
  TDEABC::Picture photo;
  photo.setData( img );
  addressee.setPhoto( photo );

  TQImage img2;
  img2.load( "testimg.png", "PNG" );
  TDEABC::Picture logo;
  logo.setData( img2 );
  addressee.setLogo( logo );

  TQFile soundFile( "testsound.wav" );
  soundFile.open( IO_ReadOnly );
  TQByteArray data = soundFile.readAll();
  soundFile.close();
  TDEABC::Sound sound;
  sound.setData( data );
  addressee.setSound( sound );
*/
  addressee.insertEmail( TQString::fromUtf8("иван.иванов@българия.оод"), true );
  addressee.insertEmail( TQString::fromUtf8("иванчо@yahoo.de"), true );

  TDEABC::PhoneNumber phone1( "029876543", TDEABC::PhoneNumber::Pref | TDEABC::PhoneNumber::Home );
  TDEABC::PhoneNumber phone2( "+359888111222", TDEABC::PhoneNumber::Work );
  addressee.insertPhoneNumber( phone1 );
  addressee.insertPhoneNumber( phone2 );

  TDEABC::Key key( "secret key", TDEABC::Key::X509 );
  addressee.insertKey( key );

  TQStringList categories;
  categories << "Friends" << "School" << "KDE";
  addressee.setCategories( categories );

  TDEABC::Address a( TDEABC::Address::Work | TDEABC::Address::Postal | TDEABC::Address::Parcel );
  a.setStreet( TQString::fromUtf8("Цар Борис III") );
  a.setLocality( TQString::fromUtf8("София" ));
  a.setRegion( TQString::fromUtf8("София град" ));
  a.setPostalCode( TQString::fromUtf8("1000" ));
  a.setCountry( TQString::fromUtf8("България" ));
  addressee.insertAddress( a );

  addressee.insertCustom( "1hsdf", "test1",TQString::fromUtf8( "ежзик" ));
  addressee.insertCustom( "2hsdf", "test2",TQString::fromUtf8( "ежзик" ));
  addressee.insertCustom( "3hsdf", "test3",TQString::fromUtf8( "ежзик" ));

  addressee.dump();

  TDEABC::Addressee::List list;
  for ( int i = 0; i < 20; ++i ) {
    TDEABC::Addressee addr = addressee;
    addr.setUid( TQString::number( i ) );
    list.append( addr );
  }

  TDEABC::VCardConverter converter;
  TQString txt = converter.createVCards( list );

  TQFile file( "out2.vcf" );
  file.open( IO_WriteOnly );

  TQTextStream s( &file );
  s.setEncoding( TQTextStream::UnicodeUTF8 );
  s << txt;
  file.close();

  return 0;
}

Lines 151-158 VCard::List VCardParser::parseVCards( const TQString& text ) Link Here

(-)a/tdelibs.orig/tdeabc/vcardparser/vcardparser.cpp (-3 / +3 lines)
151	input = TQCString(value.latin1());	151	input = TQCString(value.latin1());
152	KCodecs::quotedPrintableDecode( input, output );	152	KCodecs::quotedPrintableDecode( input, output );
153	}	153	}
154	} else {	154	} else { //assume it's in UTF-8 (as used in previous KDE versions)
155	output = TQCString(value.latin1());	155	output = TQCString(value.utf8());
156	}	156	}
157		157
158	if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data	158	if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
Lines 275-281 TQString VCardParser::createVCards( const VCard::List& list ) Link Here
275	for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )	275	for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )
276	text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" );	276	text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" );
277	} else	277	} else
278	text.append( textLine + "\r\n" );	278	text.append( textLine + "\r\n" );
279	}	279	}
280	else {	280	else {
281	// URIs can be full of weird symbols, etc. so bypass all checks	281	// URIs can be full of weird symbols, etc. so bypass all checks

Return to bug 2625

Lines 164-196 bool ResourceFile::doOpen() Link Here

(-)a/tdelibs.orig/tdeabc/plugins/file/resourcefile.cpp (-29 / +53 lines)
164		164
165	if ( file.size() == 0 ) {	165	if ( file.size() == 0 ) {
166	file.close();	166	file.close();
167	kdDebug() << "File size is zero. Evaluating backups" << endl;	167	kdDebug(5700) << "File size is zero. Evaluating backups" << endl;
168	for (int i=0; i!=20; i++)	168	for (int i=0; i!=20; i++)
169	{	169	{
170	TQFile backup( mFileName + "__" + TQString::number(i) );	170	TQFile backup( mFileName + "__" + TQString::number(i) );
171	kdDebug() << "Evaluating" << backup.name() << " size: " << backup.size() << endl;	171	kdDebug(5700) << "Evaluating" << backup.name() << " size: " << backup.size() << endl;
172	if ( backup.size() != 0 )	172	if ( backup.size() != 0 )
173	{	173	{
174	kdDebug() << "Restoring backup " << i << endl;	174	kdDebug(5700) << "Restoring backup " << i << endl;
175	const TQString src = mFileName + "__" + TQString::number(i);	175	const TQString src = mFileName + "__" + TQString::number(i);
176	const TQString dest = mFileName;	176	const TQString dest = mFileName;
177		177
		178	// copy src to dest
		179	if ( ! backup.open( IO_ReadOnly ) ) {
		180	// const TQByteArray data = backup.readAll();
		181	kdDebug(5700) << "can not open source for reading " << src << endl;
		182	continue;
		183	}
		184
178	// remove dest	185	// remove dest
179	TQFile::remove( dest );	186	TQFile::remove( dest );
180		187
181	// copy src to dest	188	TQString text;
182	if ( backup.open( IO_ReadOnly ) ) {	189	TQTextStream instream( &backup );
183	const TQByteArray data = backup.readAll();	190	instream.setEncoding( TQTextStream::UnicodeUTF8 );
184		191	text = instream.read();
185	TQFile out( dest );	192	backup.close();
186	if ( out.open( IO_WriteOnly ) ) {	193
187	out.writeBlock( data );	194	TQFile out( dest );
188	out.close();	195	if ( ! out.open( IO_WriteOnly ) ) {
189	}	196	// out.writeBlock( data );
190		197	kdDebug(5700) << "can not open target for writing " << dest << endl;
191	backup.close();	198	continue;
192	}	199	}
193	return true;	200	TQTextStream outstream( &out );
		201	outstream.setEncoding( TQTextStream::UnicodeUTF8 );
		202	outstream << text;
		203	out.close();
		204
		205	return true;
194	}	206	}
195	}	207	}
196	return true;	208	return true;
Lines 248-254 bool ResourceFile::save( Ticket * ) Link Here
248	TQFile file( mFileName + "__0" );	260	TQFile file( mFileName + "__0" );
249	if ( file.size() != 0 ) {	261	if ( file.size() != 0 ) {
250	const TQString last = mFileName + "__20";	262	const TQString last = mFileName + "__20";
251	kdDebug() << "deleting " << last << endl;	263	kdDebug(5700) << "deleting " << last << endl;
252		264
253	TQFile::remove( last );	265	TQFile::remove( last );
254		266
Lines 260-287 bool ResourceFile::save( Ticket * ) Link Here
260		272
261	// copy src to dest	273	// copy src to dest
262	TQFile in( src );	274	TQFile in( src );
263	if ( in.open( IO_ReadOnly ) ) {	275	if ( ! in.exists() )
264	const TQByteArray data = in.readAll();	276	continue;
265		277	if ( ! in.open( IO_ReadOnly ) ) {
266	TQFile out( dest );	278	// const TQByteArray data = in.readAll();
267	if ( out.open( IO_WriteOnly ) ) {	279	kdDebug(5700) << "can not open source for reading " << src << endl;
268	out.writeBlock( data );	280	return false;
269	out.close();
270	}
271
272	in.close();
273	}	281	}
		282	TQString text;
		283	TQTextStream instream( &in );
		284
		285	instream.setEncoding( TQTextStream::UnicodeUTF8 );
		286	text = instream.read();
		287	in.close();
		288
		289	TQFile out( dest );
		290	if ( ! out.open( IO_WriteOnly ) ) {
		291	// out.writeBlock( data );
		292	kdDebug(5700) << "can not open target for writing " << dest << endl;
		293	return false;
		294	}
		295	TQTextStream outstream( &out );
		296	outstream.setEncoding( TQTextStream::UnicodeUTF8 );
		297	outstream << text;
		298	out.close();
274		299
275	// remove src	300	// remove src
276	TQFile::remove( src );	301	TQFile::remove( src );
277	}	302	}
278	} else	303	} else
279	kdDebug() << "Not starting logrotate __0 is 0 bytes." << endl;	304	kdDebug(5700) << "Not starting logrotate __0 is 0 bytes." << endl;
280		305
281	TQString extension = "__0";	306	TQString extension = "__0";
282	(void) KSaveFile::backupFile( mFileName, TQString::null /directory/,	307	(void) KSaveFile::backupFile( mFileName, TQString::null /directory/,
283	extension );	308	extension );
284
285	mDirWatch.stopScan();	309	mDirWatch.stopScan();
286		310
287	KSaveFile saveFile( mFileName );	311	KSaveFile saveFile( mFileName );

Lines 1-69 Link Here

(-)a/tdelibs.orig/tdeabc/vcardparser/checkvcard.pl (-43 / +32 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2		2
		3	use utf8;
		4	use strict;
		5	use warnings;
		6
3	if ( @ARGV != 1 ) {	7	if ( @ARGV != 1 ) {
4	print STDERR "Missing arg: filename\n";	8	print STDERR "Missing arg: filename\n";
5	exit 1;	9	exit 1;
6	}	10	}
7		11
8	$file = $ARGV[0];	12	my $file = $ARGV[0];
		13	my $ref = "$file.ref";
9		14
10	if ( !open( IN, "$file" ) ) {	15	my $options="";
11	print STDERR "Unable to open '$file'\n";	16	my $error=0;
12	exit 1;	17	my @prscont;
13	}	18	my @refcont;
14		19
		20	open( IN, "<", $file ) \|\| die ("Unable to open $file");
15	while( <IN> ) {	21	while( <IN> ) {
16	if (/^VERSION:(.*)$/ ) {	22	if (/^VERSION:(.*)$/ ) { my $v = $1; $options = "--vcard21" if $v eq "2.1"; }
17	$version = $1;
18	if ( $version eq "2.1" ) { $options = "--vcard21"; }
19	}
20	}	23	}
21
22	close IN;	24	close IN;
23		25
24	$ref = "$file.ref";	26	open( REF, "$ref" ) \|\| die ("Unable to open $ref");
25		27	while( <REF> ) {
26	if ( !open( REF, "$ref" ) ) {	28	next if $_ =~ /^UID/;
27	print STDERR "Unable to open $ref\n";	29	push @refcont , $_ ;
28	exit 1;
29	}
30
31	while( <REF> ) {
32	push @ref, $_;
33	}	30	}
34
35	close REF;	31	close REF;
36		32
37	if ( !open( READ, "./testread $file $options 2> /dev/null \|" ) ) {	33	open( READ, "./testread $file $options 2> /dev/null \|" ) \|\| die ("Unable to open testread");
38	print STDERR "Unable to open testread\n";	34	print "Checking: $file ";
39	exit 1;
40	}
41
42	print "Checking '$file':\n";
43
44	$gotsomething = 0;
45	$error = 0;
46	$i = 0;
47	while( <READ> ) {	35	while( <READ> ) {
48	$gotsomething = 1;	36	next if $_ =~ /^UID/;
49	$out = $_;	37	push @prscont , $_;
50	$ref = @ref[$i++];
51
52	if ( $out ne $ref ) {
53	if ( $ref =~ /^UID/ && $out =~ /^UID/ ) { next; }
54	$error++;
55	print " Expected : $ref";
56	print " Parser output : $out";
57	}
58	}	38	}
59
60	close READ;	39	close READ;
61		40
62	if ( $gotsomething == 0 ) {	41
63	print "\n FAILED: testread didn't output anything\n";	42	if ( $#refcont != $#prscont ) {
		43	print "\n FAILED: ref size and parsed size mismatch.\n";
64	system "touch FAILED";	44	system "touch FAILED";
65	exit 1;	45	exit 1;
66	}	46	}
		47
		48	for (my $i=0; $i<=$#refcont; $i++) {
		49	if ( $refcont[$i] ne $prscont[$i] ) {
		50	$error++;
		51	print "\n Expected : $refcont[$i]";
		52	print " Parser output : $prscont[$i]";
		53	}
		54	}
		55
67	if ( $error > 0 ) {	56	if ( $error > 0 ) {
68	print "\n FAILED: $error errors found.\n";	57	print "\n FAILED: $error errors found.\n";
69	system "touch FAILED";	58	system "touch FAILED";

Line 0 Link Here

(-)a/tdelibs-trinity-14.0.3/tdeabc/vcardparser/tests/vcard8.vcf (+12 lines)
	1	BEGIN:VCARD
	2	ADR;TYPE=home:;;Müllerstrasse 21;Wörthersee;Kärnten;8400;Österreich;
	3	ORG:HansWürstel AG
	4	EMAIL:boehmermann@wuerstel.com
	5	FN:Jahn Böhmermann
	6	N:Böhmermann;Jahn;;;
	7	TITLE:Komödiant
	8	REV:2016-04-02T23:54:06Z
	9	TEL;TYPE=VOICE,MSG,WORK:+43 699373419
	10	VERSION:3.0
	11	X-GENDER-GENDER:Male
	12	END:VCARD

Lines 1-6 Link Here

(-)a/tdelibs.orig/tdeabc/vcardparser/testutils.cpp (-4 / +53 lines)
1	#include <vcardparser.h>	1	#include "vcardparser.h"
2	#include <tdeabc/addressee.h>	2	#include <tdeabc/addressee.h>
3	#include <tqfile.h>	3	#include <tqfile.h>
		4	#include <tqstring.h>
4		5
5	using namespace TDEABC;	6	using namespace TDEABC;
6		7
Lines 60-67 vcard3() Link Here
60	return addr;	61	return addr;
61	}	62	}
62		63
		64	Addressee
		65	vcard8()
		66	{
		67	Addressee addr;
		68
		69	addr.setName( TQString::fromUtf8("Jahn") );
		70	addr.setFamilyName( TQString::fromUtf8("Böhmermann") );
		71	addr.setFormattedName( TQString::fromUtf8("Jahn Böhmermann") );
		72	addr.setOrganization( TQString::fromUtf8("HansWürstel AG") );
		73	addr.insertEmail( TQString::fromUtf8("boehmermann@wuerstel.com") );
		74	addr.setTitle( TQString::fromUtf8("Komödiant") );
		75	addr.insertPhoneNumber( PhoneNumber("+43 699373419",PhoneNumber::Voice\|PhoneNumber::Msg\|PhoneNumber::Work) );
		76	Address a( Address::Work );
		77	a.setStreet( TQString::fromUtf8("Müllerstrasse 21") );
		78	a.setLocality( TQString::fromUtf8("Wörthersee") );
		79	a.setRegion( TQString::fromUtf8("Kärnten") );
		80	a.setPostalCode( "8400" );
		81	a.setCountry( TQString::fromUtf8("Österreich") );
		82	addr.insertAddress( a );
		83	return addr;
		84	}
		85
		86	Addressee
		87	vcard9()
		88	{
		89	Addressee addr;
		90
		91	addr.setName( TQString::fromUtf8("Иван") );
		92	addr.setFamilyName( TQString::fromUtf8("Иванов") );
		93	addr.setFormattedName( TQString::fromUtf8("Иван Иванов") );
		94	addr.setOrganization( TQString::fromUtf8("България ООД") );
		95	addr.insertEmail( TQString::fromUtf8("иван.иванов@българия.com") );
		96	addr.setTitle( TQString::fromUtf8("Др") );
		97	addr.insertPhoneNumber( PhoneNumber("+359 888 111 222",PhoneNumber::Voice\|PhoneNumber::Msg\|PhoneNumber::Work) );
		98	Address a( Address::Work );
		99	a.setStreet( TQString::fromUtf8("Цар Борис III") );
		100	a.setLocality( TQString::fromUtf8("София") );
		101	a.setRegion( TQString::fromUtf8("София град") );
		102	a.setPostalCode( "1000" );
		103	a.setCountry( TQString::fromUtf8("България") );
		104	addr.insertAddress( a );
		105	return addr;
		106	}
		107
63		108
64	QString	109	TQString
65	vcardAsText( const TQString& location )	110	vcardAsText( const TQString& location )
66	{	111	{
67	TQString line;	112	TQString line;
Lines 84-99 vCardsAsAddresseeList() Link Here
84	l.append( vcard1() );	129	l.append( vcard1() );
85	l.append( vcard2() );	130	l.append( vcard2() );
86	l.append( vcard3() );	131	l.append( vcard3() );
		132	l.append( vcard8() );
		133	l.append( vcard9() );
87		134
88	return l;	135	return l;
89	}	136	}
90		137
91	QString	138	TQString
92	vCardsAsText()	139	vCardsAsText()
93	{	140	{
94	TQString vcards = vcardAsText( "tests/vcard1.vcf" );	141	TQString vcards = vcardAsText( "tests/vcard1.vcf" );
95	vcards += vcardAsText( "tests/vcard2.vcf" );	142	vcards += vcardAsText( "tests/vcard2.vcf" );
96	vcards += vcardAsText( "tests/vcard3.vcf" );	143	vcards += vcardAsText( "tests/vcard3.vcf" );
		144	vcards += vcardAsText( "tests/vcard8.vcf" );
		145	vcards += vcardAsText( "tests/vcard9.vcf" );
97		146
98	return vcards;	147	return vcards;
99	}	148	}

Line 0 Link Here

(-)a/tdelibs-trinity-14.0.3/tdeabc/vcardparser/testvcardformat.cpp (+178 lines)
		1
		2	/*
		3	This file is part of libtdeabc.
		4
		5	This library is free software; you can redistribute it and/or
		6	modify it under the terms of the GNU Library General Public
		7	License as published by the Free Software Foundation; either
		8	version 2 of the License, or (at your option) any later version.
		9
		10	This library is distributed in the hope that it will be useful,
		11	but WITHOUT ANY WARRANTY; without even the implied warranty of
		12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		13	Library General Public License for more details.
		14
		15	You should have received a copy of the GNU Library General Public License
		16	along with this library; see the file COPYING.LIB. If not, write to
		17	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
		18	Boston, MA 02110-1301, USA.
		19	*/
		20
		21	#include <kdebug.h>
		22	#include <tdeapplication.h>
		23	#include <tdecmdlineargs.h>
		24	// #include <tdelocale.h>
		25	#include <tdeaboutdata.h>
		26
		27	#include "vcardformatplugin.h"
		28
		29	using namespace TDEABC;
		30
		31	/**
		32	*
		33	* @param argc
		34	* @param argv
		35	* @return
		36	*/
		37	int
		38	main( int argc, char **argv )
		39	{
		40	TDEAboutData aboutData( "testvcardformatplugin", "vCard format plugin", "0.1" );
		41
		42	TDECmdLineArgs::init( argc, argv, &aboutData );
		43
		44	TDEApplication app( false, false );
		45
		46
		47	TDEABC::Addressee addressee;
		48
		49	addressee.setNameFromString( TQString::fromUtf8("Иван Иванов") );
		50	addressee.setNickName( TQString::fromUtf8("иванчо") );
		51	addressee.setBirthday( TQDate( 1981, 7, 19 ) );
		52	addressee.setMailer( "mutt1.2" );
		53	addressee.setTimeZone( TDEABC::TimeZone( +2 ) );
		54
		55	TDEABC::Geo geo;
		56	geo.setLatitude( 30 );
		57	geo.setLongitude( 51 );
		58	addressee.setGeo( geo );
		59
		60	addressee.setTitle( TQString::fromUtf8("Др") );
		61	addressee.setRole( TQString::fromUtf8("Самарянин") );
		62	addressee.setOrganization( TQString::fromUtf8("България ООД") );
		63	addressee.setNote( TQString::fromUtf8("не\nпипай работеща система") );
		64	addressee.setProductId( "testId" );
65	addressee.setRevision( TQDateTime::currentDateTime() );
66	addressee.setSortString( TQString::fromUtf8("сортиране") );
67	addressee.setUrl( KURL( "http://wgess17.dyndns.org") );
68	addressee.setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
69	/*
70	TQImage img;
71	img.load( "testimg.png", "PNG" );
72	TDEABC::Picture photo;
73	photo.setData( img );
74	addressee.setPhoto( photo );
75
76	TQImage img2;
77	img2.load( "testimg.png", "PNG" );
78	TDEABC::Picture logo;
79	logo.setData( img2 );
80	addressee.setLogo( logo );
81
82	TQFile soundFile( "testsound.wav" );
83	soundFile.open( IO_ReadOnly );
84	TQByteArray data = soundFile.readAll();
85	soundFile.close();
86	TDEABC::Sound sound;
87	sound.setData( data );
88	addressee.setSound( sound );
89	*/
90	addressee.insertEmail( TQString::fromUtf8("иван.иванов@българия.оод"), true );
91	addressee.insertEmail( TQString::fromUtf8("иванчо@yahoo.de"), true );
92
93	TDEABC::PhoneNumber phone1( "029876543", TDEABC::PhoneNumber::Pref \| TDEABC::PhoneNumber::Home );
94	TDEABC::PhoneNumber phone2( "+359888111222", TDEABC::PhoneNumber::Work );
95	addressee.insertPhoneNumber( phone1 );
96	addressee.insertPhoneNumber( phone2 );
97
98	TDEABC::Key key( "secret key", TDEABC::Key::X509 );
99	addressee.insertKey( key );
100
101	TQStringList categories;
102	categories << "Friends" << "School" << "KDE";
103	addressee.setCategories( categories );
104
105	TDEABC::Address a( TDEABC::Address::Work \| TDEABC::Address::Postal \| TDEABC::Address::Parcel );
106	a.setStreet( TQString::fromUtf8("Цар Борис III") );
107	a.setLocality( TQString::fromUtf8("София" ));
108	a.setRegion( TQString::fromUtf8("София град" ));
109	a.setPostalCode( TQString::fromUtf8("1000" ));
110	a.setCountry( TQString::fromUtf8("България" ));
111	addressee.insertAddress( a );
112
113	addressee.insertCustom( "1hsdf", "test1",TQString::fromUtf8( "ежзик" ));
114	addressee.insertCustom( "2hsdf", "test2",TQString::fromUtf8( "ежзик" ));
115	addressee.insertCustom( "3hsdf", "test3",TQString::fromUtf8( "ежзик" ));
116
117	addressee.dump();
118
119	// TDEABC::Addressee::List list;
120	// for ( int i = 0; i < 20; ++i ) {
121	// TDEABC::Addressee addr = addressee;
122	// addr.setUid( TQString::number( i ) );
123	// list.append( addr );
124	// }
125
126	// TDEABC::VCardConverter converter;
127	// TQString txt = converter.createVCards( list );
128	//
129	// TQFile file( "out2.vcf" );
130	// file.open( IO_WriteOnly );
131	//
132	// TQTextStream s( &file );
133	// s.setEncoding( TQTextStream::UnicodeUTF8 );
134	// s << txt;
135	// file.close();
136
137	VCardFormatPlugin *vcfplugin = new VCardFormatPlugin();
138	TQFile file( "vfout.vcf" );
139	if ( file.open(IO_WriteOnly) ){
140	vcfplugin->save(addressee, &file);
141	file.close();
142	}
143
144
145	TDEABC::Addressee addressee2;
146
147	if ( file.open(IO_ReadOnly ) ){
148	vcfplugin->load(addressee2, &file);
149	file.close();
150	}
151
152	addressee2.dump();
153
154	return 0;
155
156
157	/* Addressee::List::iterator itr1;
158	Addressee::List::iterator itr2;
159	for ( itr1 = l.begin(), itr2 = parsed.begin();
160	itr1 != l.end(); ++itr1, ++itr2 ) {
161	if ( (itr1).fullEmail() == (itr2).fullEmail() &&
162	(itr1).organization() == (itr2).organization() &&
163	(itr1).phoneNumbers() == (itr2).phoneNumbers() &&
164	(itr1).emails() == (itr2).emails() &&
165	(itr1).role() == (itr2).role() ) {
166	kdDebug()<<"\tAddressee - PASSED"<<endl;
167	kdDebug()<<"\t\t"<< (itr1).fullEmail() << " VS. " << (itr2).fullEmail()<<endl;
168	} else {
169	kdDebug()<<"\tAddressee - FAILED"<<endl;
170	kdDebug()<<">>>>>>>Addressee from code<<<<<<<<"<<endl;
171	(*itr1).dump();
172	kdDebug()<<">>>>>>>Addressee from file<<<<<<<<"<<endl;
173	(*itr2).dump();
174	//kdDebug()<<"\t\t"<< (itr1).fullEmail() << " VS. " << (itr2).fullEmail()<<endl;
175	}
176	}
177	*/
178	}